Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
024d458
Add Kotlin Dev and Maven Central Snapshots repositories
Jun 28, 2024
0abf86c
Suppress "Language version 1.9 is deprecated and its support will be …
BoD Apr 22, 2025
a3ddbed
Fix "Supertypes through typealias cannot be nullable. This will becom…
BoD Apr 22, 2025
f8cea89
Fix "The corresponding parameter in the supertype 'SubscriptionParser…
BoD Apr 22, 2025
90323fc
Use macos-15 runners
BoD Apr 28, 2025
1264b73
Use compilerOptions instead of deprecated kotlinOptions
BoD May 26, 2025
1b7437d
Publish only the release variant
martinbonnin May 26, 2025
a539616
Bump kotlin-compiletesting to 0.8.0
BoD Aug 6, 2025
bac4a26
Suppress opt-in usage warnings in wasmJs files
BoD Aug 7, 2025
f858e58
Bump Kotlin and KSP
Aug 8, 2025
32ba8bc
Update package-lock.json
BoD Aug 20, 2025
0b0adcf
Bump Kotlin and KSP
Aug 21, 2025
eda3386
Update bump script to use 2.2.20-RC*
BoD Aug 21, 2025
4436368
Update bump script to update lock files
BoD Aug 21, 2025
b3a8e96
Bump Kotlin and KSP to 2.2.20
Aug 21, 2025
cbe2184
Update bump script to use 2.3.0*
BoD Sep 11, 2025
e81f822
Fix for 'w: -Xjvm-default is deprecated. Use -jvm-default instead.'
BoD Sep 11, 2025
dfb7518
Add explicit dependencies on kspKotlin task
BoD Sep 12, 2025
44489e7
Bump Kotlin and KSP
Sep 13, 2025
7d4fa64
Bump Kotlin and KSP
Sep 14, 2025
cb0cd4a
Bump Kotlin and KSP
Sep 15, 2025
615b030
Bump Kotlin and KSP
Sep 16, 2025
487975e
Add a comment about https://github.com/google/ksp/pull/2599
BoD Sep 16, 2025
cbd67cf
Bump Kotlin and KSP
Sep 17, 2025
1c8342f
Bump Kotlin and KSP
Sep 18, 2025
2ccc4c1
Bump Kotlin and KSP
Sep 19, 2025
be338d2
Bump Kotlin and KSP
Sep 20, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bump-kotlin-nightlies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
nightly:
runs-on: macos-14
runs-on: macos-15
if: github.repository == 'apollographql/apollo-kotlin'
steps:
- run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/platform-api-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -90,7 +90,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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions build-logic/src/main/kotlin/CompilerOptions.kt
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -28,13 +25,16 @@ 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")
}

when (this) {
is KotlinJvmCompilerOptions -> {
freeCompilerArgs.add("-Xjvm-default=all")
freeCompilerArgs.add("-jvm-default=no-compatibility")
}

is KotlinNativeCompilerOptions -> {
Expand Down
2 changes: 1 addition & 1 deletion build-logic/src/main/kotlin/Mpp.kt
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ fun defaultTargets(

if (withAndroid) {
androidTarget {
publishAllLibraryVariants()
publishLibraryVariants("release")
}
}

Expand Down
8 changes: 4 additions & 4 deletions gradle/libraries.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ javaPoet = "1.13.0"
jetbrains-annotations = "24.0.1"
junit = "4.13.2"
kotlin-plugin-min = "1.9.0"
kotlin-plugin = "2.1.21"
kotlin-plugin-max = "2.1.21"
kotlin-plugin = "2.3.0-dev-9056"
kotlin-plugin-max = "2.3.0-dev-9056"
kotlinx-coroutines = "1.9.0"
kotlinx-datetime = "0.5.0"
kotlinx-serialization-runtime = "1.6.2"
ksp = "2.1.21-2.0.1"
ksp = "2.2.20-2.0.3"
ktor = "3.1.2"
moshix = "0.14.1"
node-fetch = "2.7.0"
Expand Down Expand Up @@ -119,7 +119,7 @@ http4k-server-jetty = { module = "org.http4k:http4k-server-jetty" }
jetbrains-annotations = { group = "org.jetbrains", name = "annotations", version.ref = "jetbrains-annotations" }
junit = { group = "junit", name = "junit", version.ref = "junit" }
kotlin-allopen = { group = "org.jetbrains.kotlin", name = "kotlin-allopen", version.ref = "kotlin-plugin" }
kotlin-compiletesting = { group = "dev.zacsweers.kctfork", name = "core", version = "0.6.0" }
kotlin-compiletesting = { group = "dev.zacsweers.kctfork", name = "core", version = "0.8.0" }
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" }
Expand Down
4 changes: 2 additions & 2 deletions gradle/repositories.gradle.kts
Original file line number Diff line number Diff line change
@@ -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")

Expand Down
Loading
Loading