make code compile

Author: martinbonnin

gradle.properties

@@ -1,5 +1,5 @@
 # Publishing defaults, could ultimately be moved to build scripts
-GROUP=com.apollographql.apollo3
+GROUP=com.apollographql.apollo
 VERSION_NAME=4.0.0-beta.8-SNAPSHOT
 
 POM_URL=https://github.com/apollographql/apollo-kotlin/

gradle/libraries.toml

@@ -63,32 +63,30 @@ androidx-profileinstaller = "androidx.profileinstaller:profileinstaller:1.3.1"
 androidx-sqlite = { group = "androidx.sqlite", name = "sqlite", version.ref = "androidx-sqlite" }
 androidx-sqlite-framework = { group = "androidx.sqlite", name = "sqlite-framework", version.ref = "androidx-sqlite" }
 androidx-startup-runtime = { group = "androidx.startup", name = "startup-runtime", version = "1.1.1" }
-apollo-api = { group = "com.apollographql.apollo3", name = "apollo-api", version.ref = "apollo" }
-apollo-api-java = { group = "com.apollographql.apollo3", name = "apollo-api-java", version.ref = "apollo" }
-apollo-httpCache = { group = "com.apollographql.apollo3", name = "apollo-http-cache", version.ref = "apollo" }
-apollo-idlingresource = { group = "com.apollographql.apollo3", name = "apollo-idling-resource", version.ref = "apollo" }
+apollo-api = { group = "com.apollographql.apollo", name = "apollo-api", version.ref = "apollo" }
+apollo-api-java = { group = "com.apollographql.apollo", name = "apollo-api-java", version.ref = "apollo" }
+apollo-httpCache = { group = "com.apollographql.apollo", name = "apollo-http-cache", version.ref = "apollo" }
+apollo-idlingresource = { group = "com.apollographql.apollo", name = "apollo-idling-resource", version.ref = "apollo" }
 apollo-mockserver = { group = "com.apollographql.mockserver", name = "apollo-mockserver", version = "0.0.3" }
-apollo-mpputils = { group = "com.apollographql.apollo3", name = "apollo-mpp-utils", version.ref = "apollo" }
-apollo-normalizedcache = { group = "com.apollographql.apollo3", name = "apollo-normalized-cache", version.ref = "apollo" }
+apollo-mpputils = { group = "com.apollographql.apollo", name = "apollo-mpp-utils", version.ref = "apollo" }
+apollo-normalizedcache = { group = "com.apollographql.apollo", name = "apollo-normalized-cache", version.ref = "apollo" }
 apollo-normalizedcache-incubating-snapshot = { group = "com.apollographql.cache", name = "normalized-cache-incubating", version.ref = "apollo-normalizedcache-incubating-snapshot" }
-apollo-normalizedcache-sqlite = { group = "com.apollographql.apollo3", name = "apollo-normalized-cache-sqlite", version.ref = "apollo" }
+apollo-normalizedcache-sqlite = { group = "com.apollographql.apollo", name = "apollo-normalized-cache-sqlite", version.ref = "apollo" }
 apollo-normalizedcache-sqlite-incubating-snapshot = { group = "com.apollographql.cache", name = "normalized-cache-sqlite-incubating", version.ref = "apollo-normalizedcache-incubating-snapshot" }
-apollo-plugin = { group = "com.apollographql.apollo3", name = "apollo-gradle-plugin", version.ref = "apollo" }
-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-plugin = { group = "com.apollographql.apollo", name = "apollo-gradle-plugin", version.ref = "apollo" }
+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" }
 # 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" }
-apollo-engine-ktor = { group = "com.apollographql.apollo3", name = "apollo-engine-ktor", version.ref = "apollo" }
-apollo-testingsupport = { group = "com.apollographql.apollo3", name = "apollo-testing-support", version.ref = "apollo" }
-# Used by the apollo-tooling project which uses a published version of Apollo
-apollo-testingsupport-published = { group = "com.apollographql.apollo3", name = "apollo-testing-support", version.ref = "apollo-published" }
-apollo-tooling = { group = "com.apollographql.apollo3", name = "apollo-tooling", version.ref = "apollo" }
+apollo-annotations = { group = "com.apollographql.apollo", name = "apollo-annotations", version.ref = "apollo" }
+apollo-engine-ktor = { group = "com.apollographql.apollo", name = "apollo-engine-ktor", version.ref = "apollo" }
+apollo-testingsupport = { group = "com.apollographql.apollo", name = "apollo-testing-support", version.ref = "apollo" }
+apollo-tooling = { group = "com.apollographql.apollo", name = "apollo-tooling", version.ref = "apollo" }
 assertj = { group = "org.assertj", name = "assertj-core", version = "3.24.2" }
 atomicfu-library = { group = "org.jetbrains.kotlinx", name = "atomicfu", version.ref = "atomicfu" }
 atomicfu-plugin = { group = "org.jetbrains.kotlinx", name = "atomicfu-gradle-plugin", version.ref = "atomicfu" }
