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

Author: BoD

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" }

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/")

intellij-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

intellij-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

intellij-plugin/src/main/kotlin/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

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)

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")

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")

libraries/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"
 

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.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}")
   }
 
-}
+}