azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Repo] Don't use kotlinOptions in repo build scripts

Browse Source 
^KT-63419 In Progress
This commit is contained in:
Yahor Berdnikau
2024-02-19 23:34:11 +01:00
committed by Space Team
parent 22e1e79c41
commit 6b19b8b9d0
54 changed files with 300 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/reflect/api/build.gradle
+1 -1
View File
@@ -46,7 +46,7 @@ if (includeJava9) {
}
compileKotlin {
kotlinOptions {
compilerOptions {
freeCompilerArgs = [
"-Xallow-kotlin-package",
"-Xno-optimized-callable-references",
libraries/scripting/common/build.gradle.kts
+4 -4
View File
@@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
plugins {
kotlin("jvm")
id("jps-compatible")
@@ -16,10 +18,8 @@ sourceSets {
"test" { projectDefault() }
}
tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
kotlinOptions.freeCompilerArgs += listOf(
"-Xallow-kotlin-package"
)
tasks.withType<KotlinJvmCompile>().configureEach {
compilerOptions.freeCompilerArgs.add("-Xallow-kotlin-package")
}
publish()
libraries/scripting/dependencies-maven/build.gradle.kts
+4 -4
View File
@@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
plugins {
kotlin("jvm")
id("jps-compatible")
@@ -29,10 +31,8 @@ sourceSets {
"test" { projectDefault() }
}
tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
kotlinOptions.freeCompilerArgs += listOf(
"-Xallow-kotlin-package"
)
tasks.withType<KotlinJvmCompile>().configureEach {
compilerOptions.freeCompilerArgs.add("-Xallow-kotlin-package")
}
publish()
libraries/scripting/dependencies/build.gradle.kts
+4 -4
View File
@@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
plugins {
kotlin("jvm")
id("jps-compatible")
@@ -17,10 +19,8 @@ sourceSets {
"test" { projectDefault() }
}
tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
kotlinOptions.freeCompilerArgs += listOf(
"-Xallow-kotlin-package"
)
tasks.withType<KotlinJvmCompile>().configureEach {
compilerOptions.freeCompilerArgs.add("-Xallow-kotlin-package")
}
publish()
libraries/scripting/intellij/build.gradle.kts
+8 -6
View File
@@ -1,3 +1,4 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
plugins {
kotlin("jvm")
@@ -16,14 +17,15 @@ sourceSets {
"test" { }
}
tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
kotlinOptions.freeCompilerArgs += "-Xallow-kotlin-package"
tasks.withType<KotlinJvmCompile>().configureEach {
compilerOptions.freeCompilerArgs.addAll(
listOf(
"-Xallow-kotlin-package",
"-Xjvm-default=all",
)
)
}
publish()
standardPublicJars()
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
kotlinOptions.freeCompilerArgs += "-Xjvm-default=all"
}
libraries/scripting/jsr223-test/build.gradle.kts
+3 -2
View File
@@ -1,3 +1,4 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
plugins {
kotlin("jvm")
@@ -41,8 +42,8 @@ sourceSets {
"test" { projectDefault() }
}
tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
kotlinOptions.freeCompilerArgs += "-Xallow-kotlin-package"
tasks.withType<KotlinJvmCompile>().configureEach {
compilerOptions.freeCompilerArgs.add("-Xallow-kotlin-package")
}
projectTest(parallel = true) {
libraries/scripting/jsr223/build.gradle.kts
+3 -2
View File
@@ -1,3 +1,4 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
plugins {
kotlin("jvm")
@@ -24,8 +25,8 @@ sourceSets {
"test" {}
}
tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
kotlinOptions.freeCompilerArgs += "-Xallow-kotlin-package"
tasks.withType<KotlinJvmCompile>().configureEach {
compilerOptions.freeCompilerArgs.add("-Xallow-kotlin-package")
}
standardPublicJars()
libraries/scripting/jvm-host-test/build.gradle.kts
+3 -2
View File
@@ -1,3 +1,4 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
plugins {
kotlin("jvm")
@@ -35,8 +36,8 @@ sourceSets {
"test" { projectDefault() }
}
tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
kotlinOptions.freeCompilerArgs += "-Xallow-kotlin-package"
tasks.withType<KotlinJvmCompile>().configureEach {
compilerOptions.freeCompilerArgs.add("-Xallow-kotlin-package")
}
projectTest(parallel = true) {
libraries/scripting/jvm-host/build.gradle.kts
+3 -2
View File
@@ -1,3 +1,4 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
plugins {
kotlin("jvm")
@@ -26,8 +27,8 @@ sourceSets {
"test" {}
}
tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
kotlinOptions.freeCompilerArgs += "-Xallow-kotlin-package"
tasks.withType<KotlinJvmCompile>().configureEach {
compilerOptions.freeCompilerArgs.add("-Xallow-kotlin-package")
}
standardPublicJars()
libraries/scripting/jvm/build.gradle.kts
+4 -4
View File
@@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
plugins {
kotlin("jvm")
id("jps-compatible")
@@ -17,10 +19,8 @@ sourceSets {
"test" { projectDefault() }
}
tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
kotlinOptions.freeCompilerArgs += listOf(
"-Xallow-kotlin-package"
)
tasks.withType<KotlinJvmCompile>().configureEach {
compilerOptions.freeCompilerArgs.add("-Xallow-kotlin-package")
}
publish()
libraries/stdlib/build.gradle.kts
+6
View File
@@ -229,6 +229,7 @@ kotlin {
}
compilations {
all {
@Suppress("DEPRECATION")
kotlinOptions {
freeCompilerArgs += listOf(
"-Xallow-kotlin-package",
@@ -237,6 +238,7 @@ kotlin {
}
}
val main by getting {
@Suppress("DEPRECATION")
kotlinOptions {
freeCompilerArgs += listOfNotNull(
"-Xir-module-name=kotlin",
@@ -260,12 +262,14 @@ kotlin {
(this as KotlinTargetWithNodeJsDsl).nodejs()
compilations {
all {
@Suppress("DEPRECATION")
kotlinOptions.freeCompilerArgs += listOfNotNull(
"-Xallow-kotlin-package",
"-Xexpect-actual-classes",
diagnosticNamesArg
)
}
@Suppress("DEPRECATION")
val main by getting {
kotlinOptions.freeCompilerArgs += "-Xir-module-name=kotlin"
kotlinOptions.allWarningsAsErrors = true
@@ -295,6 +299,7 @@ kotlin {
}
nativeTarget.apply {
compilations.all {
@Suppress("DEPRECATION")
kotlinOptions {
freeCompilerArgs += listOf(
"-Xallow-kotlin-package",
@@ -764,6 +769,7 @@ tasks {
exclude("collections/MapTest.kt")
}
named("compileTestDevelopmentExecutableKotlinWasm$wasmTarget", KotlinJsIrLink::class) {
@Suppress("DEPRECATION")
kotlinOptions.freeCompilerArgs += listOf("-Xwasm-enable-array-range-checks")
}
}
libraries/stdlib/js-ir-minimal-for-test/build.gradle.kts
+3 -1
View File
@@ -147,7 +147,8 @@ kotlin {
}
}
tasks.withType<KotlinCompile<*>> {
@Suppress("DEPRECATION")
tasks.withType<KotlinCompile<*>>().configureEach {
kotlinOptions.languageVersion = "1.9"
kotlinOptions.apiVersion = "2.0"
kotlinOptions.freeCompilerArgs += listOf(
@@ -167,6 +168,7 @@ tasks {
enabled = false
}
@Suppress("DEPRECATION")
named("compileKotlinJs", KotlinCompile::class) {
kotlinOptions.freeCompilerArgs += "-Xir-module-name=kotlin"
}
libraries/stdlib/jvm-minimal-for-test/build.gradle.kts
+2
View File
@@ -54,6 +54,7 @@ tasks.compileKotlin {
val commonSources = listOf(
"kotlin/enums/EnumEntries.kt"
).map { copySources.get().destinationDir.resolve(it) }
@Suppress("DEPRECATION")
kotlinOptions {
languageVersion = "1.9"
apiVersion = "2.0"
@@ -69,6 +70,7 @@ tasks.compileKotlin {
moduleName = "kotlin-stdlib"
}
doFirst {
@Suppress("DEPRECATION")
kotlinOptions.freeCompilerArgs += listOf(
"-Xcommon-sources=${commonSources.joinToString(File.pathSeparator)}",
)
libraries/stdlib/samples/build.gradle
+5 -5
View File
@@ -10,10 +10,10 @@ sourceSets {
}
compileTestKotlin {
kotlinOptions {
freeCompilerArgs = [
"-opt-in=kotlin.ExperimentalStdlibApi",
"-opt-in=kotlin.ExperimentalUnsignedTypes",
]
compilerOptions {
optIn.addAll([
"kotlin.ExperimentalStdlibApi",
"kotlin.ExperimentalUnsignedTypes",
])
}
}
libraries/tools/ide-plugin-dependencies-validator/build.gradle.kts
+1 -1
View File
@@ -75,7 +75,7 @@ fun Project.checkIdeDependencyConfiguration() {
}
val enabledExperimentalAnnotations =
ExperimentalAnnotationsCollector().getUsedExperimentalAnnotations(compileTask.kotlinOptions.freeCompilerArgs)
ExperimentalAnnotationsCollector().getUsedExperimentalAnnotations(compileTask.compilerOptions.freeCompilerArgs.get())
check(enabledExperimentalAnnotations.isEmpty()) {
"`$name` allows using experimental kotlin stdlib API marked with ${enabledExperimentalAnnotations.joinToString()}. " +
libraries/tools/kotlin-annotations-jvm/build.gradle
+2 -2
View File
@@ -22,10 +22,10 @@ RepoArtifacts.sourcesJar(project)
RepoArtifacts.javadocJar(project)
compileKotlin {
kotlinOptions.freeCompilerArgs = [
compilerOptions.freeCompilerArgs = [
"-Xallow-kotlin-package",
]
kotlinOptions.moduleName = project.name
compilerOptions.moduleName = project.name
}
LibrariesCommon.configureFrontendIr(project)
libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
+3 -2
View File
@@ -1,4 +1,5 @@
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
import org.jetbrains.kotlin.konan.target.HostManager
import org.jetbrains.kotlin.konan.target.KonanTarget
import java.nio.file.Paths
@@ -120,8 +121,8 @@ val splitGradleIntegrationTestTasks =
project.providers.gradleProperty("gradle.integration.tests.split.tasks").orNull?.toBoolean()
?: project.kotlinBuildProperties.isTeamcityBuild
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
kotlinOptions.freeCompilerArgs += "-opt-in=kotlin.io.path.ExperimentalPathApi"
tasks.withType<KotlinJvmCompile>().configureEach {
compilerOptions.optIn.add("kotlin.io.path.ExperimentalPathApi")
}
val cleanTestKitCacheTask = tasks.register<Delete>("cleanTestKitCache") {
libraries/tools/script-runtime/build.gradle
+2 -2
View File
@@ -26,10 +26,10 @@ RepoArtifacts.sourcesJar(project)
RepoArtifacts.javadocJar(project)
compileKotlin {
kotlinOptions.freeCompilerArgs = [
compilerOptions.freeCompilerArgs = [
"-Xallow-kotlin-package",
]
kotlinOptions.moduleName = project.name
compilerOptions.moduleName = project.name
}
LibrariesCommon.configureFrontendIr(project)