Track @ApolloExperimental symbols in public API (#6416)

* Fix applying OptIn options

* fix merge

Author: martinbonnin

build-logic/src/main/kotlin/CompilerOptions.kt

@@ -1,7 +1,6 @@
 import com.android.build.gradle.BaseExtension
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
-import org.gradle.api.artifacts.ExternalDependency
 import org.gradle.api.plugins.JavaPluginExtension
 import org.gradle.api.tasks.compile.JavaCompile
 import org.gradle.api.tasks.testing.Test
@@ -17,12 +16,16 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinNativeCompilerOptions
 import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
 import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 
 /**
  * @param target the JVM version we want to be compatible with (bytecode + bootstrap classpath)
  */
-fun KotlinCommonCompilerOptions.configure(target: Int, kotlinCompilerOptions: KotlinCompilerOptions, isAndroid: Boolean) {
+fun KotlinCommonCompilerOptions.configure(
+    target: Int,
+    kotlinCompilerOptions: KotlinCompilerOptions,
+    isAndroid: Boolean,
+    optIns: List<String>
+) {
   val actualTarget = when {
     isAndroid -> {
       // https://blog.blundellapps.co.uk/setting-jdk-level-in-android-gradle-builds/
@@ -35,13 +38,9 @@ fun KotlinCommonCompilerOptions.configure(target: Int, kotlinCompilerOptions: Ko
 
   freeCompilerArgs.add("-Xexpect-actual-classes")
 
-  /**
-   * Inside our own codebase, we opt-in ApolloInternal and ApolloExperimental
-   * We might want to do something more precise where we only opt-in for libraries but still require integration tests to opt-in with more granularity
-   */
-  freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
-  freeCompilerArgs.add("-opt-in=com.apollographql.apollo.annotations.ApolloExperimental")
-  freeCompilerArgs.add("-opt-in=com.apollographql.apollo.annotations.ApolloInternal")
+  optIns.forEach {
+    freeCompilerArgs.add("-opt-in=$it")
+  }
 
   apiVersion.set(kotlinCompilerOptions.version)
   languageVersion.set(kotlinCompilerOptions.version)
@@ -106,12 +105,12 @@ val Project.androidExtensionOrNull: BaseExtension?
     return (extensions.findByName("android") as? BaseExtension)
   }
 
-fun Project.configureJavaAndKotlinCompilers(jvmTarget: Int?, kotlinCompilerOptions: KotlinCompilerOptions) {
+fun Project.configureJavaAndKotlinCompilers(jvmTarget: Int?, kotlinCompilerOptions: KotlinCompilerOptions, optIns: List<String>) {
   @Suppress("NAME_SHADOWING")
   val jvmTarget = jvmTarget ?: 8
 
   kotlinExtensionOrNull?.forEachCompilerOptions { isAndroid ->
-    configure(jvmTarget, kotlinCompilerOptions, isAndroid)
+    configure(jvmTarget, kotlinCompilerOptions, isAndroid, optIns)
   }
   project.tasks.withType(JavaCompile::class.java).configureEach {
     // For JVM only modules, this dictates the "org.gradle.jvm.version" Gradle attribute
@@ -131,11 +130,6 @@ fun Project.configureJavaAndKotlinCompilers(jvmTarget: Int?, kotlinCompilerOptio
     }
   }
 
-  (kotlinExtensionOrNull as? KotlinMultiplatformExtension)?.sourceSets?.configureEach {
-    languageSettings.optIn("com.apollographql.apollo.annotations.ApolloExperimental")
-    languageSettings.optIn("com.apollographql.apollo.annotations.ApolloInternal")
-  }
-
   /**
    * We're using a toolchain to ensure build cache can be shared. Many tasks, including compileJava use the
    * java version as input and using different JDKs will trash the cache.
@@ -160,14 +154,6 @@ fun setTestToolchain(project: Project, test: Test, javaVersion: Int) {
 
 }
 
-internal fun Project.addOptIn(vararg annotations: String) {
-  tasks.withType(KotlinCompilationTask::class.java).configureEach {
-    compilerOptions {
-      freeCompilerArgs.addAll(annotations.map { "-opt-in=$it" })
-    }
-  }
-}
-
 fun Project.allWarningsAsErrors(allWarningsAsErrors: Boolean) {
   kotlinExtensionOrNull?.forEachCompilerOptions {
     this.allWarningsAsErrors.set(allWarningsAsErrors)

build-logic/src/main/kotlin/api.kt

@@ -6,9 +6,6 @@ import org.gradle.api.tasks.TaskProvider
 import org.gradle.jvm.tasks.Jar
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
-import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
-import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
-import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask
 
 class AndroidOptions(
     val withCompose: Boolean,
@@ -37,10 +34,15 @@ fun Project.apolloLibrary(
     configureAndroid(namespace, androidOptions)
   }
   commonSetup()
-  configureJavaAndKotlinCompilers(jvmTarget, kotlinCompilerOptions)
 
-  addOptIn(
-      "com.apollographql.apollo.annotations.ApolloInternal"
+  configureJavaAndKotlinCompilers(
+      jvmTarget,
+      kotlinCompilerOptions,
+      listOf(
+          "kotlin.RequiresOptIn",
+          "com.apollographql.apollo.annotations.ApolloInternal",
+          "com.apollographql.apollo.annotations.ApolloExperimental"
+      )
   )
 
   if (publish) {
@@ -102,10 +104,14 @@ fun Project.apolloTest(
     kotlinCompilerOptions: KotlinCompilerOptions = KotlinCompilerOptions(),
 ) {
   commonSetup()
-  configureJavaAndKotlinCompilers(null, kotlinCompilerOptions)
-  addOptIn(
-      "com.apollographql.apollo.annotations.ApolloExperimental",
-      "com.apollographql.apollo.annotations.ApolloInternal",
+  configureJavaAndKotlinCompilers(
+      null,
+      kotlinCompilerOptions,
+      listOf(
+          "kotlin.RequiresOptIn",
+          "com.apollographql.apollo.annotations.ApolloExperimental",
+          "com.apollographql.apollo.annotations.ApolloInternal"
+      )
   )
 
   if (extensions.findByName("kotlin") is KotlinMultiplatformExtension) {

build.gradle.kts

@@ -139,12 +139,6 @@ configure<kotlinx.validation.ApiValidationExtension> {
   )
 
   ignoredProjects.add("intellij-plugin")
-
-  nonPublicMarkers.addAll(
-      listOf(
-          "com.apollographql.apollo.annotations.ApolloExperimental",
-      )
-  )
 }
 
 tasks.register("rmbuild") {