Remove apollo-execution (#5978)

* Remove apollo-execution

* fix tests

Author: martinbonnin

build-logic/build.gradle.kts

@@ -22,6 +22,7 @@ dependencies {
 
   implementation(libs.kotlinx.benchmark)
   implementation(libs.dokkatoo)
+  implementation(libs.apollo.execution.gradle.plugin)
 
   // We add all the plugins to the classpath here so that they are loaded with proper conflict resolution
   // See https://github.com/gradle/gradle/issues/4741

gradle/libraries.toml

@@ -15,6 +15,7 @@ android-sdkversion-target = "30"
 androidx-sqlite = "2.3.1"
 # This is used by the gradle integration tests to get the artifacts locally
 apollo = "4.0.0-beta.8-SNAPSHOT"
+apollo-execution = "0.0.1"
 # Used by the apollo-tooling project which uses a published version of Apollo
 apollo-published = "4.0.0-beta.6"
 atomicfu = "0.23.1"
@@ -77,7 +78,10 @@ apollo-plugin = { group = "com.apollographql.apollo3", name = "apollo-gradle-plu
 apollo-runtime = { group = "com.apollographql.apollo3", name = "apollo-runtime", version.ref = "apollo" }
 apollo-compiler = { group = "com.apollographql.apollo3", name = "apollo-compiler", version.ref = "apollo" }
 apollo-ast = { group = "com.apollographql.apollo3", name = "apollo-ast", version.ref = "apollo" }
-apollo-execution = { group = "com.apollographql.apollo3", name = "apollo-execution-incubating", version.ref = "apollo" }
+apollo-execution = { group = "com.apollographql.execution", name = "runtime", version.ref = "apollo-execution" }
+apollo-execution-ktor = { group = "com.apollographql.execution", name = "runtime-ktor", version.ref = "apollo-execution" }
+apollo-execution-processor = { group = "com.apollographql.execution", name = "processor", version.ref = "apollo-execution" }
+apollo-execution-gradle-plugin = { group = "com.apollographql.execution", name = "gradle-plugin", version.ref = "apollo-execution" }
 # Used by the apollo-tooling project which uses a published version of Apollo
 apollo-runtime-published = { group = "com.apollographql.apollo3", name = "apollo-runtime", version.ref = "apollo-published" }
 apollo-annotations = { group = "com.apollographql.apollo3", name = "apollo-annotations", version.ref = "apollo" }

intellij-plugin/build.gradle.kts

@@ -186,10 +186,10 @@ fun isSnapshotBuild() = System.getenv("IJ_PLUGIN_SNAPSHOT").toBoolean()
 apollo {
   service("apolloDebug") {
     packageName.set("com.apollographql.apollo3.debug")
-    schemaFiles.from(file("../libraries/apollo-debug-server/src/androidMain/resources/schema.graphqls"))
+    schemaFiles.from(file("../libraries/apollo-debug-server/graphql/schema.graphqls"))
     introspection {
       endpointUrl.set("http://localhost:12200/")
-      schemaFile.set(file("../libraries/apollo-debug-server/src/androidMain/resources/schema.graphqls"))
+      schemaFile.set(file("../libraries/apollo-debug-server/graphql/schema.graphqls"))
     }
   }
 }

libraries/apollo-annotations/api/apollo-annotations.api

@@ -36,15 +36,3 @@ public abstract interface annotation class com/apollographql/apollo3/annotations
 public abstract interface annotation class com/apollographql/apollo3/annotations/ApolloRequiresOptIn : java/lang/annotation/Annotation {
 }
 
-public abstract interface annotation class com/apollographql/apollo3/annotations/GraphQLAdapter : java/lang/annotation/Annotation {
-	public abstract fun forScalar ()Ljava/lang/String;
-}
-
-public abstract interface annotation class com/apollographql/apollo3/annotations/GraphQLName : java/lang/annotation/Annotation {
-	public abstract fun name ()Ljava/lang/String;
-}
-
-public abstract interface annotation class com/apollographql/apollo3/annotations/GraphQLObject : java/lang/annotation/Annotation {
-	public abstract fun name ()Ljava/lang/String;
-}
-

libraries/apollo-annotations/api/apollo-annotations.klib.api

@@ -46,18 +46,3 @@ open annotation class com.apollographql.apollo3.annotations/ApolloInternal : kot
 open annotation class com.apollographql.apollo3.annotations/ApolloRequiresOptIn : kotlin/Annotation { // com.apollographql.apollo3.annotations/ApolloRequiresOptIn|null[0]
     constructor <init>() // com.apollographql.apollo3.annotations/ApolloRequiresOptIn.<init>|<init>(){}[0]
 }
-open annotation class com.apollographql.apollo3.annotations/GraphQLAdapter : kotlin/Annotation { // com.apollographql.apollo3.annotations/GraphQLAdapter|null[0]
-    constructor <init>(kotlin/String) // com.apollographql.apollo3.annotations/GraphQLAdapter.<init>|<init>(kotlin.String){}[0]
-    final val forScalar // com.apollographql.apollo3.annotations/GraphQLAdapter.forScalar|{}forScalar[0]
-        final fun <get-forScalar>(): kotlin/String // com.apollographql.apollo3.annotations/GraphQLAdapter.forScalar.<get-forScalar>|<get-forScalar>(){}[0]
-}
-open annotation class com.apollographql.apollo3.annotations/GraphQLName : kotlin/Annotation { // com.apollographql.apollo3.annotations/GraphQLName|null[0]
-    constructor <init>(kotlin/String) // com.apollographql.apollo3.annotations/GraphQLName.<init>|<init>(kotlin.String){}[0]
-    final val name // com.apollographql.apollo3.annotations/GraphQLName.name|{}name[0]
-        final fun <get-name>(): kotlin/String // com.apollographql.apollo3.annotations/GraphQLName.name.<get-name>|<get-name>(){}[0]
-}
-open annotation class com.apollographql.apollo3.annotations/GraphQLObject : kotlin/Annotation { // com.apollographql.apollo3.annotations/GraphQLObject|null[0]
-    constructor <init>(kotlin/String = ...) // com.apollographql.apollo3.annotations/GraphQLObject.<init>|<init>(kotlin.String){}[0]
-    final val name // com.apollographql.apollo3.annotations/GraphQLObject.name|{}name[0]
-        final fun <get-name>(): kotlin/String // com.apollographql.apollo3.annotations/GraphQLObject.name.<get-name>|<get-name>(){}[0]
-}

libraries/apollo-annotations/src/commonMain/kotlin/com/apollographql/apollo3/annotations/GraphQLAdapter.kt

@@ -1,14 +1,13 @@
 
-import com.android.build.gradle.tasks.BundleAar
+import com.apollographql.execution.gradle.internal.CopySchema
 import dev.adamko.dokkatoo.tasks.DokkatooGenerateTask
-import org.gradle.api.internal.artifacts.transform.UnzipTransform
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
   id("org.jetbrains.kotlin.multiplatform")
   alias(libs.plugins.apollo.published)
   id("com.google.devtools.ksp")
+  id("com.apollographql.execution")
 }
 
 apolloLibrary(
@@ -27,17 +26,29 @@ apolloLibrary(
 
 kotlin {
   sourceSets {
-    findByName("commonMain")?.apply {
-      kotlin.srcDir("build/generated/ksp/metadata/commonMain/kotlin")
-
+    findByName("commonMain")!!.apply {
       dependencies {
         implementation(project(":apollo-normalized-cache"))
         implementation(project(":apollo-normalized-cache-api"))
         implementation(project(":apollo-ast"))
         api(project(":apollo-runtime"))
+        implementation(libs.apollo.execution)
       }
     }
 
+    getByName("jvmMain") {
+      dependencies {
+        implementation(libs.apollo.execution.ktor)
+        implementation(libs.ktor.server.cio)
+        implementation(libs.slf4j)
+      }
+    }
+    getByName("jvmTest") {
+      dependencies {
+        implementation(libs.kotlin.test)
+        implementation(project(":apollo-runtime"))
+      }
+    }
     findByName("androidMain")?.apply {
       dependencies {
         implementation(libs.androidx.startup.runtime)
@@ -46,87 +57,24 @@ kotlin {
   }
 }
 
-val shadow = configurations.create("shadow") {
-  isCanBeConsumed = false
-  isCanBeResolved = true
+tasks.withType<DokkatooGenerateTask>().configureEach {
+  dependsOn("kspCommonMainKotlinMetadata")
 }
-
-val artifactType = Attribute.of("artifactType", String::class.java)
-
-val shadowUnzipped = configurations.create("shadowUnzipped") {
-  isCanBeConsumed = false
-  isCanBeResolved = true
-  attributes {
-    attribute(artifactType, ArtifactTypeDefinition.DIRECTORY_TYPE)
-  }
-  extendsFrom(shadow)
-}
-
-dependencies {
-  // apollo-execution is not published: we bundle it into the aar artifact
-  add(shadow.name, project(":apollo-execution-incubating")) {
-    isTransitive = false
-  }
-}
-
-configurations.all {
-  resolutionStrategy.eachDependency {
-    /**
-     * apollo-ksp is not published yet so we need to get it from the current build
-     */
-    if (requested.module.name == "apollo-ksp") {
-      useTarget("com.apollographql.apollo3:apollo-ksp-incubating:${requested.version}")
-    }
-  }
-}
-configurations.getByName(kotlin.sourceSets.getByName("commonMain").compileOnlyConfigurationName).extendsFrom(shadow)
-
-/**
- * KSP configuration
- * KMP support isn't great so we wire most of the things manually
- * See https://github.com/google/ksp/pull/1021
- */
-fun configureKsp() {
-  dependencies {
-    add("kspCommonMainMetadata", project(":apollo-ksp-incubating"))
-    add(
-        "kspCommonMainMetadata",
-        apollo.apolloKspProcessor(
-            schema = file(path = "src/androidMain/resources/schema.graphqls"),
-            service = "apolloDebugServer",
-            packageName = "com.apollographql.apollo3.debugserver.internal.graphql"
-        )
-    )
-  }
-  tasks.withType<KotlinCompile>().configureEach {
-    dependsOn("kspCommonMainKotlinMetadata")
-  }
-  tasks.withType<DokkatooGenerateTask>().configureEach {
+tasks.configureEach {
+  if (name.endsWith("sourcesJar", ignoreCase = true)) {
     dependsOn("kspCommonMainKotlinMetadata")
   }
-  tasks.configureEach {
-    if (name.endsWith("sourcesJar", ignoreCase = true)) {
-      dependsOn("kspCommonMainKotlinMetadata")
-    }
-  }
 }
-configureKsp()
 
-// apollo-execution is not published: we bundle it into the aar artifact
-val jarApolloExecution = tasks.register<Jar>("jarApolloExecution") {
-  archiveBaseName.set("apollo-execution")
-  from(shadowUnzipped)
-}
-
-tasks.withType<BundleAar>().configureEach {
-  from(jarApolloExecution) {
-    into("libs")
+apolloExecution {
+  service("apolloDebugServer") {
+    packageName = "com.apollographql.apollo3.debugserver.internal.graphql"
+    schemaPath.set("graphql/schema.graphqls")
   }
 }
-
-dependencies {
-  registerTransform(UnzipTransform::class.java) {
-    from.attribute(artifactType, ArtifactTypeDefinition.JAR_TYPE)
-    to.attribute(artifactType, ArtifactTypeDefinition.DIRECTORY_TYPE)
+tasks.withType(CopySchema::class.java).configureEach {
+  doFirst {
+    // https://github.com/apollographql/apollo-kotlin-execution/pull/6
+    (this as CopySchema).to.get().asFile.delete()
   }
-}
+}

libraries/apollo-annotations/src/commonMain/kotlin/com/apollographql/apollo3/annotations/GraphQLName.kt

@@ -0,0 +1,45 @@
+schema {
+  query: Query
+}
+
+scalar Fields
+
+"""
+ The root query
+"""
+type Query {
+  apolloClients: [ApolloClient!]!
+
+  """
+   Returns null if an ApolloClient with the given id is not found.
+  """
+  apolloClient(id: ID!): ApolloClient
+}
+
+type ApolloClient {
+  id: ID!
+
+  displayName: String!
+
+  normalizedCaches: [NormalizedCache!]!
+
+  normalizedCache(id: ID!): NormalizedCache
+}
+
+type NormalizedCache {
+  id: ID!
+
+  displayName: String!
+
+  recordCount: Int!
+
+  records: [Record!]!
+}
+
+type Record {
+  key: String!
+
+  fields: Fields!
+
+  sizeInBytes: Int!
+}