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

jaeopt · web-flow · commit 599ce89fa4c5 · 2024-01-08T15:46:23.000-08:00
- 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.
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/test-app-proguard-rules.pro b/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
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,8 @@ android {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`compileOptions {`
`48`		`- sourceCompatibility JavaVersion.VERSION_1_8`
`49`		`- targetCompatibility JavaVersion.VERSION_1_8`
	`48`	`+ sourceCompatibility JavaVersion.VERSION_11`
	`49`	`+ targetCompatibility JavaVersion.VERSION_11`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,8 @@ android {`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`	`compileOptions {`
`42`		`- sourceCompatibility JavaVersion.VERSION_1_8`
`43`		`- targetCompatibility JavaVersion.VERSION_1_8`
	`42`	`+ sourceCompatibility JavaVersion.VERSION_11`
	`43`	`+ targetCompatibility JavaVersion.VERSION_11`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,8 @@ android {`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`	`compileOptions {`
`45`		`- sourceCompatibility JavaVersion.VERSION_1_8`
`46`		`- targetCompatibility JavaVersion.VERSION_1_8`
	`45`	`+ sourceCompatibility JavaVersion.VERSION_11`
	`46`	`+ targetCompatibility JavaVersion.VERSION_11`
`47`	`47`	`}`
`48`	`48`	`buildToolsVersion build_tools_version`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,8 @@`
`26`	`26`	`}`
`27`	`27`	`# Keep Payload classes that get sent to the ODP server`
`28`	`28`	`-keep class com.optimizely.ab.odp.ODPEvent { *; }`
	`29`	`+# ODP event uses this. R8 complains about it.`
	`30`	`+-dontwarn java.beans.Transient`
`29`	`31`
`30`	`32`	`# Keep Payload classes that get sent to Optimizely's backend`
`31`	`33`	`-keep class com.optimizely.ab.event.internal.payload.** { *; }`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,8 @@ android {`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`	`compileOptions {`
`44`		`- sourceCompatibility JavaVersion.VERSION_1_8`
`45`		`- targetCompatibility JavaVersion.VERSION_1_8`
	`44`	`+ sourceCompatibility JavaVersion.VERSION_11`
	`45`	`+ targetCompatibility JavaVersion.VERSION_11`
`46`	`46`	`}`
`47`	`47`	`buildToolsVersion build_tools_version`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,16 +21,17 @@ android {`
`21`	`21`	`// enable proguard for debug mode (keep both of these to detect issues while testing)`
`22`	`22`	`minifyEnabled true`
`23`	`23`	`debuggable false`
`24`		`- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'`
	`24`	`+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'test-app-proguard-rules.pro'`
`25`	`25`	`}`
`26`	`26`	`release {`
`27`	`27`	`minifyEnabled true`
`28`		`- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'`
	`28`	`+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'test-app-proguard-rules.pro'`
	`29`	`+ signingConfig signingConfigs.debug`
`29`	`30`	`}`
`30`	`31`	`}`
`31`	`32`	`compileOptions {`
`32`		`- sourceCompatibility JavaVersion.VERSION_1_8`
`33`		`- targetCompatibility JavaVersion.VERSION_1_8`
	`33`	`+ sourceCompatibility JavaVersion.VERSION_11`
	`34`	`+ targetCompatibility JavaVersion.VERSION_11`
`34`	`35`	`}`
`35`	`36`	`packagingOptions {`
`36`	`37`	`resources {`