From fccf71f08bd3dbde43bc24e77fbee4ed272aef2a Mon Sep 17 00:00:00 2001
From: BoD <BoD@JRAF.org>
Date: Mon, 20 Oct 2025 17:27:46 +0200
Subject: [PATCH 1/2] Don't rely on apollo-compiler when reading JSON fils for
 telemetry

---
 .../gradle/ApolloKotlinProjectModelService.kt |  1 -
 .../com/apollographql/ijplugin/gradle/Json.kt | 66 +++++++++++++++++++
 .../ijplugin/gradle/Telemetry.kt              |  3 -
 3 files changed, 66 insertions(+), 4 deletions(-)
 create mode 100644 plugin/src/main/kotlin/com/apollographql/ijplugin/gradle/Json.kt

diff --git a/plugin/src/main/kotlin/com/apollographql/ijplugin/gradle/ApolloKotlinProjectModelService.kt b/plugin/src/main/kotlin/com/apollographql/ijplugin/gradle/ApolloKotlinProjectModelService.kt
index 46d4224..5558da7 100644
--- a/plugin/src/main/kotlin/com/apollographql/ijplugin/gradle/ApolloKotlinProjectModelService.kt
+++ b/plugin/src/main/kotlin/com/apollographql/ijplugin/gradle/ApolloKotlinProjectModelService.kt
@@ -8,7 +8,6 @@ import com.apollographql.apollo.compiler.model.CompilationUnitModel
 import com.apollographql.apollo.compiler.model.ProjectModel
 import com.apollographql.apollo.compiler.model.toCompilationUnitModel
 import com.apollographql.apollo.compiler.model.toProjectModel
-import com.apollographql.apollo.compiler.toCodegenOptions
 import com.apollographql.apollo.gradle.api.ApolloGradleToolingModel
 import com.apollographql.apollo.tooling.model.TelemetryData
 import com.apollographql.apollo.tooling.model.toTelemetryData
diff --git a/plugin/src/main/kotlin/com/apollographql/ijplugin/gradle/Json.kt b/plugin/src/main/kotlin/com/apollographql/ijplugin/gradle/Json.kt
new file mode 100644
index 0000000..4f88e5f
--- /dev/null
+++ b/plugin/src/main/kotlin/com/apollographql/ijplugin/gradle/Json.kt
@@ -0,0 +1,66 @@
+package com.apollographql.ijplugin.gradle
+
+import com.apollographql.apollo.compiler.CodegenOptions
+import com.apollographql.apollo.compiler.CodegenSchemaOptions
+import com.apollographql.apollo.compiler.IrOptions
+import kotlinx.serialization.json.Json
+import java.io.File
+
+private val json = Json {
+  classDiscriminator = "#class"
+  ignoreUnknownKeys = true
+  explicitNulls = false
+  coerceInputValues = true
+}
+
+private inline fun <reified T> File.parseFromJson(): T {
+  return json.decodeFromString<T>(readText())
+}
+
+fun File.toCodegenOptions(): CodegenOptions = runCatching { parseFromJson<CodegenOptions>() }.getOrElse {
+  CodegenOptions(
+      targetLanguage = null,
+      packageName = null,
+      rootPackageName = null,
+      decapitalizeFields = null,
+      useSemanticNaming = null,
+      generateMethods = null,
+      operationManifestFormat = null,
+      generateSchema = null,
+      generatedSchemaName = null,
+      sealedClassesForEnumsMatching = null,
+      generateApolloEnums = null,
+      generateAsInternal = null,
+      addUnknownForEnums = null,
+      addDefaultArgumentForInputObjects = null,
+      generateFilterNotNull = null,
+      generateInputBuilders = null,
+      addJvmOverloads = null,
+      requiresOptInAnnotation = null,
+      jsExport = null,
+      generateModelBuilders = null,
+      classesForEnumsMatching = null,
+      generatePrimitiveTypes = null,
+      nullableFieldStyle = null,
+      generateFragmentImplementations = null,
+      generateQueryDocument = null,
+  )
+}
+
+fun File.toCodegenSchemaOptions(): CodegenSchemaOptions = runCatching { parseFromJson<CodegenSchemaOptions>() }.getOrElse {
+  CodegenSchemaOptions()
+}
+
+fun File.toIrOptions(): IrOptions = runCatching { parseFromJson<IrOptions>() }.getOrElse {
+  IrOptions(
+      fieldsOnDisjointTypesMustMerge = null,
+      decapitalizeFields = null,
+      flattenModels = null,
+      warnOnDeprecatedUsages = null,
+      failOnWarnings = null,
+      addTypename = null,
+      generateOptionalOperationVariables = null,
+      alwaysGenerateTypesMatching = null,
+      codegenModels = null,
+  )
+}
diff --git a/plugin/src/main/kotlin/com/apollographql/ijplugin/gradle/Telemetry.kt b/plugin/src/main/kotlin/com/apollographql/ijplugin/gradle/Telemetry.kt
index 40d522f..6ffec71 100644
--- a/plugin/src/main/kotlin/com/apollographql/ijplugin/gradle/Telemetry.kt
+++ b/plugin/src/main/kotlin/com/apollographql/ijplugin/gradle/Telemetry.kt
@@ -3,9 +3,6 @@ package com.apollographql.ijplugin.gradle
 import com.apollographql.apollo.annotations.ApolloExperimental
 import com.apollographql.apollo.annotations.ApolloInternal
 import com.apollographql.apollo.compiler.TargetLanguage
-import com.apollographql.apollo.compiler.toCodegenOptions
-import com.apollographql.apollo.compiler.toCodegenSchemaOptions
-import com.apollographql.apollo.compiler.toIrOptions
 import com.apollographql.apollo.gradle.api.ApolloGradleToolingModel
 import com.apollographql.apollo.tooling.model.TelemetryData
 import com.apollographql.ijplugin.telemetry.TelemetryProperty

From 3ae44ca9daa2579f6f5a2f02b286fb034381dc22 Mon Sep 17 00:00:00 2001
From: BoD <BoD@JRAF.org>
Date: Mon, 20 Oct 2025 17:44:09 +0200
Subject: [PATCH 2/2] Add a comment

---
 .../src/main/kotlin/com/apollographql/ijplugin/gradle/Json.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/src/main/kotlin/com/apollographql/ijplugin/gradle/Json.kt b/plugin/src/main/kotlin/com/apollographql/ijplugin/gradle/Json.kt
index 4f88e5f..590b0af 100644
--- a/plugin/src/main/kotlin/com/apollographql/ijplugin/gradle/Json.kt
+++ b/plugin/src/main/kotlin/com/apollographql/ijplugin/gradle/Json.kt
@@ -6,8 +6,8 @@ import com.apollographql.apollo.compiler.IrOptions
 import kotlinx.serialization.json.Json
 import java.io.File
 
+// We are linking with a version of apollo-compiler that may be outdated and we might read files that contain new (unknown at that time) fields
 private val json = Json {
-  classDiscriminator = "#class"
   ignoreUnknownKeys = true
   explicitNulls = false
   coerceInputValues = true