Improve relocation in gradle plugin #4528

BoD · 2022-11-23T16:54:12Z

Change relocated package to com.apollographql.apollo3.relocated to avoid clashes when using v2 in the same project (related to generateApolloSources fails with NoSuchMethodError after 3.6.2 -> 3.7.1 update #4523)
Use kotlinx.serialization in apollo-ast instead of moshi to be able to relocate apollo-ast fully while not dropping the adapters

… package

netlify · 2022-11-23T16:54:17Z

✅ Deploy Preview for apollo-android-docs canceled.

Name	Link
🔨 Latest commit	`40b5d08`
🔍 Latest deploy log	https://app.netlify.com/sites/apollo-android-docs/deploys/637f540688be4d0009e681f8

martinbonnin · 2022-11-23T18:07:49Z

libraries/apollo-ast/api/apollo-ast.api

+}
+
+public final class com/apollographql/apollo3/ast/introspection/IntrospectionSchema$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;


Is there an option to hide this from the public API?

I asked a question here

...pollo-ast/src/main/kotlin/com/apollographql/apollo3/ast/introspection/IntrospectionSchema.kt

martinbonnin · 2022-11-23T18:14:15Z

libraries/apollo-ast/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
  antlr
  id("org.jetbrains.kotlin.jvm")
  id("apollo.library")
-  id("com.google.devtools.ksp")
+  kotlin("plugin.serialization")


Nit. We're using the id("") notation everywhere else

Suggested change

kotlin("plugin.serialization")

id("org.jetbrains.kotlin.plugin.serialization")

...pollo-ast/src/main/kotlin/com/apollographql/apollo3/ast/introspection/IntrospectionSchema.kt

martinbonnin · 2022-11-23T18:17:03Z

...pollo-ast/src/main/kotlin/com/apollographql/apollo3/ast/introspection/IntrospectionSchema.kt

+  }
+}
+
+@OptIn(ExperimentalSerializationApi::class)


I don't think it's ok to use this. If a future version changes the signatures, they will break at runtime.

But we bundle and relocate the code, so we should be immune to changes? (OTOH I'm ok with avoiding using this)

We relocate in apollo-gradle-plugin but some users might use apollo-ast outside the Gradle context so I'd feel safer avoid this for the time being.

That makes sense 👍

...o-ast/src/main/kotlin/com/apollographql/apollo3/ast/introspection/schema_to_introspection.kt

libraries/apollo-gradle-plugin/rules.pro

…tion and R8 rules. Also avoid okio calls that are marked unstable.

martinbonnin · 2022-11-24T14:03:33Z

gradle/repositories.gradle.kts

@@ -14,6 +14,7 @@ pluginManagement {
          includeModule("me.champeau.gradle", "japicmp-gradle-plugin")
          includeModule("com.gradle.publish", "plugin-publish-plugin")
          includeModule("com.github.ben-manes", "gradle-versions-plugin")
+          includeModule("org.jetbrains.kotlin.plugin.serialization", "org.jetbrains.kotlin.plugin.serialization.gradle.plugin")


Sorry I missed that one. Do we need this? The serialization plugin should be on maven central these days: https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/plugin/serialization/org.jetbrains.kotlin.plugin.serialization.gradle.plugin/

I removed it again in https://github.com/apollographql/apollo-kotlin/pull/4531/files, see what breaks 👀

Version 1.6.10 (which we use during idea sync) is not on Maven central, but now I'm no longer sure this is needed because I removed it on my machine and it still works 😅

Maybe you have configuration cache enabled 😅 . Ok I'll add it again in #4531 with a comment to remove it at some point

BoD added 2 commits November 23, 2022 17:52

Use kotlinx.serializer instead of Moshi to parse introspection schema

9137a69

Fix R8 rules for kotlinx-serialization and also change the relocation…

21857e0

… package

BoD requested review from sav007 and martinbonnin as code owners November 23, 2022 16:54

BoD changed the title ~~Use kotlinx.serializer instead of Moshi to parse introspection schema~~ Improve relocation in gradle plugin Nov 23, 2022