Update libs, fix ProGuard release problem

cloudpayments · Jul 2, 2021 · a3cf007 · a3cf007
1 parent 14660d5
commit a3cf007
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ allprojects {
 
 ```
 dependencies {
-	implementation 'com.github.cloudpayments:CloudTips-SDK-Android:1.1.0'
+	implementation 'com.github.cloudpayments:CloudTips-SDK-Android:1.1.1'
 }
 ```
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -16,11 +16,20 @@ android {
     }
 
     buildTypes {
+        debug {
+            debuggable true
+            minifyEnabled true
+            shrinkResources true
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
         release {
-            minifyEnabled false
+            debuggable false
+            minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -41,16 +50,17 @@ android {
 dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'com.google.android.gms:play-services-wallet:18.1.2'
+    implementation 'com.google.android.gms:play-services-wallet:18.1.3'
 
     // rxkotlin
     implementation 'io.reactivex.rxjava2:rxkotlin:2.1.0'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
 
     implementation project(path: ':sdk')
+    //implementation 'com.github.cloudpayments:CloudTips-SDK-Android:1.1.1'
 }
diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.4.10"
+    ext.kotlin_version = "1.5.20"
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/sdk/build.gradle b/sdk/build.gradle
@@ -12,16 +12,25 @@ android {
         minSdkVersion 19
         targetSdkVersion 29
         versionCode 2
-        versionName "1.0.3"
+        versionName "1.1.1"
         multiDexEnabled true
     }
 
     buildTypes {
+        debug {
+            debuggable true
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            consumerProguardFiles 'proguard-rules.pro'
+        }
         release {
-            minifyEnabled false
+            debuggable false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            consumerProguardFiles 'proguard-rules.pro'
         }
     }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -38,13 +47,13 @@ android {
 dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'com.google.android.gms:play-services-wallet:18.1.2'
-    implementation 'com.google.android.gms:play-services-safetynet:17.0.0'
+    implementation 'com.google.android.gms:play-services-wallet:18.1.3'
+    implementation 'com.google.android.gms:play-services-safetynet:17.0.1'
 
     // rxkotlin
     implementation 'io.reactivex.rxjava2:rxkotlin:2.1.0'
@@ -65,5 +74,5 @@ dependencies {
 
     implementation 'ru.tinkoff.decoro:decoro:1.5.0'
 
-    implementation 'com.github.cloudpayments:CloudPayments-SDK-Android:1.0.0-alpha03'
+    implementation 'com.github.cloudpayments:CloudPayments-SDK-Android:1.0.2'
 }
diff --git a/sdk/proguard-rules.pro b/sdk/proguard-rules.pro
@@ -18,4 +18,34 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+# com.squareup.retrofit2
+-dontwarn javax.annotation.**
+-dontwarn retrofit2.**
+-keep, includedescriptorclasses class retrofit2.** { *; }
+-keepattributes Signature
+-keepattributes Exceptions
+-keepclasseswithmembers class * {
+    @retrofit2.http.* <methods>;
+}
+
+# com.squareup.okhttp3
+-keepattributes Signature
+-keepattributes *Annotation*
+-keep, includedescriptorclasses class okhttp3.** { *; }
+-keep interface okhttp3.** { *; }
+-dontwarn okhttp3.**
+-keep class okhttp3.internal.platform.** { *; }
+-dontwarn okhttp3.internal.platform.**
+-dontnote okhttp3.internal.platform.**
+
+# com.google.gson
+-keep class com.google.gson.internal.** { *; }
+-dontwarn com.google.gson.internal.**
+-dontnote com.google.gson.internal.**
+
+# ru.cloudpayments.sdk
+-keep class ru.cloudtips.sdk.** { *; }
+-dontwarn ru.cloudtips.sdk.**
+-dontnote ru.cloudtips.sdk.**