Fixed some warnings and enabled allWarningsAsErrors again (#6306)

* Fixed some warnings and enabled allWarningsAsErrors again

* remove debug

* Fix warning after rebase

* restore mockserver license until next release

* fix another warning

* fix persisted query manifest test

Author: martinbonnin

build-logic/build.gradle.kts

@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 import org.jetbrains.kotlin.samWithReceiver.gradle.SamWithReceiverExtension
 import org.jetbrains.kotlin.samWithReceiver.gradle.SamWithReceiverGradleSubplugin
@@ -38,9 +39,9 @@ dependencies {
   implementation(libs.androidx.lint.gradle.plugin)
   implementation(libs.kotlin.plugin.compose)
 
-  // We want the KSP plugin to use the version from the classpath and not force a newer version
-  // of the Gradle plugin
   implementation(libs.kotlin.plugin)
+  implementation(libs.kotlin.plugin.annotations)
+
   runtimeOnly(libs.ksp)
   // XXX: This is only needed for tests. We could have different build logic for different
   // builds but this seems just overkill for now
@@ -64,7 +65,7 @@ tasks.withType<JavaCompile>().configureEach {
   options.release.set(17)
 }
 tasks.withType(KotlinJvmCompile::class.java).configureEach {
-  kotlinOptions.jvmTarget = "17"
+  compilerOptions.jvmTarget.set(JvmTarget.JVM_17)
 }
 
 gradlePlugin {

build-logic/src/main/kotlin/CompilerOptions.kt

@@ -149,15 +149,7 @@ fun Project.configureJavaAndKotlinCompilers(jvmTarget: Int?, kotlinCompilerOptio
   }
 
   kotlinExtensionOrNull?.coreLibrariesVersion = "${kotlinCompilerOptions.version.version}.0"
-  /**
-   * Required because of:
-   *
-   * > Task :apollo-runtime:compileKotlinWasmJs
-   * w: duplicate library name: kotlin
-   *
-   * (maybe https://youtrack.jetbrains.com/issue/KT-51110?)
-   */
-  allWarningsAsErrors(false)
+  allWarningsAsErrors(true)
 }
 
 fun setTestToolchain(project: Project, test: Test, javaVersion: Int) {

build-logic/src/main/kotlin/Mpp.kt

@@ -2,9 +2,9 @@
 import org.gradle.api.Action
 import org.gradle.api.Project
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.dsl.kotlinExtension
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
 
 internal val allAppleTargets = setOf(
@@ -74,6 +74,12 @@ fun Project.configureMpp(
         }
       }
     }
+    if (withWasm) {
+      @OptIn(ExperimentalWasmDsl::class)
+      wasmJs {
+        nodejs()
+      }
+    }
 
     if (enableLinux && withLinux) {
       linuxX64("linux")
@@ -102,15 +108,6 @@ fun Project.configureMpp(
         }
       }
     }
-    if (withWasm) {
-      @OptIn(ExperimentalWasmDsl::class)
-      wasmJs {
-        /**
-         * See https://youtrack.jetbrains.com/issue/KT-63014
-         */
-        nodejs()
-      }
-    }
 
     configureSourceSetGraph()
   }

build-logic/src/main/kotlin/Node.kt

@@ -2,11 +2,29 @@ import org.gradle.api.Project
 import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
