Skip to content

Commit 049f1a8

Browse files
committed
Merge branch 'release/v1.7.0'
2 parents 6b925c9 + 65327d7 commit 049f1a8

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,10 @@ kotlin {
7878

7979
ext {
8080
anko_version = "0.10.1"
81-
coroutines_version = "0.15"
8281
okIOVersion = "1.13.0"
8382
okHttpVersion = "3.8.1"
84-
playServicesVersion = "11.0.4"
85-
supportLibraryVersion = "26.0.0"
83+
playServicesVersion = "11.2.0"
84+
supportLibraryVersion = "26.0.1"
8685
threetenabpVersion = "1.0.5"
8786

8887
testMockitoVersion = "2.7.+"
@@ -108,9 +107,8 @@ dependencies {
108107
compile(name: 'clansFAB', ext: 'aar')
109108
compile(name: 'googleinapputil', ext: 'aar')
110109
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
111-
compile "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
112-
compile "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
113110
compile "org.jetbrains.anko:anko-common:$anko_version"
111+
compile "org.jetbrains.anko:anko-coroutines:$anko_version"
114112

115113
//Support
116114
compile "com.android.support:cardview-v7:$supportLibraryVersion"

app/src/main/res/raw/changelog.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<changelog bulletedList="true">
3+
<changelogversion
4+
versionName="1.7.0"
5+
changeDate="August 25, 2017">
6+
<changelogtext>Add French translations</changelogtext>
7+
<changelogtext>Update local card images with latest balanced changes</changelogtext>
8+
<changelogtext>Fix keep filters while changing tabs</changelogtext>
9+
</changelogversion>
10+
<changelogversion
11+
versionName="1.6.4"
12+
changeDate="July 30, 2017">
13+
<changelogtext>Fixes crash while loading Ads</changelogtext>
14+
</changelogversion>
315
<changelogversion
416
versionName="1.6.3"
517
changeDate="July 30, 2017">

0 commit comments

Comments
 (0)