Merge pull request #69 from kinecosystem/DP-774_crash_with_proguard

DP-774 - crash with proguard
kinecosystem · Aug 15, 2019 · fa89f29 · fa89f29
2 parents 7bc5c8c + d208433
commit fa89f29
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 12 deletions.
diff --git a/android-stellar-sdk b/android-stellar-sdk
diff --git a/build.gradle b/build.gradle
@@ -6,13 +6,13 @@ ext {
 }
 
 buildscript {
-    ext.kotlin_version = '1.2.30'
+    ext.kotlin_version = '1.3.31'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:3.0.1"
+        classpath "com.android.tools.build:gradle:3.4.2"
         classpath 'org.jacoco:org.jacoco.core:0.8.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -7,11 +7,11 @@ ext {
     mockitoVersion = '2.13.0'
     androidTestVersion = '1.0.1'
     mockWebServerVersion = '3.8.1'
-    robolectricVersion = '3.6.1'
+    robolectricVersion = '4.3'
     hamcrestVersion = '1.3'
     gsonVersion = '2.4'
     jacocoVersion = '0.8.0'
-    multiDexVersion = '1.0.3'
+    multiDexVersion = '1.0.2'
 
     //Packages
     supportPackage = 'com.android.support'
@@ -52,7 +52,7 @@ ext {
             hamcrest         : buildDependency(hamcrestPackage, 'hamcrest-library', hamcrestVersion),
             gson             : buildDependency(gsonPackage, 'gson', gsonVersion),
             multidex         : buildDependency(supportPackage, 'multidex', multiDexVersion),
-            kotlin           : buildDependency(kotlinPackage, 'kotlin-stdlib-jre7', kotlin_version),
+            kotlin           : buildDependency(kotlinPackage, 'kotlin-stdlib-jdk7', kotlin_version),
             kotlinJUnitTest  : buildDependency(kotlinPackage, 'kotlin-test-junit', kotlin_version)
     ]
 }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Oct 30 16:29:10 IST 2017
+#Tue Aug 13 17:13:57 IDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/kin-core/build.gradle b/kin-core/build.gradle
@@ -9,7 +9,6 @@ group = 'com.github.kinecosystem'
 
 android {
     compileSdkVersion 26
-    buildToolsVersion "26.0.2"
 
     defaultConfig {
         minSdkVersion 16

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -1,8 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.2"
+    compileSdkVersion 28
     defaultConfig {
         applicationId "kin.core.sample"
         minSdkVersion 16
@@ -37,7 +36,7 @@ dependencies {
     androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    implementation 'com.android.support:appcompat-v7:26.+'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
     testImplementation 'junit:junit:4.12'
     api project(':kin-core')
     implementation 'com.squareup.okhttp3:okhttp:3.9.1'
+0 −16		.travis.yml
+0 −14		after_deploy.sh
+8 −0		android-stellar-sdk/proguard-rules.pro