fix(client): r8 support

Author: stainless-app[bot]

onebusaway-sdk-java-core/src/main/resources/META-INF/proguard/onebusaway-sdk-java-core.pro

@@ -1,5 +1,5 @@
 # Jackson uses reflection and depends heavily on runtime attributes.
--keepattributes
+-keepattributes Exceptions,InnerClasses,Signature,Deprecated,*Annotation*
 
 # Jackson uses Kotlin reflection utilities, which themselves use reflection to access things.
 -keep class kotlin.reflect.** { *; }
@@ -17,13 +17,13 @@
     *;
 }
 
-# Jackson uses reflection to access the default constructors of serializers and deserializers.
--keepclassmembers class * extends org.onebusaway.core.BaseSerializer {
-    <init>();
-}
--keepclassmembers class * extends org.onebusaway.core.BaseDeserializer {
-    <init>();
-}
+# Jackson uses reified type information to serialize and deserialize our classes (via `TypeReference`).
+-keep class com.fasterxml.jackson.core.type.TypeReference { *; }
+-keep class * extends com.fasterxml.jackson.core.type.TypeReference { *; }
+
+# Jackson uses reflection to access our class serializers and deserializers.
+-keep @com.fasterxml.jackson.databind.annotation.JsonSerialize class org.onebusaway.** { *; }
+-keep @com.fasterxml.jackson.databind.annotation.JsonDeserialize class org.onebusaway.** { *; }
 
 # Jackson uses reflection to serialize and deserialize our classes based on their constructors and annotated members.
 -keepclassmembers class org.onebusaway.** {

onebusaway-sdk-java-proguard-test/build.gradle.kts

@@ -4,8 +4,13 @@ plugins {
 }
 
 buildscript {
+    repositories {
+        google()
+    }
+
     dependencies {
         classpath("com.guardsquare:proguard-gradle:7.4.2")
+        classpath("com.android.tools:r8:8.3.37")
     }
 }
 
@@ -15,7 +20,6 @@ dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.3")
     testImplementation("org.assertj:assertj-core:3.25.3")
     testImplementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.13.4")
-    testImplementation("org.junit.platform:junit-platform-console:1.10.1")
 }
 
 tasks.shadowJar {
@@ -58,17 +62,43 @@ val testProGuard by tasks.registering(JavaExec::class) {
     dependsOn(proguardJar)
     notCompatibleWithConfigurationCache("ProGuard")
 
-    mainClass.set("org.junit.platform.console.ConsoleLauncher")
+    mainClass.set("org.onebusaway.proguard.ProGuardCompatibilityTest")
     classpath = files(proguardJarPath)
+}
+
+val r8JarPath = "${layout.buildDirectory.get()}/libs/${project.name}-${project.version}-r8.jar"
+val r8Jar by tasks.registering(JavaExec::class) {
+    group = "verification"
+    dependsOn(tasks.shadowJar)
+    notCompatibleWithConfigurationCache("R8")
+
+    mainClass.set("com.android.tools.r8.R8")
+    classpath = buildscript.configurations["classpath"]
+
     args = listOf(
-        "--classpath", proguardJarPath,
-        "--scan-classpath",
-        "--details", "verbose",
+        "--release",
+        "--classfile",
+        "--output", r8JarPath,
+        "--lib", System.getProperty("java.home"),
+        "--pg-conf", "./test.pro",
+        "--pg-conf", "../onebusaway-sdk-java-core/src/main/resources/META-INF/proguard/onebusaway-sdk-java-core.pro",
+        "--pg-map-output", "${layout.buildDirectory.get()}/r8-mapping.txt",
+        tasks.shadowJar.get().archiveFile.get().asFile.absolutePath,
     )
 }
 
+val testR8 by tasks.registering(JavaExec::class) {
+    group = "verification"
+    dependsOn(r8Jar)
+    notCompatibleWithConfigurationCache("R8")
+
+    mainClass.set("org.onebusaway.proguard.ProGuardCompatibilityTest")
+    classpath = files(r8JarPath)
+}
+
 tasks.test {
     dependsOn(testProGuard)
+    dependsOn(testR8)
     // We defer to the tests run via the ProGuard JAR.
     enabled = false
 }

onebusaway-sdk-java-proguard-test/src/test/kotlin/org/onebusaway/proguard/ProGuardCompatibilityTest.kt

@@ -3,8 +3,9 @@
 package org.onebusaway.proguard
 
 import com.fasterxml.jackson.module.kotlin.jacksonTypeRef
+import kotlin.reflect.full.memberFunctions
+import kotlin.reflect.jvm.javaMethod
 import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.Test
 import org.onebusaway.client.okhttp.OnebusawaySdkOkHttpClient
 import org.onebusaway.core.jsonMapper
@@ -14,12 +15,22 @@ internal class ProGuardCompatibilityTest {
 
     companion object {
 
-        @BeforeAll
         @JvmStatic
-        fun setUp() {
+        fun main(args: Array<String>) {
             // To debug that we're using the right JAR.
             val jarPath = this::class.java.getProtectionDomain().codeSource.location
             println("JAR being used: $jarPath")
+
+            // We have to manually run the test methods instead of using the JUnit runner because it
+            // seems impossible to get working with R8.
+            val test = ProGuardCompatibilityTest()
+            test::class
+                .memberFunctions
+                .asSequence()
+                .filter { function ->
+                    function.javaMethod?.isAnnotationPresent(Test::class.java) == true
+                }
+                .forEach { it.call(test) }
         }
     }
 

onebusaway-sdk-java-proguard-test/test.pro

@@ -2,4 +2,7 @@
 -keep class org.onebusaway.proguard.** { *; }
 
 # For the testing framework.
--keep class org.junit.** { *; }
+-keep class org.junit.** { *; }
+
+# Many warnings don't apply for our testing purposes.
+-dontwarn