Merge branch 'release/v1.7.0'

edipo2s · Aug 25, 2017 · 049f1a8 · 049f1a8
2 parents 6b925c9 + 65327d7
commit 049f1a8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -78,11 +78,10 @@ kotlin {
 
 ext {
     anko_version = "0.10.1"
-    coroutines_version = "0.15"
     okIOVersion = "1.13.0"
     okHttpVersion = "3.8.1"
-    playServicesVersion = "11.0.4"
-    supportLibraryVersion = "26.0.0"
+    playServicesVersion = "11.2.0"
+    supportLibraryVersion = "26.0.1"
     threetenabpVersion = "1.0.5"
 
     testMockitoVersion = "2.7.+"
@@ -108,9 +107,8 @@ dependencies {
     compile(name: 'clansFAB', ext: 'aar')
     compile(name: 'googleinapputil', ext: 'aar')
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    compile "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
-    compile "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
     compile "org.jetbrains.anko:anko-common:$anko_version"
+    compile "org.jetbrains.anko:anko-coroutines:$anko_version"
 
     //Support
     compile "com.android.support:cardview-v7:$supportLibraryVersion"

diff --git a/app/src/main/res/raw/changelog.xml b/app/src/main/res/raw/changelog.xml
@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog bulletedList="true">
+    <changelogversion
+        versionName="1.7.0"
+        changeDate="August 25, 2017">
+        <changelogtext>Add French translations</changelogtext>
+        <changelogtext>Update local card images with latest balanced changes</changelogtext>
+        <changelogtext>Fix keep filters while changing tabs</changelogtext>
+    </changelogversion>
+    <changelogversion
+        versionName="1.6.4"
+        changeDate="July 30, 2017">
+        <changelogtext>Fixes crash while loading Ads</changelogtext>
+    </changelogversion>
     <changelogversion
         versionName="1.6.3"
         changeDate="July 30, 2017">