From 85d278eee48bd220e03ae36fd84d28bf2c4541c8 Mon Sep 17 00:00:00 2001 From: Ting-Yuan Huang Date: Wed, 23 Oct 2024 11:30:06 -0700 Subject: [PATCH 1/2] Downgrade to Kotlin 2.0.21 --- .../kotlin/com/google/devtools/ksp/gradle/KotlinFactories.kt | 2 +- .../kotlin/com/google/devtools/ksp/gradle/KspSubplugin.kt | 1 + gradle.properties | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KotlinFactories.kt b/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KotlinFactories.kt index 36ed53b8b5..c2f02a8374 100644 --- a/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KotlinFactories.kt +++ b/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KotlinFactories.kt @@ -166,7 +166,7 @@ class KotlinFactories { from = compilerOptions, into = kspTask.compilerOptions ) - kspTask.produceUnpackagedKlib.set(false) + kspTask.produceUnpackedKlib.set(false) kspTask.onlyIf { // KonanTarget is not properly serializable, hence we should check by name // see https://youtrack.jetbrains.com/issue/KT-61657. diff --git a/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspSubplugin.kt b/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspSubplugin.kt index 4a0220cf46..ebdfbe389f 100644 --- a/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspSubplugin.kt +++ b/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspSubplugin.kt @@ -417,6 +417,7 @@ class KspGradleSubplugin @Inject internal constructor(private val registry: Tool } fun configureLanguageVersion(kspTask: KotlinCompilationTask<*>) { + kspTask.compilerOptions.useK2.value(false) val languageVersion = kotlinCompilation.compilerOptions.options.languageVersion val progressiveMode = kotlinCompilation.compilerOptions.options.progressiveMode kspTask.compilerOptions.languageVersion.value( diff --git a/gradle.properties b/gradle.properties index 1ded0a3151..a43bc6b556 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ # Copied from kotlinc org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx4096m -Dfile.encoding=UTF-8 -kotlinBaseVersion=2.1.20-dev-201 +kotlinBaseVersion=2.0.21 agpBaseVersion=8.7.0 -intellijVersion=233.13135.128 +intellijVersion=233.13135.103 junitVersion=4.13.1 junit5Version=5.8.2 junitPlatformVersion=1.8.2 From c12c7b2566480a93603b3ac5401401a940fcccb6 Mon Sep 17 00:00:00 2001 From: Ting-Yuan Huang Date: Wed, 23 Oct 2024 11:41:46 -0700 Subject: [PATCH 2/2] CI: Update release branch to 1.0.27 Also rewrote the main CI so that it triggers on all release branches. (cherry picked from commit e60917d6ed04b7b073d5b8f818b7cf9384952cb7) --- .github/workflows/auto-merge.yml | 2 +- .github/workflows/main.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 9dcb01c337..37c117f8b0 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 - ref: 1.0.26-release + ref: 1.0.27-release - name: merge commits from main to release branch run: | diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 30ba7c13ff..3c569bdf0a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,11 +4,11 @@ name: CI on: push: - branches: [ main, 1.0.26-release, 1.0.25-release ] + branches: [ main, '[0-9]+.[0-9]+.[0-9]+-release*' ] pull_request: - branches: [ main, 1.0.26-release, 1.0.25-release ] + branches: [ main, '[0-9]+.[0-9]+.[0-9]+-release*' ] workflow_dispatch: - branches: [ main, 1.0.26-release, 1.0.25-release ] + branches: [ main, '[0-9]+.[0-9]+.[0-9]+-release*' ] jobs: build-and-test: