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

[Gradle] Use compiler argument -opt-in instead of '-Xopt-in'

Browse Source 
#KT-35832 Fixed
This commit is contained in:
Alexander Likhachev
2021-07-14 17:51:20 +03:00
committed by Space
parent 10f9c217fd
commit c3515cc338
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt
+2 -2
View File
@@ -748,8 +748,8 @@ class NewMultiplatformIT : BaseGradleIT() {
assertTasksExecuted(":$it") assertTasksExecuted(":$it")
assertContains( assertContains(
"-XXLanguage:+InlineClasses", "-XXLanguage:+InlineClasses",
"-progressive", "-Xopt-in=kotlin.ExperimentalUnsignedTypes", "-progressive", "-opt-in=kotlin.ExperimentalUnsignedTypes",
"-Xopt-in=kotlin.contracts.ExperimentalContracts", "-opt-in=kotlin.contracts.ExperimentalContracts",
"-Xno-inline" "-Xno-inline"
) )
} }
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt
+2 -2
View File
@@ -213,8 +213,8 @@ class SimpleKotlinGradleIT : KGPBaseTest() {
fun testUseExperimentalAnnotationShouldProduceWarning(gradleVersion: GradleVersion) { fun testUseExperimentalAnnotationShouldProduceWarning(gradleVersion: GradleVersion) {
project("optInAnnotation", gradleVersion, buildOptions = defaultBuildOptions.copy(logLevel = LogLevel.DEBUG)) { project("optInAnnotation", gradleVersion, buildOptions = defaultBuildOptions.copy(logLevel = LogLevel.DEBUG)) {
build("assemble") { build("assemble") {
assertOutputContains("-Xopt-in=kotlin.RequiresOptIn") assertOutputContains("-opt-in=kotlin.RequiresOptIn")
assertOutputContains("-Xopt-in=FooAnnotation") assertOutputContains("-opt-in=FooAnnotation")
assertOutputContains("is deprecated and will be removed in next major releases") assertOutputContains("is deprecated and will be removed in next major releases")
} }
} }
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultLanguageSettingsBuilder.kt
+1 -1
View File
@@ -138,7 +138,7 @@ internal fun applyLanguageSettingsToKotlinOptions(
} }
languageSettingsBuilder.optInAnnotationsInUse.forEach { annotationName -> languageSettingsBuilder.optInAnnotationsInUse.forEach { annotationName ->
add("-Xopt-in=$annotationName") add("-opt-in=$annotationName")
} }
if (languageSettingsBuilder is DefaultLanguageSettingsBuilder) { if (languageSettingsBuilder is DefaultLanguageSettingsBuilder) {
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
+2 -2
View File
@@ -463,7 +463,7 @@ constructor(
add("-XXLanguage:+$featureName") add("-XXLanguage:+$featureName")
} }
optInAnnotationsInUse.forEach { annotationName -> optInAnnotationsInUse.forEach { annotationName ->
add("-Xopt-in=$annotationName") add("-opt-in=$annotationName")
} }
} }
@@ -629,7 +629,7 @@ constructor(
add("-XXLanguage:+$featureName") add("-XXLanguage:+$featureName")
} }
it.optInAnnotationsInUse.forEach { annotationName -> it.optInAnnotationsInUse.forEach { annotationName ->
add("-Xopt-in=$annotationName") add("-opt-in=$annotationName")
} }
} }
} }