1.3.5 update dependencies

kakadu-dev · Dec 1, 2021 · ddfa4c3 · ddfa4c3
1 parent 89b4f50
commit ddfa4c3
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -7,10 +7,10 @@ Retrofit with all necessary dependencies and proguard rules
 ## Add to your build.gradle:
 ```groovy
     repositories {
-		maven { url 'https://jitpack.io' }
-	}
-    dependencies {
-    	implementation 'com.github.kakadu-dev:retrofit:1.2.4'
-    	...
-    }
+    maven { url 'https://jitpack.io' }
+}
+dependencies {
+    implementation 'com.github.kakadu-dev:retrofit:1.3.5'
+    ...
+}
 ```
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.1'
+        classpath 'com.android.tools.build:gradle:4.2.1'
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/retrofit/build.gradle b/retrofit/build.gradle
@@ -1,27 +1,31 @@
 plugins {
-    id "com.github.dcendents.android-maven" version "2.1"
+    id 'com.android.library'
+    id 'com.github.dcendents.android-maven' version '2.1'
 }
-apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 29
-        versionCode 4
-        versionName "1.2.$versionCode-SNAPSHOT"
+        targetSdkVersion 30
+        versionCode 5
+        versionName "1.3.$versionCode-SNAPSHOT"
         archivesBaseName = 'retrofit'
         consumerProguardFiles 'proguard-rules.pro'
     }
+    buildFeatures {
+        buildConfig = false
+        resValues = false
+    }
 }
 dependencies {
-    api 'com.squareup.retrofit2:retrofit:2.7.2'
-    api 'com.squareup.retrofit2:converter-gson:2.7.2'
-    api platform('com.squareup.okhttp3:okhttp-bom:4.4.0')
+    api 'com.squareup.retrofit2:retrofit:2.9.0'
+    api 'com.squareup.retrofit2:converter-gson:2.9.0'
+    api platform('com.squareup.okhttp3:okhttp-bom:4.9.3')
     api 'com.squareup.okhttp3:okhttp'
     api 'com.squareup.okhttp3:logging-interceptor'
-    api 'com.squareup.okio:okio:2.4.3'
+    api 'com.squareup.okio:okio:3.0.0'
 }
 
 // publish

diff --git a/retrofit/proguard-rules.pro b/retrofit/proguard-rules.pro
@@ -7,6 +7,9 @@
 # Retrofit does reflection on method and parameter annotations.
 -keepattributes RuntimeVisibleAnnotations, RuntimeVisibleParameterAnnotations
 
+# Keep annotation default values (e.g., retrofit2.http.Field.encoded).
+-keepattributes AnnotationDefault
+
 # Retain service method parameters when optimizing.
 -keepclassmembers,allowshrinking,allowobfuscation interface * {
     @retrofit2.http.* <methods>;
@@ -30,6 +33,15 @@
 -if interface * { @retrofit2.http.* <methods>; }
 -keep,allowobfuscation interface <1>
 
+# Keep generic signature of Call, Response (R8 full mode strips signatures from non-kept items).
+-keep,allowobfuscation,allowshrinking interface retrofit2.Call
+-keep,allowobfuscation,allowshrinking class retrofit2.Response
+
+# With R8 full mode generic signatures are stripped for classes that are not
+# kept. Suspend functions are wrapped in continuations where the type argument
+# is used.
+-keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
+
 
 # OKHTTP https://github.com/square/okhttp
 
@@ -42,5 +54,13 @@
 # Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java.
 -dontwarn org.codehaus.mojo.animal_sniffer.*
 
-# OkHttp platform used only on JVM and when Conscrypt dependency is available.
--dontwarn okhttp3.internal.platform.ConscryptPlatform
+# OkHttp platform used only on JVM and when Conscrypt and other security providers are available.
+-dontwarn okhttp3.internal.platform.**
+-dontwarn org.conscrypt.**
+-dontwarn org.bouncycastle.**
+-dontwarn org.openjsse.**
+
+# OKIO https://square.github.io/okio/#r8-proguard
+
+# Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java.
+#-dontwarn org.codehaus.mojo.animal_sniffer.*