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
kotlin-native/Interop/Indexer/build.gradle.kts
+15 -13
View File
@@ -6,11 +6,8 @@
import org.jetbrains.kotlin.tools.lib
import org.jetbrains.kotlin.tools.solib
import org.jetbrains.kotlin.*
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
import org.jetbrains.kotlin.konan.target.*
import org.jetbrains.kotlin.konan.target.ClangArgs
import org.jetbrains.kotlin.konan.target.Family.*
import org.jetbrains.kotlin.konan.target.HostManager.Companion.hostIsMac
plugins {
id("org.jetbrains.kotlin.jvm")
@@ -162,16 +159,21 @@ kotlinNativeInterop {
}
}
tasks.withType<KotlinCompile>().configureEach {
kotlinOptions {
freeCompilerArgs += listOf(
"-Xskip-prerelease-check",
"-opt-in=kotlinx.cinterop.BetaInteropApi",
"-opt-in=kotlinx.cinterop.ExperimentalForeignApi",
// staticCFunction uses kotlin.reflect.jvm.reflect on its lambda parameter.
"-Xlambdas=class",
tasks.withType<KotlinJvmCompile>().configureEach {
compilerOptions {
optIn.addAll(
listOf(
"kotlinx.cinterop.BetaInteropApi",
"kotlinx.cinterop.ExperimentalForeignApi",
)
)
freeCompilerArgs.addAll(
listOf(
"-Xskip-prerelease-check",
// staticCFunction uses kotlin.reflect.jvm.reflect on its lambda parameter.
"-Xlambdas=class",
)
)
}
}
kotlin-native/Interop/Runtime/build.gradle.kts
+9 -7
View File
@@ -67,14 +67,16 @@ sourceSets.main.configure {
}
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
kotlinOptions {
freeCompilerArgs += listOf(
"-opt-in=kotlin.ExperimentalUnsignedTypes",
"-opt-in=kotlinx.cinterop.BetaInteropApi",
"-opt-in=kotlinx.cinterop.ExperimentalForeignApi",
"-Xskip-prerelease-check"
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask<*>>().configureEach {
compilerOptions {
optIn.addAll(
listOf(
"kotlin.ExperimentalUnsignedTypes",
"kotlinx.cinterop.BetaInteropApi",
"kotlinx.cinterop.ExperimentalForeignApi",
)
)
freeCompilerArgs.add("-Xskip-prerelease-check")
}
}
kotlin-native/Interop/Skia/build.gradle
+3 -3
View File
@@ -15,8 +15,8 @@ dependencies {
}
compileKotlin {
kotlinOptions.freeCompilerArgs = [
"-opt-in=kotlinx.cinterop.BetaInteropApi",
"-opt-in=kotlinx.cinterop.ExperimentalForeignApi",
compilerOptions.optIn = [
"kotlinx.cinterop.BetaInteropApi",
"kotlinx.cinterop.ExperimentalForeignApi",
]
}
kotlin-native/Interop/StubGenerator/build.gradle.kts
+6 -6
View File
@@ -1,3 +1,5 @@
import org.jetbrains.kotlin.config.AnalysisFlags.optIn
/*
* Copyright 2010-2022 JetBrains s.r.o.
*
@@ -42,12 +44,10 @@ dependencies {
}
tasks {
withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
kotlinOptions {
freeCompilerArgs += listOf(
"-opt-in=kotlin.ExperimentalUnsignedTypes",
"-Xskip-metadata-version-check"
)
withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask<*>> {
compilerOptions {
optIn.add("kotlin.ExperimentalUnsignedTypes")
freeCompilerArgs.add("-Xskip-metadata-version-check")
}
}