+import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask
 import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin
 import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension
 
 fun Project.configureNode() {
-  tasks.withType(org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask::class.java).configureEach {
+  check(this == rootProject) {
+    "Must only be called in root project"
+  }
+  plugins.withType(NodeJsRootPlugin::class.java).configureEach {
+    extensions.getByType(NodeJsRootExtension::class.java).apply {
+//      /**
+//       * See https://youtrack.jetbrains.com/issue/KT-63014
+//       */
+//      version = "21.0.0-v8-canary202309143a48826a08"
+//      downloadBaseUrl = "https://nodejs.org/download/v8-canary"
+    }
+
+    tasks.withType(KotlinNpmInstallTask::class.java).configureEach {
+      args.add("--ignore-engines")
+    }
+  }
+
+  tasks.withType(KotlinNpmInstallTask::class.java).configureEach {
     args.addAll(
         listOf(
             "--network-concurrency",

build-logic/src/main/kotlin/api.kt

@@ -124,29 +124,7 @@ fun Project.apolloTest(
 }
 
 fun Project.apolloRoot(ciBuild: TaskProvider<Task>) {
-  configureWasmCompatibleNode()
+  configureNode()
   rootSetup(ciBuild)
 }
 
-/**
- * See https://youtrack.jetbrains.com/issue/KT-63014
- */
-private fun Project.configureWasmCompatibleNode() {
-  check(this == rootProject) {
-    "Must only be called in root project"
-  }
-  plugins.withType(NodeJsRootPlugin::class.java).configureEach {
-    extensions.getByType(NodeJsRootExtension::class.java).apply {
-      version = "21.0.0-v8-canary202309143a48826a08"
-      downloadBaseUrl = "https://nodejs.org/download/v8-canary"
-    }
-
-    tasks.withType(KotlinNpmInstallTask::class.java).configureEach {
-      args.add("--ignore-engines")
-    }
-  }
-}
-
-fun Project.apolloTestRoot() {
-  configureWasmCompatibleNode()
-}

build.gradle.kts

@@ -42,7 +42,6 @@ tasks.register("ciPublishSnapshot") {
   }
 }
 
-
 tasks.register("ciPublishRelease") {
   description = "Publishes all artifacts to OSSRH and the Gradle Plugin Portal"
 
@@ -117,7 +116,6 @@ tasks.named("dependencyUpdates").configure {
   }
 }
 
-rootProject.configureNode()
 rootProject.configureJapiCmp()
 
 configure<kotlinx.validation.ApiValidationExtension> {

gradle/libraries.toml

@@ -36,7 +36,7 @@ kotlinx-serialization-runtime = "1.6.2"
 ksp = "2.1.0-1.0.29"
 ktor = "3.0.0"
 moshix = "0.14.1"
-node-fetch = "2.6.7"
+node-fetch = "2.7.0"
 okio = "3.9.0"
 okhttp = "4.12.0"
 rx-java2 = "2.2.21"
@@ -121,6 +121,7 @@ kotlin-compiletesting = { group = "dev.zacsweers.kctfork", name = "core", versio
 graphql-java = "com.graphql-java:graphql-java:20.4"
 # The main kotlin version for build-logic and Gradle tests
 kotlin-plugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin-plugin" }
+kotlin-plugin-annotations = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin-annotations", version.ref = "kotlin-plugin"}
 kotlin-plugin-compose = { group = "org.jetbrains.kotlin", name = "compose-compiler-gradle-plugin", version.ref = "kotlin-plugin" }
 # For Gradle integration tests to make sure we stay compatible with 1.5.0
 kotlin-plugin-min = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin-plugin-min" }

kotlin-js-store-2.1/yarn.lock

@@ -363,6 +363,13 @@ node-fetch@2.6.7:
   dependencies:
     whatwg-url "^5.0.0"
 
+node-fetch@2.7.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d"
+  integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
+  dependencies:
+    whatwg-url "^5.0.0"
+
 normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"

libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo/compiler/entrypoints.kt

@@ -157,6 +157,7 @@ class EntryPoints {
   }
 }
 
+@Suppress("DEPRECATION")
 internal fun ApolloCompilerPlugin.toOperationOutputGenerator(): OperationOutputGenerator {
   return object : OperationOutputGenerator {
     override fun generate(operationDescriptorList: Collection<OperationDescriptor>): OperationOutput {

libraries/apollo-compiler/src/test/kotlin/com/apollographql/apollo/compiler/CodegenTest.kt

@@ -1,3 +1,5 @@
+@file:Suppress("DEPRECATION")
+
 package com.apollographql.apollo.compiler
 
 import com.apollographql.apollo.annotations.ApolloExperimental
@@ -253,7 +255,7 @@ class CodegenTest {
         "mutation_create_review", "simple_fragment", "data_builders" -> true
         else -> false
       }
-      @Suppress("DEPRECATION") val operationIdGenerator = when (folder.name) {
+      val operationIdGenerator = when (folder.name) {
         "operation_id_generator" -> object : OperationIdGenerator {
           override fun apply(operationDocument: String, operationName: String): String {
             return "hash"
@@ -279,10 +281,8 @@ class CodegenTest {
 
       val graphqlFiles = setOf(File(folder, "TestOperation.graphql"))
 
-      @Suppress("DEPRECATION")
       val operationOutputGenerator = OperationOutputGenerator.Default(operationIdGenerator)
 
-      @Suppress("DEPRECATION")
       val targetLanguage = if (generateKotlinModels) {
         if (folder.name == "enum_field") KOTLIN_1_9 else KOTLIN_1_5
       } else {