Bump apollo-published to "4.0.0-rc.1" (#6038)

* Bump apollo-published to "4.0.0-rc.1" (cherry picked from commit 3d0e15d683e300122c81b9f2473b2e1a3ebaca51) * Change generated model package name
apollographql · Jul 8, 2024 · b22ca6c · b22ca6c
1 parent 0a9394f
commit b22ca6c
Show file tree

Hide file tree

Showing 19 changed files with 48 additions and 50 deletions.
diff --git a/gradle/libraries.toml b/gradle/libraries.toml
@@ -18,7 +18,7 @@ apollo = "4.0.0-rc.2-SNAPSHOT"
 apollo-execution = "0.0.1"
 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-beta.6"
+apollo-published = "4.0.0-rc.1"
 atomicfu = "0.24.0"
 cache = "2.0.2"
 compose = "1.5.1"
@@ -82,7 +82,7 @@ apollo-execution-ktor = { group = "com.apollographql.execution", name = "runtime
 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-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" }
 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" }
@@ -199,7 +199,7 @@ slf4j-nop = "org.slf4j:slf4j-nop:2.0.13"
 
 [plugins]
 apollo = { id = "com.apollographql.apollo", version.ref = "apollo" }
-apollo-published = { id = "com.apollographql.apollo3", version.ref = "apollo-published" }
+apollo-published = { id = "com.apollographql.apollo", 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" }
 kotlin-android-min = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin-plugin-min" }

diff --git a/intellij-plugin/build.gradle.kts b/intellij-plugin/build.gradle.kts
@@ -191,8 +191,8 @@ dependencies {
 fun isSnapshotBuild() = System.getenv("IJ_PLUGIN_SNAPSHOT").toBoolean()
 
 apollo {
-  service("apolloDebug") {
-    packageName.set("com.apollographql.apollo3.debug")
+  service("apolloDebugServer") {
+    packageName.set("com.apollographql.ijplugin.apollodebugserver")
     schemaFiles.from(file("../libraries/apollo-debug-server/graphql/schema.graphqls"))
     introspection {
       endpointUrl.set("http://localhost:12200/")

diff --git a/...-plugin/src/main/kotlin/com/apollographql/ijplugin/apollodebugserver/ApolloDebugClient.kt b/...-plugin/src/main/kotlin/com/apollographql/ijplugin/apollodebugserver/ApolloDebugClient.kt
@@ -2,10 +2,8 @@ package com.apollographql.ijplugin.apollodebugserver
 
 import com.android.ddmlib.IDevice
 import com.android.tools.idea.adb.AdbShellCommandsUtil
-import com.apollographql.apollo3.ApolloClient
-import com.apollographql.apollo3.debug.GetApolloClientsQuery
-import com.apollographql.apollo3.debug.GetNormalizedCacheQuery
-import com.apollographql.apollo3.network.http.LoggingInterceptor
+import com.apollographql.apollo.ApolloClient
+import com.apollographql.apollo.network.http.LoggingInterceptor
 import com.apollographql.ijplugin.util.apollo3
 import com.apollographql.ijplugin.util.apollo4
 import com.apollographql.ijplugin.util.executeCatching

diff --git a/...plugin/src/main/kotlin/com/apollographql/ijplugin/normalizedcache/PullFromDeviceDialog.kt b/...plugin/src/main/kotlin/com/apollographql/ijplugin/normalizedcache/PullFromDeviceDialog.kt
@@ -3,10 +3,10 @@ package com.apollographql.ijplugin.normalizedcache
 import android.annotation.SuppressLint
 import com.android.ddmlib.Client
 import com.android.ddmlib.IDevice
-import com.apollographql.apollo3.debug.GetApolloClientsQuery
 import com.apollographql.ijplugin.ApolloBundle
 import com.apollographql.ijplugin.apollodebugserver.ApolloDebugClient
 import com.apollographql.ijplugin.apollodebugserver.ApolloDebugClient.Companion.getApolloDebugClients
+import com.apollographql.ijplugin.apollodebugserver.GetApolloClientsQuery
 import com.apollographql.ijplugin.apollodebugserver.normalizedCacheSimpleName
 import com.apollographql.ijplugin.icons.ApolloIcons
 import com.apollographql.ijplugin.ui.tree.DynamicNode

diff --git a/...com/apollographql/ijplugin/normalizedcache/provider/ApolloDebugNormalizedCacheProvider.kt b/...com/apollographql/ijplugin/normalizedcache/provider/ApolloDebugNormalizedCacheProvider.kt
@@ -1,7 +1,7 @@
 package com.apollographql.ijplugin.normalizedcache.provider
 
 import com.apollographql.apollo.cache.normalized.api.CacheKey
-import com.apollographql.apollo3.debug.GetNormalizedCacheQuery
+import com.apollographql.ijplugin.apollodebugserver.GetNormalizedCacheQuery
 import com.apollographql.ijplugin.normalizedcache.NormalizedCache
 import com.apollographql.ijplugin.normalizedcache.NormalizedCache.Field
 import com.apollographql.ijplugin.normalizedcache.NormalizedCache.FieldValue

diff --git a/libraries/apollo-tooling/src/main/graphql/graphql/extra.graphqls b/libraries/apollo-tooling/src/main/graphql/graphql/extra.graphqls
@@ -1,2 +1,2 @@
-extend schema @link(url: "https://specs.apollo.dev/nullability/v0.3", import: ["@catch", "CatchTo"])
-extend schema @catch(to: THROW)
+extend schema @link(url: "https://specs.apollo.dev/nullability/v0.4", import: ["@catchByDefault", "CatchTo"])
+extend schema @catchByDefault(to: THROW)
diff --git a/libraries/apollo-tooling/src/main/graphql/platform-api/internal/extra.graphqls b/libraries/apollo-tooling/src/main/graphql/platform-api/internal/extra.graphqls
@@ -1,5 +1,5 @@
-extend schema @link(url: "https://specs.apollo.dev/nullability/v0.3", import: ["@semanticNonNull", "@semanticNonField", "@catch", "CatchTo"])
-extend schema @catch(to: THROW)
+extend schema @link(url: "https://specs.apollo.dev/nullability/v0.4", import: ["@semanticNonNull", "@semanticNonField", "@catchByDefault", "CatchTo"])
+extend schema @catchByDefault(to: THROW)
 
 extend type Service @semanticNonNullField(name: "statsWindow")
 extend type ServiceMutation @semanticNonNullField(name: "registerOperationsWithResponse")

diff --git a/libraries/apollo-tooling/src/main/graphql/platform-api/public/extra.graphqls b/libraries/apollo-tooling/src/main/graphql/platform-api/public/extra.graphqls
@@ -1,5 +1,5 @@
-extend schema @link(url: "https://specs.apollo.dev/nullability/v0.3", import: ["@semanticNonNull", "@semanticNonField", "@catch", "CatchTo"])
-extend schema @catch(to: THROW)
+extend schema @link(url: "https://specs.apollo.dev/nullability/v0.4", import: ["@semanticNonNull", "@semanticNonField", "@catchByDefault", "CatchTo"])
+extend schema @catchByDefault(to: THROW)
 
 extend type GraphMutation @semanticNonNullField(name: "uploadSchema")
 extend type GraphMutation @semanticNonNullField(name: "publishSubgraph")

diff --git a/...es/apollo-tooling/src/main/kotlin/com/apollographql/apollo/tooling/InternalPlatformApi.kt b/...es/apollo-tooling/src/main/kotlin/com/apollographql/apollo/tooling/InternalPlatformApi.kt
@@ -1,6 +1,6 @@
 package com.apollographql.apollo.tooling
 
-import com.apollographql.apollo3.ApolloClient
+import com.apollographql.apollo.ApolloClient
 
 internal const val INTERNAL_PLATFORM_API_URL = "https://graphql.api.apollographql.com/api/graphql"
 

diff --git a/...ollo-tooling/src/main/kotlin/com/apollographql/apollo/tooling/PersistedQueriesUploader.kt b/...ollo-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.apollo3.api.Optional
+import com.apollographql.apollo.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
@@ -81,4 +81,4 @@ fun publishOperations(
     else -> error("Unknown ops: ${ops.__typename}")
   }
 
-}
+}
diff --git a/...ies/apollo-tooling/src/main/kotlin/com/apollographql/apollo/tooling/RegisterOperations.kt b/...ies/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.apollo3.api.Optional
+import com.apollographql.apollo.api.Optional
 import com.apollographql.apollo.ast.GQLArgument
 import com.apollographql.apollo.ast.GQLDefinition
 import com.apollographql.apollo.ast.GQLDirective

diff --git a/...aries/apollo-tooling/src/main/kotlin/com/apollographql/apollo/tooling/SchemaDownloader.kt b/...aries/apollo-tooling/src/main/kotlin/com/apollographql/apollo/tooling/SchemaDownloader.kt
@@ -1,8 +1,8 @@
 package com.apollographql.apollo.tooling
 
-import com.apollographql.apollo3.ApolloClient
+import com.apollographql.apollo.ApolloClient
 import com.apollographql.apollo.annotations.ApolloExperimental
-import com.apollographql.apollo3.api.http.HttpHeader
+import com.apollographql.apollo.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.apollo3.network.okHttpClient
+import com.apollographql.apollo.network.okHttpClient
 import com.apollographql.apollo.tooling.SchemaHelper.reworkFullTypeFragment
 import com.apollographql.apollo.tooling.SchemaHelper.reworkInputValueFragment
 import com.apollographql.apollo.tooling.SchemaHelper.reworkIntrospectionQuery

diff --git a/libraries/apollo-tooling/src/main/kotlin/com/apollographql/apollo/tooling/SchemaHelper.kt b/libraries/apollo-tooling/src/main/kotlin/com/apollographql/apollo/tooling/SchemaHelper.kt
@@ -1,21 +1,21 @@
 package com.apollographql.apollo.tooling
 
-import com.apollographql.apollo3.ApolloClient
-import com.apollographql.apollo3.api.http.ByteStringHttpBody
-import com.apollographql.apollo3.api.http.HttpBody
-import com.apollographql.apollo3.api.http.HttpHeader
-import com.apollographql.apollo3.api.http.HttpMethod
-import com.apollographql.apollo3.api.http.HttpRequest
-import com.apollographql.apollo3.api.json.buildJsonString
-import com.apollographql.apollo3.api.json.writeObject
+import com.apollographql.apollo.ApolloClient
+import com.apollographql.apollo.api.http.ByteStringHttpBody
+import com.apollographql.apollo.api.http.HttpBody
+import com.apollographql.apollo.api.http.HttpHeader
+import com.apollographql.apollo.api.http.HttpMethod
+import com.apollographql.apollo.api.http.HttpRequest
+import com.apollographql.apollo.api.json.buildJsonString
+import com.apollographql.apollo.api.json.writeObject
 import com.apollographql.apollo.ast.GQLArgument
 import com.apollographql.apollo.ast.GQLBooleanValue
 import com.apollographql.apollo.ast.GQLDefinition
 import com.apollographql.apollo.ast.GQLField
 import com.apollographql.apollo.ast.GQLFragmentDefinition
 import com.apollographql.apollo.ast.GQLOperationDefinition
-import com.apollographql.apollo3.network.http.DefaultHttpEngine
-import com.apollographql.apollo3.network.okHttpClient
+import com.apollographql.apollo.network.http.DefaultHttpEngine
+import com.apollographql.apollo.network.okHttpClient
 import com.apollographql.apollo.tooling.GraphQLFeature.*
 import com.apollographql.apollo.tooling.graphql.PreIntrospectionQuery
 import kotlinx.coroutines.runBlocking

diff --git a/libraries/apollo-tooling/src/main/kotlin/com/apollographql/apollo/tooling/SchemaUploader.kt b/libraries/apollo-tooling/src/main/kotlin/com/apollographql/apollo/tooling/SchemaUploader.kt
@@ -1,8 +1,8 @@
 package com.apollographql.apollo.tooling
 
-import com.apollographql.apollo3.ApolloClient
+import com.apollographql.apollo.ApolloClient
 import com.apollographql.apollo.annotations.ApolloExperimental
-import com.apollographql.apollo3.api.http.HttpHeader
+import com.apollographql.apollo.api.http.HttpHeader
 import com.apollographql.apollo.tooling.platformapi.public.PublishMonolithSchemaMutation
 import com.apollographql.apollo.tooling.platformapi.public.PublishSubgraphSchemaMutation
 import kotlinx.coroutines.runBlocking

diff --git a/libraries/apollo-tooling/src/main/kotlin/com/apollographql/apollo/tooling/Telemetry.kt b/libraries/apollo-tooling/src/main/kotlin/com/apollographql/apollo/tooling/Telemetry.kt
@@ -1,7 +1,7 @@
 package com.apollographql.apollo.tooling
 
 import com.apollographql.apollo.annotations.ApolloInternal
-import com.apollographql.apollo3.api.Optional
+import com.apollographql.apollo.api.Optional
 import com.apollographql.apollo.tooling.platformapi.internal.TrackApolloKotlinUsageMutation
 import com.apollographql.apollo.tooling.platformapi.internal.type.ApolloKotlinUsageEventInput
 import com.apollographql.apollo.tooling.platformapi.internal.type.ApolloKotlinUsagePropertyInput

diff --git a/...aries/apollo-tooling/src/main/kotlin/com/apollographql/apollo/tooling/TimestampAdapter.kt b/...aries/apollo-tooling/src/main/kotlin/com/apollographql/apollo/tooling/TimestampAdapter.kt
@@ -1,9 +1,9 @@
 package com.apollographql.apollo.tooling
 
-import com.apollographql.apollo3.api.Adapter
-import com.apollographql.apollo3.api.CustomScalarAdapters
-import com.apollographql.apollo3.api.json.JsonReader
-import com.apollographql.apollo3.api.json.JsonWriter
+import com.apollographql.apollo.api.Adapter
+import com.apollographql.apollo.api.CustomScalarAdapters
+import com.apollographql.apollo.api.json.JsonReader
+import com.apollographql.apollo.api.json.JsonWriter
 import java.time.Instant
 import java.time.format.DateTimeFormatter
 

diff --git a/libraries/apollo-tooling/src/main/kotlin/com/apollographql/apollo/tooling/VoidAdapter.kt b/libraries/apollo-tooling/src/main/kotlin/com/apollographql/apollo/tooling/VoidAdapter.kt
@@ -1,9 +1,9 @@
 package com.apollographql.apollo.tooling
 
-import com.apollographql.apollo3.api.Adapter
-import com.apollographql.apollo3.api.CustomScalarAdapters
-import com.apollographql.apollo3.api.json.JsonReader
-import com.apollographql.apollo3.api.json.JsonWriter
+import com.apollographql.apollo.api.Adapter
+import com.apollographql.apollo.api.CustomScalarAdapters
+import com.apollographql.apollo.api.json.JsonReader
+import com.apollographql.apollo.api.json.JsonWriter
 
 internal object VoidAdapter : Adapter<Unit> {
   override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Unit {

diff --git a/libraries/apollo-tooling/src/main/kotlin/com/apollographql/apollo/tooling/exceptions.kt b/libraries/apollo-tooling/src/main/kotlin/com/apollographql/apollo/tooling/exceptions.kt
@@ -1,8 +1,8 @@
 package com.apollographql.apollo.tooling
 
-import com.apollographql.apollo3.api.ApolloResponse
-import com.apollographql.apollo3.api.Operation
-import com.apollographql.apollo3.exception.ApolloHttpException
+import com.apollographql.apollo.api.ApolloResponse
+import com.apollographql.apollo.api.Operation
+import com.apollographql.apollo.exception.ApolloHttpException
 
 /**
  * returns an [Exception] that represents [ApolloResponse]
@@ -26,4 +26,4 @@ internal fun <D: Operation.Data> ApolloResponse<D>.toException(context: String):
       Exception("$context: ${e.message}", e)
     }
   }
-}
+}
diff --git a/libraries/apollo-tooling/src/main/kotlin/com/apollographql/apollo/tooling/graphos.kt b/libraries/apollo-tooling/src/main/kotlin/com/apollographql/apollo/tooling/graphos.kt
@@ -1,6 +1,6 @@
 package com.apollographql.apollo.tooling
 
-import com.apollographql.apollo3.ApolloClient
+import com.apollographql.apollo.ApolloClient
 import com.apollographql.apollo.compiler.APOLLO_VERSION
 
 internal const val graphosEndpoint = "https://api.apollographql.com/graphql"