From 6c917cba24a14c9cb9e0f3a635994ad0b432f769 Mon Sep 17 00:00:00 2001
From: Yossi Rizgan <yosriz@gmail.com>
Date: Tue, 13 Aug 2019 19:17:08 +0300
Subject: [PATCH 1/2] prevent crash with proguard

* add proguard rules to prevent R8 compiler to strip out (probably) inner classes of model classes (borrowed additional defintions from gson lib)
* update android build tools, gradle, support, kotlin and others to the latest
---
 android-stellar-sdk                      | 2 +-
 build.gradle                             | 4 ++--
 dependencies.gradle                      | 4 ++--
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 kin-core/build.gradle                    | 1 -
 sample/build.gradle                      | 5 ++---
 6 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/android-stellar-sdk b/android-stellar-sdk
index 51e3ce6a..7a16e54d 160000
--- a/android-stellar-sdk
+++ b/android-stellar-sdk
@@ -1 +1 @@
-Subproject commit 51e3ce6a080ff415783a9c6d47e284b6d41ac5b5
+Subproject commit 7a16e54daadb824d979dfe528c7472ad02a7bd17
diff --git a/build.gradle b/build.gradle
index 19bf4915..f925c8a2 100644
--- 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
index 5a55c475..e1b2b23a 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -11,7 +11,7 @@ ext {
     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
index d8f5c99b..20be6f8a 100644
--- 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
index 60f88480..54292c8a 100644
--- 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
index 224e2f3f..b4f8d3d1 100644
--- 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'

From d20843301aea7e1982d60f666be6bb1a775d4e74 Mon Sep 17 00:00:00 2001
From: Yossi Rizgan <yosriz@gmail.com>
Date: Thu, 15 Aug 2019 08:25:40 +0300
Subject: [PATCH 2/2] update robolectric version, move andorid-stellar-sdk to
 master

---
 android-stellar-sdk | 2 +-
 dependencies.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/android-stellar-sdk b/android-stellar-sdk
index 7a16e54d..fd76ed65 160000
--- a/android-stellar-sdk
+++ b/android-stellar-sdk
@@ -1 +1 @@
-Subproject commit 7a16e54daadb824d979dfe528c7472ad02a7bd17
+Subproject commit fd76ed65553bbf41f32ef507db374d4e5847f13a
diff --git a/dependencies.gradle b/dependencies.gradle
index e1b2b23a..2a401015 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -7,7 +7,7 @@ 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'