diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index 7bf8a0fc56a..2c3e1f0387b 100644 --- a/.github/workflows/benchmarks.yml +++ b/.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 diff --git a/.github/workflows/bump-kotlin-nightlies.yml b/.github/workflows/bump-kotlin-nightlies.yml index ac488be2ea4..e9cbcbb37f0 100644 --- a/.github/workflows/bump-kotlin-nightlies.yml +++ b/.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: diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 498fe496ea3..2d8c5c61066 100644 --- a/.github/workflows/nightly.yml +++ b/.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: | diff --git a/.github/workflows/platform-api-tests.yml b/.github/workflows/platform-api-tests.yml index f1048b70872..6bc4fa4b069 100644 --- a/.github/workflows/platform-api-tests.yml +++ b/.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 diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 652a920e528..b0319315dab 100644 --- a/.github/workflows/pr.yml +++ b/.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 diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 3b8c72c7952..d1b781c26bf 100644 --- a/.github/workflows/preview.yml +++ b/.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 diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 38f618dedfe..42fb68d9836 100644 --- a/.github/workflows/push.yml +++ b/.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 diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml index 9674ae5a978..efc5f4e787d 100644 --- a/.github/workflows/tag.yml +++ b/.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 diff --git a/build-logic/src/main/kotlin/CompilerOptions.kt b/build-logic/src/main/kotlin/CompilerOptions.kt index ace02255166..45f444c5b5e 100644 --- a/build-logic/src/main/kotlin/CompilerOptions.kt +++ b/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") } diff --git a/gradle/libraries.toml b/gradle/libraries.toml index c11d1a3a2a3..cd83d4e883d 100644 --- a/gradle/libraries.toml +++ b/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-Beta2-2.0.1" ktor = "3.1.2" moshix = "0.14.1" node-fetch = "2.7.0" diff --git a/gradle/repositories.gradle.kts b/gradle/repositories.gradle.kts index a4a7a03407c..453d12721f2 100644 --- a/gradle/repositories.gradle.kts +++ b/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") diff --git a/intellij-plugin/build.gradle.kts b/intellij-plugin/build.gradle.kts index 81792ea2d96..13b5601d3c2 100644 --- a/intellij-plugin/build.gradle.kts +++ b/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 { diff --git a/libraries/apollo-gradle-plugin/testProjects/gradle-min-version/build.gradle.kts b/libraries/apollo-gradle-plugin/testProjects/gradle-min-version/build.gradle.kts index 3d7834eaa14..9be6872c1c6 100644 --- a/libraries/apollo-gradle-plugin/testProjects/gradle-min-version/build.gradle.kts +++ b/libraries/apollo-gradle-plugin/testProjects/gradle-min-version/build.gradle.kts @@ -23,7 +23,7 @@ repositories { } mavenCentral() // Uncomment this one to use the Kotlin "dev" repository - // maven("https://redirector.kotlinlang.org/maven/dev/") + maven("https://redirector.kotlinlang.org/maven/dev/") } configure { diff --git a/libraries/apollo-runtime/src/appleMain/kotlin/com/apollographql/apollo/network/NetworkObserver.apple.kt b/libraries/apollo-runtime/src/appleMain/kotlin/com/apollographql/apollo/network/NetworkObserver.apple.kt index 7f2b7b1804b..573348586c7 100644 --- a/libraries/apollo-runtime/src/appleMain/kotlin/com/apollographql/apollo/network/NetworkObserver.apple.kt +++ b/libraries/apollo-runtime/src/appleMain/kotlin/com/apollographql/apollo/network/NetworkObserver.apple.kt @@ -7,12 +7,11 @@ import platform.Network.nw_path_monitor_set_queue import platform.Network.nw_path_monitor_set_update_handler import platform.Network.nw_path_monitor_start import platform.Network.nw_path_monitor_t -import platform.Network.nw_path_monitor_update_handler_t import platform.Network.nw_path_status_satisfied import platform.Network.nw_path_t import platform.darwin.dispatch_queue_create -internal class AppleNetworkObserver: NetworkObserver, nw_path_monitor_update_handler_t { +internal class AppleNetworkObserver: NetworkObserver, ((nw_path_t) -> Unit) { var monitor: nw_path_monitor_t = null var listener: NetworkObserver.Listener? = null @@ -36,4 +35,4 @@ internal class AppleNetworkObserver: NetworkObserver, nw_path_monitor_update_han override fun invoke(p1: nw_path_t) { listener?.networkChanged((nw_path_get_status(p1) == nw_path_status_satisfied)) } -} \ No newline at end of file +} diff --git a/tests/enums/build.gradle.kts b/tests/enums/build.gradle.kts index b9a72d7523a..50060248034 100644 --- a/tests/enums/build.gradle.kts +++ b/tests/enums/build.gradle.kts @@ -47,5 +47,8 @@ tasks.withType(KotlinCompilationTask::class.java).configureEach { compilerOptions { apiVersion.set(KotlinVersion.KOTLIN_1_9) languageVersion.set(KotlinVersion.KOTLIN_1_9) + + // Suppress "Language version 1.9 is deprecated and its support will be removed in a future version of Kotlin" + freeCompilerArgs.add("-Xsuppress-version-warnings") } } diff --git a/tests/jsexport/src/jsTest/kotlin/JsExportTest.js.kt b/tests/jsexport/src/jsTest/kotlin/JsExportTest.js.kt index 87dfb31a474..a030d2236fa 100644 --- a/tests/jsexport/src/jsTest/kotlin/JsExportTest.js.kt +++ b/tests/jsexport/src/jsTest/kotlin/JsExportTest.js.kt @@ -23,9 +23,9 @@ actual val parserFactory: SubscriptionParserFactory? object JsSubscriptionParserFactory : SubscriptionParserFactory { override fun createParser(request: ApolloRequest): SubscriptionParser { return object : SubscriptionParser { - override fun parse(payload: ApolloJsonElement): ApolloResponse { + override fun parse(response: ApolloJsonElement): ApolloResponse { return ApolloResponse.Builder(request.operation, request.requestUuid) - .data(payload.asDynamic().data.unsafeCast()) + .data(response.asDynamic().data.unsafeCast()) .errors(null) // TODO: Error doesn't use @JsExport .build() } @@ -87,4 +87,4 @@ object JsWsProtocol : WsProtocol { else -> ParseErrorServerMessage("Unknown type: '$type' found in server message: '$text'") } } -} \ No newline at end of file +}