Update libs, fix ProGuard release problem

cloudpayments · Jul 2, 2021 · c664493 · c664493
1 parent 6de5b40
commit c664493
Show file tree

Hide file tree

Showing 13 changed files with 111 additions and 119 deletions.
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ repositories {
 ```
 В build.gradle уровня приложения добавить зависимость
 ```
-implementation 'com.github.cloudpayments:CloudPayments-SDK-Android:latest-version'
+implementation 'com.github.cloudpayments:CloudPayments-SDK-Android:1.0.2'
 ```
 ### Структура проекта:
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -21,8 +21,8 @@ android {
     buildTypes {
         debug {
             debuggable true
-            minifyEnabled false
-            shrinkResources false
+            minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
         release {
@@ -88,14 +88,14 @@ def getGitCurrentBranch() {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     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-alpha04'
+    implementation 'com.google.android.material:material:1.4.0-rc01'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.fragment:fragment-ktx:1.2.5'
+    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation 'androidx.fragment:fragment-ktx:1.3.5'
     implementation 'androidx.arch.core:core-runtime:2.1.0'
 
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
@@ -116,7 +116,7 @@ dependencies {
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
     implementation "com.jakewharton.rxbinding2:rxbinding-kotlin:$rxBindingVersion"
 
-    implementation 'com.google.android.gms:play-services-wallet:18.1.2'
+    implementation 'com.google.android.gms:play-services-wallet:18.1.3'
 
     //Multidex support
     implementation 'androidx.multidex:multidex:2.0.1'
@@ -135,11 +135,7 @@ dependencies {
     implementation 'io.card:android-sdk:5.5.0'
 
     implementation project(path: ':sdk')
-
-    testImplementation 'junit:junit:4.13'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-
+    //implementation 'com.github.cloudpayments:CloudPayments-SDK-Android:1.0.2'
 }
 
 ext {

diff --git a/app/proguard-rules.pro b/app/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.cloudpayments.demo.** { *; }
+-dontwarn ru.cloudpayments.demo.**
+-dontnote ru.cloudpayments.demo.**
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -0,0 +1,18 @@
+{
+  "version": 2,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "ru.cloudpayments.demo",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "versionCode": 1,
+      "versionName": "1.0",
+      "outputFile": "release-1.0(1)f762b6f_[master].apk"
+    }
+  ]
+}
diff --git a/app/src/androidTest/java/ru/cloudpayments/demo/ExampleInstrumentedTest.kt b/app/src/androidTest/java/ru/cloudpayments/demo/ExampleInstrumentedTest.kt
diff --git a/app/src/test/java/ru/cloudpayments/demo/ExampleUnitTest.kt b/app/src/test/java/ru/cloudpayments/demo/ExampleUnitTest.kt
diff --git a/build.gradle b/build.gradle
@@ -1,13 +1,13 @@
 // 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()
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.1.0"
+        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
@@ -19,6 +19,7 @@ allprojects {
     repositories {
         google()
         jcenter()
+        maven { url 'https://jitpack.io' }
     }
 }
 
@@ -27,8 +28,8 @@ task clean(type: Delete) {
 }
 
 ext {
-    retrofitVersion = '2.5.0'
+    retrofitVersion = '2.9.0'
     okHttp3Version = '4.5.0'
     rxBindingVersion = '2.2.0'
-    dagger2Version = '2.28'
+    dagger2Version = '2.35.1'
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/sdk/build.gradle b/sdk/build.gradle
@@ -10,7 +10,7 @@ android {
         minSdkVersion 19
         targetSdkVersion 29
         versionCode 1
-        versionName "1.0.1"
+        versionName "1.0.2"
         multiDexEnabled false
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -20,17 +20,20 @@ android {
     buildTypes {
         debug {
             debuggable true
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            consumerProguardFiles 'proguard-rules.pro'
 
             buildConfigField "String", "API_HOST", '"https://api.cloudpayments.ru/"'
         }
         release {
             debuggable false
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            consumerProguardFiles 'proguard-rules.pro'
 
             buildConfigField "String", "API_HOST", '"https://api.cloudpayments.ru/"'
+
         }
     }
 
@@ -48,14 +51,14 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     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-alpha04'
+    implementation 'com.google.android.material:material:1.4.0-rc01'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.fragment:fragment-ktx:1.2.5'
+    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation 'androidx.fragment:fragment-ktx:1.3.5'
     implementation 'androidx.arch.core:core-runtime:2.1.0'
 
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
@@ -68,14 +71,14 @@ dependencies {
 
     implementation 'ru.tinkoff.decoro:decoro:1.5.0'
 
-    implementation 'org.jsoup:jsoup:1.11.3'
+    implementation 'org.jsoup:jsoup:1.13.1'
 
     // rxkotlin
     implementation 'io.reactivex.rxjava2:rxkotlin:2.1.0'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
     implementation "com.jakewharton.rxbinding2:rxbinding-kotlin:$rxBindingVersion"
 
-    implementation 'com.google.android.gms:play-services-wallet:18.1.2'
+    implementation 'com.google.android.gms:play-services-wallet:18.1.3'
 
     //Multidex support
     implementation 'androidx.multidex:multidex:2.0.1'
@@ -89,8 +92,4 @@ dependencies {
 
     //rx google-play-services
     implementation 'io.ashdavies.rx.rxtasks:rx-tasks:2.2.0'
-
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }
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.cloudpayments.sdk.** { *; }
+-dontwarn ru.cloudpayments.sdk.**
+-dontnote ru.cloudpayments.sdk.**
diff --git a/sdk/src/androidTest/java/ru/cloudpayments/sdk/ExampleInstrumentedTest.kt b/sdk/src/androidTest/java/ru/cloudpayments/sdk/ExampleInstrumentedTest.kt
diff --git a/sdk/src/main/java/ru/cloudpayments/sdk/api/CloudpaymentsApi.kt b/sdk/src/main/java/ru/cloudpayments/sdk/api/CloudpaymentsApi.kt
@@ -32,8 +32,8 @@ class CloudpaymentsApi @Inject constructor(private val apiService: Cloudpayments
 			.subscribeOn(Schedulers.io())
 			.map { CloudpaymentsThreeDsResponse(true, "", 0) }
 			.onErrorReturn {
-				val response: CloudpaymentsThreeDsResponse = if (it is HttpException && it.response().raw().isRedirect) {
-					val url = it.response().raw().header("Location")
+				val response: CloudpaymentsThreeDsResponse = if (it is HttpException && it.response()?.raw()!!.isRedirect) {
+					val url = it.response()?.raw()?.header("Location")
 					when {
 						url?.startsWith(THREE_DS_FAIL_URL) == true -> {
 							val uri = Uri.parse(url)

diff --git a/sdk/src/test/java/ru/cloudpayments/sdk/ExampleUnitTest.kt b/sdk/src/test/java/ru/cloudpayments/sdk/ExampleUnitTest.kt