From f9e67c329769e8fd8b1c123ca600e35341743fe4 Mon Sep 17 00:00:00 2001 From: Joel Wilcox Date: Tue, 26 Dec 2023 16:19:37 -0800 Subject: [PATCH] Upgrade to Kotlin 1.9.22 --- .github/workflows/ci.yml | 8 ++++---- CHANGELOG.md | 1 + annotations-optional/dependencies/runtimeClasspath.txt | 2 +- annotations/dependencies/runtimeClasspath.txt | 2 +- compiler-api/dependencies/runtimeClasspath.txt | 8 ++++---- compiler-utils/dependencies/runtimeClasspath.txt | 6 +++--- compiler/dependencies/runtimeClasspath.txt | 6 +++--- gradle-plugin/dependencies/runtimeClasspath.txt | 2 +- gradle/libs.versions.toml | 4 ++-- 9 files changed, 20 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a71a544c4..00e144638 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs : strategy : fail-fast : false matrix : - kotlin-version : [ 1.9.20 ] + kotlin-version : [ 1.9.22 ] steps : - uses : actions/checkout@v3 @@ -36,7 +36,7 @@ jobs : strategy : fail-fast : false matrix : - kotlin-version : [ 1.9.20 ] + kotlin-version : [ 1.9.22 ] steps : - uses : actions/checkout@v3 @@ -186,7 +186,7 @@ jobs : # solution. fail-fast : false matrix : - kotlin-version : [ 1.9.20 ] + kotlin-version : [ 1.9.22 ] agp-version : [ 7.1.1, 7.2.0, 7.3.1 ] steps : @@ -218,7 +218,7 @@ jobs : # solution. fail-fast : false matrix : - kotlin-version : [ 1.9.20 ] + kotlin-version : [ 1.9.22 ] steps : - uses : actions/checkout@v3 diff --git a/CHANGELOG.md b/CHANGELOG.md index ee8bb8722..1c3190730 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### Added ### Changed +- Upgrade Kotlin to `1.9.22` ### Deprecated diff --git a/annotations-optional/dependencies/runtimeClasspath.txt b/annotations-optional/dependencies/runtimeClasspath.txt index 29041e2cd..5de170e8e 100644 --- a/annotations-optional/dependencies/runtimeClasspath.txt +++ b/annotations-optional/dependencies/runtimeClasspath.txt @@ -1,3 +1,3 @@ javax.inject:javax.inject:1 -org.jetbrains.kotlin:kotlin-stdlib:1.9.20 +org.jetbrains.kotlin:kotlin-stdlib:1.9.22 org.jetbrains:annotations:13.0 diff --git a/annotations/dependencies/runtimeClasspath.txt b/annotations/dependencies/runtimeClasspath.txt index 225996dcd..122aab776 100644 --- a/annotations/dependencies/runtimeClasspath.txt +++ b/annotations/dependencies/runtimeClasspath.txt @@ -1,2 +1,2 @@ -org.jetbrains.kotlin:kotlin-stdlib:1.9.20 +org.jetbrains.kotlin:kotlin-stdlib:1.9.22 org.jetbrains:annotations:13.0 diff --git a/compiler-api/dependencies/runtimeClasspath.txt b/compiler-api/dependencies/runtimeClasspath.txt index 5cc44094a..442e871d1 100644 --- a/compiler-api/dependencies/runtimeClasspath.txt +++ b/compiler-api/dependencies/runtimeClasspath.txt @@ -1,7 +1,7 @@ org.jetbrains.intellij.deps:trove4j:1.0.20200330 -org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.20 -org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.20 +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.22 +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.22 org.jetbrains.kotlin:kotlin-reflect:1.6.10 -org.jetbrains.kotlin:kotlin-script-runtime:1.9.20 -org.jetbrains.kotlin:kotlin-stdlib:1.9.20 +org.jetbrains.kotlin:kotlin-script-runtime:1.9.22 +org.jetbrains.kotlin:kotlin-stdlib:1.9.22 org.jetbrains:annotations:13.0 diff --git a/compiler-utils/dependencies/runtimeClasspath.txt b/compiler-utils/dependencies/runtimeClasspath.txt index 8693d71f8..776733b9d 100644 --- a/compiler-utils/dependencies/runtimeClasspath.txt +++ b/compiler-utils/dependencies/runtimeClasspath.txt @@ -3,9 +3,9 @@ com.squareup:kotlinpoet-jvm:1.16.0 com.squareup:kotlinpoet:1.16.0 javax.inject:javax.inject:1 org.jetbrains.intellij.deps:trove4j:1.0.20200330 -org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.20 -org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.20 +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.22 +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.22 org.jetbrains.kotlin:kotlin-reflect:1.9.22 -org.jetbrains.kotlin:kotlin-script-runtime:1.9.20 +org.jetbrains.kotlin:kotlin-script-runtime:1.9.22 org.jetbrains.kotlin:kotlin-stdlib:1.9.22 org.jetbrains:annotations:13.0 diff --git a/compiler/dependencies/runtimeClasspath.txt b/compiler/dependencies/runtimeClasspath.txt index 64191061b..bcd9f4eea 100644 --- a/compiler/dependencies/runtimeClasspath.txt +++ b/compiler/dependencies/runtimeClasspath.txt @@ -5,9 +5,9 @@ com.squareup:kotlinpoet:1.16.0 javax.annotation:jsr250-api:1.0 javax.inject:javax.inject:1 org.jetbrains.intellij.deps:trove4j:1.0.20200330 -org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.20 -org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.20 +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.22 +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.22 org.jetbrains.kotlin:kotlin-reflect:1.9.22 -org.jetbrains.kotlin:kotlin-script-runtime:1.9.20 +org.jetbrains.kotlin:kotlin-script-runtime:1.9.22 org.jetbrains.kotlin:kotlin-stdlib:1.9.22 org.jetbrains:annotations:13.0 diff --git a/gradle-plugin/dependencies/runtimeClasspath.txt b/gradle-plugin/dependencies/runtimeClasspath.txt index 225996dcd..122aab776 100644 --- a/gradle-plugin/dependencies/runtimeClasspath.txt +++ b/gradle-plugin/dependencies/runtimeClasspath.txt @@ -1,2 +1,2 @@ -org.jetbrains.kotlin:kotlin-stdlib:1.9.20 +org.jetbrains.kotlin:kotlin-stdlib:1.9.22 org.jetbrains:annotations:13.0 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4cc3f303e..2c43108d8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -29,11 +29,11 @@ kase = "0.9.1" kct = "0.4.0" kgx = "0.1.10" kotest = "5.8.0" -kotlin = "1.9.20" +kotlin = "1.9.22" kotlinx-binaryCompatibility = "0.13.2" kotlinpoet = "1.16.0" # If updating KSP version, we currently have ksp override logic in settings.gradle that needs to be updated too -ksp = "1.9.20-1.0.14" +ksp = "1.9.22-1.0.17" ktlint = "1.0.1" ktlintPlugin = "12.1.0" mavenPublish = "0.27.0"