Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Downgrade to Kotlin 2.0.21 #2161

Merged
merged 2 commits into from
Oct 23, 2024
Merged

Downgrade to Kotlin 2.0.21 #2161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85d278e
Downgrade to Kotlin 2.0.21
ting-yuan Oct 23, 2024
c12c7b2
CI: Update release branch to 1.0.27
ting-yuan Oct 23, 2024
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/auto-merge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KotlinFactories.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 1 addition & 0 deletions gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspSubplugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down