Kotlin nightlies

.github/workflows/benchmarks.yml

@@ -12,7 +12,7 @@ env:
 
 jobs:
   benchmarks:
-    runs-on: macos-14
+    runs-on: macos-15
     if: github.repository == 'apollographql/apollo-kotlin'
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7

.github/workflows/bump-kotlin-nightlies.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   push-kotlin-nightlies-branch:
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
         with:

.github/workflows/nightly.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   nightly:
-    runs-on: macos-14
+    runs-on: macos-15
     if: github.repository == 'apollographql/apollo-kotlin'
     steps:
       - run: |

.github/workflows/platform-api-tests.yml

@@ -12,7 +12,7 @@ env:
 
 jobs:
   platform-api-tests:
-    runs-on: macos-14
+    runs-on: macos-15
     if: github.repository == 'apollographql/apollo-kotlin'
     steps:
       - name: Checkout project

.github/workflows/pr.yml

@@ -18,7 +18,7 @@ concurrency:
 jobs:
   tests-gradle:
     if: "!startsWith(github.head_ref, 'release-')"
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
       - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 #v4.2.1
@@ -42,7 +42,7 @@ jobs:
 
   tests-no-gradle:
     if: "!startsWith(github.head_ref, 'release-')"
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
       - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 #v4.2.1
@@ -66,7 +66,7 @@ jobs:
 
   tests-integration:
     if: "!startsWith(github.head_ref, 'release-')"
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
       - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 #v4.2.1
@@ -88,7 +88,7 @@ jobs:
           name: tests-integration.zip
           path: diagnostics.zip
   ios-tests:
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
       - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 #v4.2.1

.github/workflows/preview.yml

@@ -14,7 +14,7 @@ on:
         type: string
 jobs:
   preview:
-    runs-on: macos-14
+    runs-on: macos-15
     if: github.repository == 'apollographql/apollo-kotlin'
     steps:
       - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 #v4.2.1

.github/workflows/push.yml

@@ -11,7 +11,7 @@ env:
 
 jobs:
   deploy:
-    runs-on: macos-14
+    runs-on: macos-15
     if: github.repository == 'apollographql/apollo-kotlin'
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7

.github/workflows/tag.yml

@@ -10,7 +10,7 @@ env:
 jobs:
   publish-libraries:
     name: Publish libraries
-    runs-on: macos-14
+    runs-on: macos-15
     if: github.repository == 'apollographql/apollo-kotlin'
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7

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

@@ -1,14 +1,11 @@
+
 import com.android.build.gradle.BaseExtension
 import compat.patrouille.configureJavaCompatibility
 import compat.patrouille.configureKotlinCompatibility
-import org.gradle.api.JavaVersion
 import org.gradle.api.Project
-import org.gradle.api.plugins.JavaPluginExtension
-import org.gradle.api.tasks.compile.JavaCompile
 import org.gradle.api.tasks.testing.Test
 import org.gradle.jvm.toolchain.JavaLanguageVersion
 import org.gradle.jvm.toolchain.JavaToolchainService
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions
 import org.jetbrains.kotlin.gradle.dsl.KotlinJsCompilerOptions
@@ -28,6 +25,9 @@ fun KotlinCommonCompilerOptions.configure(
 ) {
   freeCompilerArgs.add("-Xexpect-actual-classes")
 
+  // Suppress "Language version 1.9 is deprecated and its support will be removed in a future version of Kotlin"
+  freeCompilerArgs.add("-Xsuppress-version-warnings")
+
   optIns.forEach {
     freeCompilerArgs.add("-opt-in=$it")
   }

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

@@ -87,7 +87,7 @@ fun Project.configureMpp(
 
     if (withAndroid) {
       androidTarget {
-        publishAllLibraryVariants()
+        publishLibraryVariants("release")
       }
     }
 

gradle/libraries.toml

@@ -28,12 +28,12 @@ javaPoet = "1.13.0"
 jetbrains-annotations = "24.0.1"
 junit = "4.13.2"
 kotlin-plugin-min = "1.9.0"
-kotlin-plugin = "2.1.20"
-kotlin-plugin-max = "2.1.20"
+kotlin-plugin = "2.2.0-dev-16956"
+kotlin-plugin-max = "2.2.0-dev-16956"
 kotlinx-coroutines = "1.9.0"
 kotlinx-datetime = "0.5.0"
 kotlinx-serialization-runtime = "1.6.2"
-ksp = "2.1.20-2.0.0"
+ksp = "2.2.0-RC-2.0.1"
 ktor = "3.1.2"
 moshix = "0.14.1"
 node-fetch = "2.7.0"
@@ -111,7 +111,7 @@ guava-jre = { group = "com.google.guava", name = "guava", version.ref = "guava"
 http4k-bom = "org.http4k:http4k-bom:5.8.0.0"
 http4k-core = { module = "org.http4k:http4k-core" }
 http4k-server-jetty = { module = "org.http4k:http4k-server-jetty" }
-intellij-platform-plugin = "org.jetbrains.intellij.platform:intellij-platform-gradle-plugin:2.1.0"
+intellij-platform-plugin = "org.jetbrains.intellij.platform:intellij-platform-gradle-plugin:2.6.0"
 intellij-changelog = "org.jetbrains.intellij.plugins:gradle-changelog-plugin:2.0.0"
 jetbrains-annotations = { group = "org.jetbrains", name = "annotations", version.ref = "jetbrains-annotations" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }

gradle/repositories.gradle.kts

@@ -1,9 +1,9 @@
 listOf(pluginManagement.repositories, dependencyResolutionManagement.repositories).forEach {
   it.apply {
     // Uncomment this one to use the Kotlin "dev" repository
-    // maven("https://redirector.kotlinlang.org/maven/dev/")
+    maven("https://redirector.kotlinlang.org/maven/dev/")
     // Uncomment this one to use the Sonatype OSSRH snapshots repository
-    // maven("https://oss.sonatype.org/content/repositories/snapshots/")
+    maven("https://oss.sonatype.org/content/repositories/snapshots/")
     // Uncomment this one to use the GradleUp repository
     // maven("https://storage.googleapis.com/gradleup/m2")
 

intellij-plugin/build.gradle.kts

@@ -28,9 +28,9 @@ commonSetup()
 // XXX: this should use the settings repositories instead
 repositories {
   // Uncomment this one to use the Kotlin "dev" repository
-  // maven("https://redirector.kotlinlang.org/maven/dev/")
+  maven("https://redirector.kotlinlang.org/maven/dev/")
   // Uncomment this one to use the Sonatype OSSRH snapshots repository
-  // maven("https://oss.sonatype.org/content/repositories/snapshots/")
+  maven("https://oss.sonatype.org/content/repositories/snapshots/")
   mavenCentral()
 
   intellijPlatform {