Update R8 and Gr8 (#6280)

Author: martinbonnin

gradle/libraries.toml

@@ -98,7 +98,7 @@ dgp = "com.gradle:develocity-gradle-plugin:3.18.2" # // sync with settings.gradl
 # annotation @org.jetbrains.annotations.Nullable not applicable in this type context
 google-testing-compile = { group = "com.google.testing.compile", name = "compile-testing", version = "0.19" }
 google-testparameterinjector = { group = "com.google.testparameterinjector", name = "test-parameter-injector", version = "1.11" }
-gr8 = { group = "com.gradleup", name = "gr8-plugin", version = "0.8" }
+gr8 = { group = "com.gradleup", name = "gr8-plugin", version = "0.11.1" }
 #
 # See https://github.com/gradle/gradle/issues/1835
 # We use the Nokee[redistributed artifacts](https://docs.nokee.dev/manual/gradle-plugin-development.html#sec:gradle-dev-redistributed-gradle-api)

gradle/repositories.gradle.kts

@@ -7,9 +7,24 @@ listOf(pluginManagement.repositories, dependencyResolutionManagement.repositorie
     exclusiveContent {
       forRepository(::google)
       filter {
-        includeModuleByRegex("com\\.android.*", ".*")
+        includeGroup("com.android")
+        includeGroup("com.android.library")
+        includeGroup("com.android.application")
+        includeGroup("com.android.databinding")
+        includeGroup("com.android.lint")
+        includeGroup("com.google.testing.platform")
+        /*
+         * The com.android.tools groupId is verbose because we don't want to clash with com.android.tools:r8 in the raw repository
+         */
+        includeModule("com.android.tools", "sdk-common")
+        includeModule("com.android.tools", "sdklib")
+        includeModule("com.android.tools", "repository")
+        includeModule("com.android.tools", "common")
+        includeModule("com.android.tools", "dvlib")
+        includeModule("com.android.tools", "annotations")
+        includeModule("com.android.tools", "play-sdk-proto")
+        includeGroupByRegex("com\\.android\\.tools\\..*")
         includeModuleByRegex("androidx\\..*", ".*")
-        includeModuleByRegex("com.google.testing.platform", ".*")
       }
     }
 

libraries/apollo-ast/build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 }
 
 apolloLibrary(
-  namespace = "com.apollographql.apollo.ast"
+    namespace = "com.apollographql.apollo.ast",
 )
 
 kotlin {

libraries/apollo-compiler/api/apollo-compiler.api

@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -6,7 +7,8 @@ plugins {
 }
 
 apolloLibrary(
-    namespace = "com.apollographql.apollo.compiler"
+    namespace = "com.apollographql.apollo.compiler",
+    kotlinCompilerOptions = KotlinCompilerOptions(KotlinVersion.KOTLIN_1_9)
 )
 
 dependencies {

libraries/apollo-compiler/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
+
 plugins {
   id("org.jetbrains.kotlin.jvm")
   id("java-gradle-plugin")
@@ -8,7 +10,8 @@ plugins {
 
 apolloLibrary(
     namespace = "com.apollographql.apollo.gradle",
-    jvmTarget = 11 // AGP requires 11
+    jvmTarget = 11, // AGP requires 11
+    kotlinCompilerOptions = KotlinCompilerOptions(KotlinVersion.KOTLIN_1_9)
 )
 
 dependencies {

libraries/apollo-gradle-plugin-external/build.gradle.kts

@@ -1,33 +1,26 @@
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
+
 plugins {
   id("org.jetbrains.kotlin.jvm")
   id("java-gradle-plugin")
   id("com.gradle.plugin-publish")
   id("com.gradleup.gr8")
 }
 
+val jvmTarget = 11 // AGP requires 11
 apolloLibrary(
     namespace = "com.apollographql.apollo.gradle.relocated",
-    jvmTarget = 11 // AGP requires 11
+    jvmTarget = jvmTarget,
+    kotlinCompilerOptions = KotlinCompilerOptions(KotlinVersion.KOTLIN_1_9)
 )
 
-// Configuration for extra jar to pass to R8 to give it more context about what can be relocated
-configurations.create("gr8Classpath")
-// Configuration dependencies that will be shadowed
-val shadeConfiguration = configurations.create("shade")
-
 // Set to false to skip relocation and save some building time during development
 val relocateJar = System.getenv("APOLLO_RELOCATE_JAR")?.toBoolean() ?: true
 
-dependencies {
-  /**
-   * OkHttp has some bytecode that checks for Conscrypt at runtime (https://github.com/square/okhttp/blob/71427d373bfd449f80178792fe231f60e4c972db/okhttp/src/main/kotlin/okhttp3/internal/platform/ConscryptPlatform.kt#L59)
-   * Put this in the classpath so that R8 knows it can relocate DisabledHostnameVerifier as the superclass is not package-private
-   *
-   * Keep in sync with https://github.com/square/okhttp/blob/71427d373bfd449f80178792fe231f60e4c972db/buildSrc/src/main/kotlin/deps.kt#L24
-   */
-  add("gr8Classpath", "org.conscrypt:conscrypt-openjdk-uber:2.5.2")
+val shadowedDependencies = configurations.create("shadowedDependencies")
 
-  add("shade", project(":apollo-gradle-plugin-external"))
+dependencies {
+  add(shadowedDependencies.name, project(":apollo-gradle-plugin-external"))
 
   testImplementation(project(":apollo-ast"))
   testImplementation(libs.junit)
@@ -45,63 +38,35 @@ dependencies {
   testImplementation(libs.slf4j.nop.get().toString()) {
     because("jetty uses SL4F")
   }
-
 }
 
+
 if (relocateJar) {
   gr8 {
-    val shadowedJar = create("shadow") {
-      proguardFile("rules.pro")
-      configuration("shade")
-      classPathConfiguration("gr8Classpath")
-
-      exclude(".*MANIFEST.MF")
-      exclude("META-INF/versions/9/module-info\\.class")
-      exclude("META-INF/kotlin-stdlib.*\\.kotlin_module")
-
-      // Remove the following error:
-      // /Users/mbonnin/.m2/repository/com/apollographql/apollo/apollo-gradle-plugin/3.3.3-SNAPSHOT/apollo-gradle-plugin-3.3.3-SNAPSHOT.jar!/META-INF/kotlinpoet.kotlin_module:
-      // Module was compiled with an incompatible version of Kotlin. The binary version of its metadata is 1.7.1,
-      // expected version is 1.5.1.
-      exclude("META-INF/kotlinpoet.kotlin_module")
-
-      //Remove the following error:
-      // /Users/mbonnin/git/test-gradle-7-4/src/main/kotlin/Main.kt: (2, 5): Class 'kotlin.Unit' was compiled
-      // with an incompatible version of Kotlin. The binary version of its metadata is 1.7.1, expected version
-      // is 1.5.1.
-      exclude("kotlin/Unit.class")
-
-      // Remove proguard rules from dependencies, we'll manage them ourselves
-      exclude("META-INF/proguard/.*")
-
+    val shadowedJar = create("default") {
+      addProgramJarsFrom(shadowedDependencies)
+      addProgramJarsFrom(tasks.getByName("jar"))
+      r8Version("887704078a06fc0090e7772c921a30602bf1a49f")
       systemClassesToolchain {
-        languageVersion.set(JavaLanguageVersion.of(8))
+        languageVersion.set(JavaLanguageVersion.of(jvmTarget))
       }
+      proguardFile("rules.pro")
+      registerFilterTransform(listOf(".*/impldep/META-INF/versions/.*"))
     }
 
-    // The java-gradle-plugin adds `gradleApi()` to the `api` implementation but it contains some JDK15 bytecode at
-    // org/gradle/internal/impldep/META-INF/versions/15/org/bouncycastle/jcajce/provider/asymmetric/edec/SignatureSpi$EdDSA.class:
-    // java.lang.IllegalArgumentException: Unsupported class file major version 59
-    // So remove it
-    val apiDependencies = project.configurations.getByName("api").dependencies
-    apiDependencies.firstOrNull {
-      it is FileCollectionDependency
-    }.let {
-      apiDependencies.remove(it)
-    }
-
+    removeGradleApiFromApi()
     configurations.named("compileOnly").configure {
-      extendsFrom(shadeConfiguration)
+      extendsFrom(shadowedDependencies)
     }
     configurations.named("testImplementation").configure {
-      extendsFrom(shadeConfiguration)
+      extendsFrom(shadowedDependencies)
     }
 
     replaceOutgoingJar2(shadowedJar)
   }
 } else {
   configurations.named("implementation").configure {
-    extendsFrom(shadeConfiguration)
+    extendsFrom(shadowedDependencies)
   }
 }
 
@@ -112,7 +77,6 @@ fun replaceOutgoingJar2(newJar: Any) {
         it.name == "apollo-gradle-plugin" && it.type == "jar" && it.classifier.isNullOrEmpty()
       }
       if (removed) {
-
         artifact(newJar) {
           // Pom and maven consumers do not like the `-all` or `-shadowed` classifiers
           classifier = ""

libraries/apollo-gradle-plugin/build.gradle.kts

@@ -1,3 +1,5 @@
+#noinspection ShrinkerUnresolvedReference
+
 # Keep kotlin metadata so that the Kotlin compiler knows about top level functions such as
 #  Line 1: import com.apollographql.apollo.gradle.api.kotlinMultiplatformExtension
 #                                                      ^ Unresolved reference: kotlinMultiplatformExtension
@@ -12,7 +14,7 @@
 # 'Declaration of property alwaysGenerateTypesMatching does not include any type arguments in its property type interface org.gradle.api.provider.SetProperty'
 -keepattributes Signature,InnerClasses,EnclosingMethod
 # Similarly, Gradle needs the @Inject annotations
--keepattributes *Annotation*
+-keepattributes RuntimeVisible*Annotation*
 # For debug
 -keepattributes SourceFile,LineNumberTable
 
@@ -24,34 +26,18 @@
 
 # Keep apollo-annotations for ApolloExperimental
 -keep class com.apollographql.apollo.annotations.** { *; }
-# We don't need to keep apollo-api but it's been here for a while and some folks might depend on it so keep it
--keep class com.apollographql.apollo.api.** { *; }
-# Keep compiler API as it's used in workers and for things like OperationOutputGenerator
+# Keep the plugin API as it's used from build scripts
+-keep class com.apollographql.apollo.gradle.api.** { *; }
+-keep interface com.apollographql.apollo.gradle.api.** { *; }
+# And also the compiler API as it's used transitively for things like OperationOutputGenerator
 -keep class com.apollographql.apollo.compiler.** { *; }
 -keep interface com.apollographql.apollo.compiler.** { *; }
 -keep enum com.apollographql.apollo.compiler.** { *; }
 # Schema is used in a worker: https://github.com/apollographql/apollo-kotlin/blob/198480d8b0b24c01f4d11da0b1e9fa9c97062c5c/libraries/apollo-gradle-plugin-external/src/main/kotlin/com/apollographql/apollo/gradle/internal/ApolloGenerateSourcesTask.kt#L131
 -keep class com.apollographql.apollo.ast.Schema { *; }
-# Keep the plugin API as it's used from build scripts
--keep class com.apollographql.apollo.gradle.api.** { *; }
--keep interface com.apollographql.apollo.gradle.api.** { *; }
--keep enum com.apollographql.apollo.gradle.api.** { *; }
-# Keep the ApolloPlugin entry point and everything in internal too (not sure why this is needed, ApolloGenerateSourcesTask is shrunk else)
+# Keep the ApolloPlugin entry point and everything in internal too because we have ApolloPlugin there
 -keep class com.apollographql.apollo.gradle.internal.** { *; }
 
--keep class org.gradle.api.** { *; }
--keep interface org.gradle.api.** { *; }
--keep enum org.gradle.api.** { *; }
-
-# OkHttp has a rule that keeps PublicSuffixDatabase. It's not clear if we need it or not. For now, keep the rule. This has the
-# effect of actually keeping okhttp3.internal.publicsuffix.PublicSuffixDatabase. If this ever clashes with another version of
-# okhttp, a solution would be to uncomment the line below and use mapping.txt to relocate okhttp3/internal/publicsuffix/publicsuffixes.gz
-# inside the zip
-# See https://github.com/square/okhttp/pull/3421 and https://github.com/square/okhttp/pull/3647
--keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
-
-# Makes it easier to debug on MacOS case-insensitive filesystem when unzipping the jars
--dontusemixedcaseclassnames
 # Keep class names to make debugging easier
 -dontobfuscate
 -repackageclasses com.apollographql.apollo.relocated
@@ -60,4 +46,10 @@
 -allowaccessmodification
 
 # The Gradle API jar and other compileOnly dependencies aren't added to the classpath, ignore the missing symbols
--dontwarn **
+# I tried adding them but they duplicate a lot of the program classes and trigger errors in R8.
+# A future version could try to remove the intersection between the compileOnly classpath and the runtime one
+-dontwarn org.gradle.**
+-dontwarn org.jetbrains.kotlin.gradle.**
+-dontwarn com.android.build.gradle.**
+-dontwarn com.android.builder.**
+-dontwarn javax.inject.Inject