Update apollo-kotlin-execution (#6040)

* upadte apollo-kotlin-execution * unbreak Gradle tests
apollographql · Jul 8, 2024 · 793baca · 793baca
1 parent b22ca6c
commit 793baca
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 26 deletions.
diff --git a/gradle/libraries.toml b/gradle/libraries.toml
@@ -15,7 +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-rc.2-SNAPSHOT"
-apollo-execution = "0.0.1"
+apollo-execution = "0.0.2"
 apollo-normalizedcache-incubating-snapshot = "0.0.2-SNAPSHOT"
 # Used by the apollo-tooling project which uses a published version of Apollo
 apollo-published = "4.0.0-rc.1"
@@ -77,10 +77,10 @@ apollo-plugin = { group = "com.apollographql.apollo", name = "apollo-gradle-plug
 apollo-runtime = { group = "com.apollographql.apollo", name = "apollo-runtime", version.ref = "apollo" }
 apollo-compiler = { group = "com.apollographql.apollo", name = "apollo-compiler", version.ref = "apollo" }
 apollo-ast = { group = "com.apollographql.apollo", name = "apollo-ast", 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" }
+apollo-execution = { group = "com.apollographql.execution", name = "apollo-execution-runtime", version.ref = "apollo-execution" }
+apollo-execution-ktor = { group = "com.apollographql.execution", name = "apollo-execution-ktor", version.ref = "apollo-execution" }
+apollo-execution-processor = { group = "com.apollographql.execution", name = "apollo-execution-processor", version.ref = "apollo-execution" }
+apollo-execution-gradle-plugin = { group = "com.apollographql.execution", name = "apollo-execution-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.apollo", name = "apollo-runtime", version.ref = "apollo-published" }
 apollo-annotations = { group = "com.apollographql.apollo", name = "apollo-annotations", version.ref = "apollo" }

diff --git a/gradle/repositories.gradle.kts b/gradle/repositories.gradle.kts
@@ -4,7 +4,6 @@ listOf(pluginManagement.repositories, dependencyResolutionManagement.repositorie
     // maven { url = uri("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/") }
 
     mavenCentral()
-
     exclusiveContent {
       forRepository(::google)
       filter {

diff --git a/libraries/apollo-debug-server/build.gradle.kts b/libraries/apollo-debug-server/build.gradle.kts
@@ -1,5 +1,4 @@
 
-import com.apollographql.execution.gradle.internal.CopySchema
 import dev.adamko.dokkatoo.tasks.DokkatooGenerateTask
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
@@ -72,9 +71,3 @@ apolloExecution {
     schemaPath.set("graphql/schema.graphqls")
   }
 }
-tasks.withType(CopySchema::class.java).configureEach {
-  doFirst {
-    // https://github.com/apollographql/apollo-kotlin-execution/pull/6
-    (this as CopySchema).to.get().asFile.delete()
-  }
-}
diff --git a/...er/src/commonMain/kotlin/com/apollographql/apollo/debugserver/internal/graphql/GraphQL.kt b/...er/src/commonMain/kotlin/com/apollographql/apollo/debugserver/internal/graphql/GraphQL.kt
@@ -1,8 +1,8 @@
 package com.apollographql.apollo.debugserver.internal.graphql
 
 import com.apollographql.apollo.ApolloClient
-import com.apollographql.apollo3.api.ExecutionContext
-import com.apollographql.apollo3.ast.GQLValue
+import com.apollographql.apollo.api.ExecutionContext
+import com.apollographql.apollo.ast.GQLValue
 import com.apollographql.apollo.cache.normalized.api.CacheKey
 import com.apollographql.apollo.cache.normalized.api.Record
 import com.apollographql.apollo.cache.normalized.apolloStore

diff --git a/...plugin/src/test-java11/kotlin/com/apollographql/apollo/gradle/test/DownloadSchemaTests.kt b/...plugin/src/test-java11/kotlin/com/apollographql/apollo/gradle/test/DownloadSchemaTests.kt
@@ -1,7 +1,7 @@
 package com.apollographql.apollo.gradle.test
 
 
-import com.apollographql.apollo3.api.ExecutionContext
+import com.apollographql.apollo.api.ExecutionContext
 import com.apollographql.execution.ExecutableSchema
 import com.apollographql.execution.parsePostGraphQLRequest
 import okhttp3.mockwebserver.MockResponse

diff --git a/tests/sample-server/build.gradle.kts b/tests/sample-server/build.gradle.kts
@@ -1,4 +1,3 @@
-import com.apollographql.execution.gradle.internal.CopySchema
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 plugins {
@@ -36,12 +35,6 @@ apolloExecution {
     packageName = "sample.server"
   }
 }
-tasks.withType(CopySchema::class.java).configureEach {
-  doFirst {
-    // https://github.com/apollographql/apollo-kotlin-execution/pull/6
-    (this as CopySchema).to.get().asFile.delete()
-  }
-}
 
 application {
   mainClass.set("com.apollographql.apollo.sample.server.MainKt")

diff --git a/tests/sample-server/src/main/kotlin/com/apollographql/apollo/sample/server/SampleServer.kt b/tests/sample-server/src/main/kotlin/com/apollographql/apollo/sample/server/SampleServer.kt
@@ -1,7 +1,7 @@
 package com.apollographql.apollo.sample.server
 
 import com.apollographql.apollo.sample.server.graphql.SubscriptionRoot
-import com.apollographql.apollo3.api.ExecutionContext
+import com.apollographql.apollo.api.ExecutionContext
 import com.apollographql.execution.ExecutableSchema
 import com.apollographql.execution.parseGetGraphQLRequest
 import com.apollographql.execution.parsePostGraphQLRequest

diff --git a/...ple-server/src/main/kotlin/com/apollographql/apollo/sample/server/graphql/MutationRoot.kt b/...ple-server/src/main/kotlin/com/apollographql/apollo/sample/server/graphql/MutationRoot.kt
@@ -1,7 +1,7 @@
 package com.apollographql.apollo.sample.server.graphql
 
 import com.apollographql.apollo.sample.server.WebSocketRegistry
-import com.apollographql.apollo3.api.ExecutionContext
+import com.apollographql.apollo.api.ExecutionContext
 import com.apollographql.execution.annotation.GraphQLMutationRoot
 
 

diff --git a/...server/src/main/kotlin/com/apollographql/apollo/sample/server/graphql/SubscriptionRoot.kt b/...server/src/main/kotlin/com/apollographql/apollo/sample/server/graphql/SubscriptionRoot.kt
@@ -1,7 +1,7 @@
 package com.apollographql.apollo.sample.server.graphql
 
 import com.apollographql.apollo.sample.server.CurrentWebSocket
-import com.apollographql.apollo3.api.ExecutionContext
+import com.apollographql.apollo.api.ExecutionContext
 import com.apollographql.execution.annotation.GraphQLSubscriptionRoot
 import com.apollographql.execution.websocket.subscriptionId
 import kotlinx.coroutines.delay