From 877438b1f38a0c174d247812f8bb7b6f8e403a7d Mon Sep 17 00:00:00 2001 From: "Alexander.Likhachev" Date: Fri, 12 May 2023 14:30:44 +0200 Subject: [PATCH] Remove LV/AV customization for the compiler CLI modules The customization was added for compatibility with Gradle. That isn't a problem anymore, as we don't use it from KGP and soon we will eliminate the direct dependency on kotlin-compiler from KGP. --- compiler/cli/build.gradle.kts | 10 +++------- compiler/cli/cli-base/build.gradle.kts | 10 +++------- .../cli/jvm/compiler/jarfs/ByteArrayCharSequence.kt | 4 ++-- .../kotlin/cli/jvm/modules/CliJavaModuleFinder.kt | 3 ++- 4 files changed, 10 insertions(+), 17 deletions(-) diff --git a/compiler/cli/build.gradle.kts b/compiler/cli/build.gradle.kts index 2f8ccc19004..c6f6636d8b6 100644 --- a/compiler/cli/build.gradle.kts +++ b/compiler/cli/build.gradle.kts @@ -51,13 +51,9 @@ allprojects { optInToExperimentalCompilerApi() } -tasks.withType> { - kotlinOptions { - languageVersion = "1.4" - apiVersion = "1.4" - freeCompilerArgs = freeCompilerArgs - "-progressive" + listOf( - "-Xskip-prerelease-check", "-Xsuppress-version-warnings", "-Xuse-mixed-named-arguments" - ) +tasks.withType { + compilerOptions { + progressiveMode.set(true) } } diff --git a/compiler/cli/cli-base/build.gradle.kts b/compiler/cli/cli-base/build.gradle.kts index cf57d837f53..c151609710c 100644 --- a/compiler/cli/cli-base/build.gradle.kts +++ b/compiler/cli/cli-base/build.gradle.kts @@ -36,13 +36,9 @@ allprojects { optInToExperimentalCompilerApi() } -tasks.withType> { - kotlinOptions { - languageVersion = "1.4" - apiVersion = "1.4" - freeCompilerArgs = freeCompilerArgs - "-progressive" + listOf( - "-Xskip-prerelease-check", "-Xsuppress-version-warnings", "-Xuse-mixed-named-arguments" - ) +tasks.withType { + compilerOptions { + progressiveMode.set(true) } } diff --git a/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/jarfs/ByteArrayCharSequence.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/jarfs/ByteArrayCharSequence.kt index fdbcbc752df..e52fba04aa3 100644 --- a/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/jarfs/ByteArrayCharSequence.kt +++ b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/jarfs/ByteArrayCharSequence.kt @@ -20,7 +20,7 @@ class ByteArrayCharSequence( override val length get() = end - start - override fun get(index: Int): Char = bytes[index + start].toChar() + override fun get(index: Int): Char = bytes[index + start].toInt().toChar() override fun subSequence(startIndex: Int, endIndex: Int): CharSequence { if (startIndex == 0 && endIndex == length) return this @@ -31,7 +31,7 @@ class ByteArrayCharSequence( val chars = CharArray(length) for (i in 0 until length) { - chars[i] = bytes[i + start].toChar() + chars[i] = bytes[i + start].toInt().toChar() } return String(chars) diff --git a/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/modules/CliJavaModuleFinder.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/modules/CliJavaModuleFinder.kt index 745552613b0..52ed99729a8 100644 --- a/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/modules/CliJavaModuleFinder.kt +++ b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/modules/CliJavaModuleFinder.kt @@ -30,6 +30,7 @@ import org.jetbrains.kotlin.resolve.jvm.modules.JavaModule import org.jetbrains.kotlin.resolve.jvm.modules.JavaModuleFinder import org.jetbrains.kotlin.resolve.jvm.modules.JavaModuleInfo import java.io.File +import java.util.* class CliJavaModuleFinder( private val jdkHome: File?, @@ -176,7 +177,7 @@ class CliJavaModuleFinder( ) } - private fun codeFor(release: Int): String = release.toString(36).toUpperCase() + private fun codeFor(release: Int): String = release.toString(36).uppercase(Locale.getDefault()) private fun matchesRelease(fileName: String, release: Int) = !fileName.contains("-") && fileName.contains(codeFor(release)) // skip `*-modules`