From a3457db5462d9b4ab50b3c38c5621eb992768b7c Mon Sep 17 00:00:00 2001 From: y20k Date: Wed, 19 Sep 2018 17:06:27 +0200 Subject: [PATCH] added -dontshrink to proguard rules --- app/build.gradle | 4 ++-- app/proguard-rules.pro | 1 + build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4a458c0..f4242bb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -37,6 +37,6 @@ dependencies { implementation "com.google.android.material:material:$materialVersion" - implementation 'org.osmdroid:osmdroid-android:' + osmdroidVersion - implementation 'com.google.code.gson:gson:' + gsonVersion + implementation "org.osmdroid:osmdroid-android:$osmdroidVersion" + implementation "com.google.code.gson:gson:$gsonVersion" } diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index aea1a6a..0c55fce 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -15,3 +15,4 @@ #-keepclassmembers class fqcn.of.javascript.interface.for.webview { # public *; #} +-dontshrink \ No newline at end of file diff --git a/build.gradle b/build.gradle index 60073c0..4f94901 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0-alpha08' + classpath 'com.android.tools.build:gradle:3.3.0-alpha10' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -28,7 +28,7 @@ allprojects { buildToolsVersion = '28.0.2' constraintlayoutVersion = '1.1.3' - materialVersion = "1.0.0-rc01" + materialVersion = "1.0.0-rc02" appcompatVersion = '1.0.0-rc02' cardviewVersion = '1.0.0-rc02' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8dcb086..09c15ec 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Sep 05 10:45:03 CEST 2018 +#Wed Sep 19 11:17:58 CEST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip