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.

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 #2215

Merged
merged 1 commit into from
Nov 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ abstract class AbstractKSPTest(frontend: FrontendKind<*>) : DisposableTest() {
"-classpath", classpath,
"-d", module.outDir.path
)
compileJavaFiles(javaFiles, options)
compileJavaFiles(javaFiles, options, assertions = JUnit5Assertions)
}

fun runTest(@TestDataFile path: String) {
Expand Down
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
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
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Copied from kotlinc
org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx4096m -Dfile.encoding=UTF-8

kotlinBaseVersion=2.1.20-dev-3305
kotlinBaseVersion=2.0.21
agpBaseVersion=7.3.1
agpTestVersion=8.7.1
intellijVersion=233.13135.128
intellijVersion=233.13135.103
junitVersion=4.13.1
junit5Version=5.8.2
junitPlatformVersion=1.8.2
Expand Down
Loading