From e94c1ea0ed004f36df12c871a6e5204f155a05ad Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Fri, 16 Sep 2022 13:17:15 +0200 Subject: [PATCH] Update Kotlin repo for bootstrap update ^KT-27301 Fixed --- buildSrc/src/main/kotlin/GradleCommon.kt | 3 +++ buildSrc/src/main/kotlin/JvmToolchain.kt | 2 ++ buildSrc/src/main/kotlin/LibrariesCommon.kt | 1 + buildSrc/src/main/kotlin/common-configuration.gradle.kts | 3 +++ buildSrc/src/main/kotlin/tasks.kt | 1 + .../org/jetbrains/kotlin/benchmark/BenchmarkingPlugin.kt | 2 ++ .../kotlin/benchmark/KotlinNativeBenchmarkingPlugin.kt | 1 + libraries/stdlib/jvm/build.gradle | 4 +++- 8 files changed, 16 insertions(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/GradleCommon.kt b/buildSrc/src/main/kotlin/GradleCommon.kt index ded21a057ba..1197f63854d 100644 --- a/buildSrc/src/main/kotlin/GradleCommon.kt +++ b/buildSrc/src/main/kotlin/GradleCommon.kt @@ -139,6 +139,7 @@ fun Project.createGradleCommonSourceSet(): SourceSet { // Common outputs will also produce '${project.name}.kotlin_module' file, so we need to avoid // files clash tasks.named("compile${commonSourceSet.name.replaceFirstChar { it.uppercase() }}Kotlin") { + @Suppress("DEPRECATION") kotlinOptions { moduleName = "${this@createGradleCommonSourceSet.name}_${commonSourceSet.name}" } @@ -479,6 +480,7 @@ fun Project.createGradlePluginVariant( // KT-52138: Make module name the same for all variants, so KSP could access internal methods/properties tasks.named("compile${variantSourceSet.name.replaceFirstChar { it.uppercase() }}Kotlin") { + @Suppress("DEPRECATION") kotlinOptions { moduleName = this@createGradlePluginVariant.name } @@ -515,6 +517,7 @@ private fun Project.commonVariantAttributes(): Action = Action().configureEach { kotlinOptions.languageVersion = "1.4" kotlinOptions.apiVersion = "1.4" diff --git a/buildSrc/src/main/kotlin/JvmToolchain.kt b/buildSrc/src/main/kotlin/JvmToolchain.kt index 72d6043e1d6..ada292dda6c 100644 --- a/buildSrc/src/main/kotlin/JvmToolchain.kt +++ b/buildSrc/src/main/kotlin/JvmToolchain.kt @@ -123,6 +123,7 @@ fun KotlinCompile.configureTaskToolchain( ) ) ) + @Suppress("DEPRECATION") kotlinOptions { jvmTarget = jdkVersion.targetName } @@ -165,6 +166,7 @@ fun Project.updateJvmTarget( .withType() .matching { it.name != "compileJava9Kotlin" } .configureEach { + @Suppress("DEPRECATION") kotlinOptions.jvmTarget = jvmTarget } diff --git a/buildSrc/src/main/kotlin/LibrariesCommon.kt b/buildSrc/src/main/kotlin/LibrariesCommon.kt index 4e830dcc733..a788e2be84a 100644 --- a/buildSrc/src/main/kotlin/LibrariesCommon.kt +++ b/buildSrc/src/main/kotlin/LibrariesCommon.kt @@ -22,6 +22,7 @@ fun Project.configureJava9Compilation( tasks.named("compileJava9Kotlin", KotlinCompile::class.java) { configureTaskToolchain(JdkMajorVersion.JDK_9) + @Suppress("DEPRECATION") kotlinOptions.jvmTarget = JdkMajorVersion.JDK_9.targetName } diff --git a/buildSrc/src/main/kotlin/common-configuration.gradle.kts b/buildSrc/src/main/kotlin/common-configuration.gradle.kts index ed74b6b084b..92a10c1d265 100644 --- a/buildSrc/src/main/kotlin/common-configuration.gradle.kts +++ b/buildSrc/src/main/kotlin/common-configuration.gradle.kts @@ -115,6 +115,7 @@ fun Project.configureKotlinCompilationOptions() { val useFirIC by extra(project.kotlinBuildProperties.useFirTightIC) val renderDiagnosticNames by extra(project.kotlinBuildProperties.renderDiagnosticNames) + @Suppress("DEPRECATION") tasks.withType>().configureEach { kotlinOptions { languageVersion = kotlinLanguageVersion @@ -127,8 +128,10 @@ fun Project.configureKotlinCompilationOptions() { !kotlinBuildProperties.getBoolean("kotlin.build.use.absolute.paths.in.klib") } + // Workaround to avoid remote build cache misses due to absolute paths in relativePathBaseArg doFirst { if (relativePathBaseArg != null) { + @Suppress("DEPRECATION") kotlinOptions.freeCompilerArgs += relativePathBaseArg } } diff --git a/buildSrc/src/main/kotlin/tasks.kt b/buildSrc/src/main/kotlin/tasks.kt index 3c6dbceabaa..66d197fcf63 100644 --- a/buildSrc/src/main/kotlin/tasks.kt +++ b/buildSrc/src/main/kotlin/tasks.kt @@ -333,6 +333,7 @@ fun Project.confugureFirPluginAnnotationsDependency(testTask: TaskProvider } fun Project.optInToExperimentalCompilerApi() { + @Suppress("DEPRECATION") tasks.withType>().configureEach { kotlinOptions { freeCompilerArgs += "-opt-in=org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi" diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/BenchmarkingPlugin.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/BenchmarkingPlugin.kt index 5bd2b142fc5..2ee4c9713ac 100644 --- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/BenchmarkingPlugin.kt +++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/BenchmarkingPlugin.kt @@ -162,6 +162,7 @@ abstract class BenchmarkingPlugin: Plugin { protected fun Project.configureNativeTarget(hostPreset: AbstractKotlinNativeTargetPreset<*>) { kotlin.targetFromPreset(hostPreset, NATIVE_TARGET_NAME) { + @Suppress("DEPRECATION") compilations.getByName("main").kotlinOptions.freeCompilerArgs = benchmark.compilerOpts + project.compilerArgs compilations.getByName("main").enableEndorsedLibs = true configureNativeOutput(this@configureNativeTarget) @@ -202,6 +203,7 @@ abstract class BenchmarkingPlugin: Plugin { return result } + @Suppress("DEPRECATION") protected open fun getCompilerFlags(project: Project, nativeTarget: KotlinNativeTarget) = compilerFlagsFromBinary(project) + nativeTarget.compilations.main.kotlinOptions.freeCompilerArgs.map { "\"$it\"" } diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/KotlinNativeBenchmarkingPlugin.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/KotlinNativeBenchmarkingPlugin.kt index e76f81dbf00..b8f58627206 100644 --- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/KotlinNativeBenchmarkingPlugin.kt +++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/KotlinNativeBenchmarkingPlugin.kt @@ -133,6 +133,7 @@ open class KotlinNativeBenchmarkingPlugin: BenchmarkingPlugin() { private fun Project.configureJVMTarget() { kotlin.jvm { compilations.all { + @Suppress("DEPRECATION") compileKotlinTask.kotlinOptions { jvmTarget = "1.8" suppressWarnings = true diff --git a/libraries/stdlib/jvm/build.gradle b/libraries/stdlib/jvm/build.gradle index fd289b89464..3af86c3d0e9 100644 --- a/libraries/stdlib/jvm/build.gradle +++ b/libraries/stdlib/jvm/build.gradle @@ -179,7 +179,9 @@ compileTestKotlin { "-XXLanguage:+RangeUntilOperator", ] // This is needed for JavaTypeTest; typeOf for non-reified type parameters doesn't work otherwise, for implementation reasons. - freeCompilerArgs.remove("-Xno-optimized-callable-references") + def args = new ArrayList(freeCompilerArgs) + args.remove("-Xno-optimized-callable-references") + freeCompilerArgs = args } }