@@ -200,7 +198,7 @@ slf4j-simple = "org.slf4j:slf4j-simple:2.0.13"
 slf4j-nop = "org.slf4j:slf4j-nop:2.0.13"
 
 [plugins]
-apollo = { id = "com.apollographql.apollo3", version.ref = "apollo" }
+apollo = { id = "com.apollographql.apollo", version.ref = "apollo" }
 apollo-published = { id = "com.apollographql.apollo3", version.ref = "apollo-published" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin-plugin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin-plugin" }

libraries/apollo-compiler/build.gradle.kts

@@ -44,6 +44,11 @@ abstract class GeneratePluginVersion : DefaultTask() {
 
   @TaskAction
   fun taskAction() {
+    outputDir.asFile.get().apply {
+      deleteRecursively()
+      mkdirs()
+    }
+
     val versionFile = File(outputDir.asFile.get(), "com/apollographql/apollo/compiler/Version.kt")
     versionFile.parentFile.mkdirs()
     versionFile.writeText("""// Generated file. Do not edit!

libraries/apollo-debug-server/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.apollo.api.ExecutionContext
-import com.apollographql.apollo.ast.GQLValue
+import com.apollographql.apollo3.api.ExecutionContext
+import com.apollographql.apollo3.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

libraries/apollo-gradle-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.apollo.api.ExecutionContext
+import com.apollographql.apollo3.api.ExecutionContext
 import com.apollographql.execution.ExecutableSchema
 import com.apollographql.execution.parsePostGraphQLRequest
 import okhttp3.mockwebserver.MockResponse

libraries/apollo-tooling/build.gradle.kts

@@ -16,14 +16,15 @@ dependencies {
   }
 
   implementation(project(":apollo-ast"))
+
   implementation(libs.apollo.runtime.published)
   implementation(libs.okhttp)
   implementation(libs.kotlinx.serialization.json)
 
   testImplementation(libs.junit)
   testImplementation(libs.truth)
   testImplementation(libs.apollo.mockserver)
-  testImplementation(libs.apollo.testingsupport.published)
+  testImplementation(project(":apollo-testing-support"))
 }
 
 apollo {

libraries/apollo-tooling/src/main/kotlin/com/apollographql/apollo/tooling/InternalPlatformApi.kt

@@ -1,6 +1,6 @@
 package com.apollographql.apollo.tooling
 
-import com.apollographql.apollo.ApolloClient
+import com.apollographql.apollo3.ApolloClient
 
 internal const val INTERNAL_PLATFORM_API_URL = "https://graphql.api.apollographql.com/api/graphql"
 

libraries/apollo-tooling/src/main/kotlin/com/apollographql/apollo/tooling/PersistedQueriesUploader.kt

@@ -1,7 +1,7 @@
 package com.apollographql.apollo.tooling
 
 import com.apollographql.apollo.annotations.ApolloExperimental
-import com.apollographql.apollo.api.Optional
+import com.apollographql.apollo3.api.Optional
 import com.apollographql.apollo.tooling.platformapi.public.PublishOperationsMutation
 import com.apollographql.apollo.tooling.platformapi.public.type.OperationType
 import com.apollographql.apollo.tooling.platformapi.public.type.PersistedQueryInput

libraries/apollo-tooling/src/main/kotlin/com/apollographql/apollo/tooling/RegisterOperations.kt

@@ -2,7 +2,7 @@ package com.apollographql.apollo.tooling
 
 import com.apollographql.apollo.annotations.ApolloDeprecatedSince
 import com.apollographql.apollo.annotations.ApolloExperimental
-import com.apollographql.apollo.api.Optional
+import com.apollographql.apollo3.api.Optional
 import com.apollographql.apollo.ast.GQLArgument
 import com.apollographql.apollo.ast.GQLDefinition
 import com.apollographql.apollo.ast.GQLDirective

libraries/apollo-tooling/src/main/kotlin/com/apollographql/apollo/tooling/SchemaDownloader.kt

@@ -1,8 +1,8 @@
 package com.apollographql.apollo.tooling
 
-import com.apollographql.apollo.ApolloClient
+import com.apollographql.apollo3.ApolloClient
 import com.apollographql.apollo.annotations.ApolloExperimental
-import com.apollographql.apollo.api.http.HttpHeader
+import com.apollographql.apollo3.api.http.HttpHeader
 import com.apollographql.apollo.ast.GQLDocument
 import com.apollographql.apollo.ast.introspection.IntrospectionSchema
 import com.apollographql.apollo.ast.introspection.toGQLDocument
@@ -13,7 +13,7 @@ import com.apollographql.apollo.ast.toFullSchemaGQLDocument
 import com.apollographql.apollo.ast.toGQLDocument
 import com.apollographql.apollo.ast.toSDL
 import com.apollographql.apollo.ast.toUtf8
-import com.apollographql.apollo.network.okHttpClient
+import com.apollographql.apollo3.network.okHttpClient
 import com.apollographql.apollo.tooling.SchemaHelper.reworkFullTypeFragment
 import com.apollographql.apollo.tooling.SchemaHelper.reworkInputValueFragment
 import com.apollographql.apollo.tooling.SchemaHelper.reworkIntrospectionQuery