Skip to content

Commit 0ff9923

Browse files
authored
Merge pull request #2 from jlundos/android_oct_2018_fix
Android oct 2018 fix
2 parents b3e2bf3 + 3b3e407 commit 0ff9923

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

Android/app/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ android {
1717
}
1818
}
1919
buildTypes {
20-
all {
20+
release {
2121
minifyEnabled true
22-
shrinkResources true
22+
useProguard true
23+
shrinkResources false
2324
proguardFiles getDefaultProguardFile("proguard-android.txt")
2425
}
2526
}
@@ -33,7 +34,7 @@ android {
3334
dependencies {
3435
implementation "com.android.support:appcompat-v7:27.0.1"
3536
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
36-
compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:1.2.0"
37+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
3738
}
3839
repositories {
3940
mavenCentral()

Android/build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
buildscript {
2+
ext.kotlin_version = '1.2.71'
23
repositories {
34
google()
45
jcenter()
56
}
67
dependencies {
7-
classpath "com.android.tools.build:gradle:3.0.1"
8-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.0"
8+
classpath "com.android.tools.build:gradle:3.2.1"
9+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
910
}
1011
}
1112

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Nov 28 10:41:55 CST 2017
1+
#Mon Nov 05 09:02:41 CET 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

0 commit comments

Comments
 (0)