[FSSDK-9917] update proguard rule for ODP (#471)

- Release build with R8 (AGP 8) fails with missing java.beans.Transient. SDK consumer proguard rules are updated to support it. - Upgrade Java source and target version from 8 to 11.
optimizely · Jan 8, 2024 · 599ce89 · 599ce89
1 parent 0da9e47
commit 599ce89
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 16 deletions.
diff --git a/android-sdk/build.gradle b/android-sdk/build.gradle
@@ -45,8 +45,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 }
 

diff --git a/datafile-handler/build.gradle b/datafile-handler/build.gradle
@@ -39,8 +39,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 }
 

diff --git a/event-handler/build.gradle b/event-handler/build.gradle
@@ -39,8 +39,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     buildToolsVersion build_tools_version
 }

diff --git a/odp/build.gradle b/odp/build.gradle
@@ -42,8 +42,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     buildToolsVersion build_tools_version
 

diff --git a/proguard-rules.txt b/proguard-rules.txt
@@ -26,6 +26,8 @@
 }
 # Keep Payload classes that get sent to the ODP server
 -keep class com.optimizely.ab.odp.ODPEvent { *; }
+# ODP event uses this. R8 complains about it.
+-dontwarn java.beans.Transient
 
 # Keep Payload classes that get sent to Optimizely's backend
 -keep class com.optimizely.ab.event.internal.payload.** { *; }

diff --git a/shared/build.gradle b/shared/build.gradle
@@ -41,8 +41,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     buildToolsVersion build_tools_version
 }

diff --git a/test-app/build.gradle b/test-app/build.gradle
@@ -21,16 +21,17 @@ android {
             // enable proguard for debug mode (keep both of these to detect issues while testing)
             minifyEnabled true
             debuggable false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'test-app-proguard-rules.pro'
         }
         release {
             minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'test-app-proguard-rules.pro'
+            signingConfig signingConfigs.debug
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     packagingOptions {
         resources {

diff --git a/test-app/proguard-rules.pro → test-app/test-app-proguard-rules.pro b/test-app/proguard-rules.pro → test-app/test-app-proguard-rules.pro
diff --git a/user-profile/build.gradle b/user-profile/build.gradle
@@ -39,8 +39,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 }