Dependency updates (#6705)

* Dependency updates

* update

* fix licensee

* fix tests

* update package lock

* use macos-15 (has Java12 by default)

* remove unused imports

Author: martinbonnin

.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,13 +18,9 @@ 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
-        with:
-          distribution: 'temurin'
-          java-version: 17
       - uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda #v3.4.2
         with:
           gradle-home-cache-cleanup: true
@@ -42,13 +38,9 @@ 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
-        with:
-          distribution: 'temurin'
-          java-version: 17
       - uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda #v3.4.2
         with:
           gradle-home-cache-cleanup: true
@@ -66,13 +58,9 @@ 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
-        with:
-          distribution: 'temurin'
-          java-version: 17
       - uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda #v3.4.2
         with:
           gradle-home-cache-cleanup: true
@@ -90,11 +78,7 @@ jobs:
           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
-        with:
-          distribution: 'temurin'
-          java-version: 17
       - run: /Applications/Xcode_16.2.0.app/Contents/Developer/usr/bin/xcodebuild -allowProvisioningUpdates -project tests/com.apollographql.iostest/com.apollographql.iostest.xcodeproj -configuration Debug -scheme com.apollographql.iostest -sdk iphoneos -destination name='iPhone 16' test -test-timeouts-enabled YES

.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

benchmark/build-logic/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-  alias(libs.plugins.kotlin.jvm)
+  alias(libs.plugins.kotlin.jvm.latest)
   alias(libs.plugins.compat.patrouille)
 }
 

build-logic/build.gradle.kts

@@ -2,7 +2,7 @@ import org.jetbrains.kotlin.samWithReceiver.gradle.SamWithReceiverExtension
 import org.jetbrains.kotlin.samWithReceiver.gradle.SamWithReceiverGradleSubplugin
 
 plugins {
-  alias(libs.plugins.kotlin.jvm)
+  alias(libs.plugins.kotlin.jvm.latest)
   alias(libs.plugins.kotlin.sam)
   alias(libs.plugins.compat.patrouille)
 }
@@ -18,7 +18,13 @@ dependencies {
   compileOnly(gradleApi())
   compileOnly(libs.dgp)
 
+  // We add all the plugins to the classpath here so that they are loaded with proper conflict resolution
+  // See https://github.com/gradle/gradle/issues/4741
   implementation(libs.okhttp)
+
+  /**
+   * Ktor for the websocket tests in integration tests
+   */
   implementation(libs.ktor.server.netty)
   implementation(libs.ktor.server.cors)
   implementation(libs.ktor.server.websockets)
@@ -29,8 +35,6 @@ dependencies {
   implementation(libs.apollo.execution.gradle.plugin)
   implementation(libs.compat.patrouille)
 
-  // We add all the plugins to the classpath here so that they are loaded with proper conflict resolution
-  // See https://github.com/gradle/gradle/issues/4741
   implementation(libs.android.plugin)
   implementation(libs.librarian)
   implementation(libs.nmcp)