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

[Gradle] Rename experimental annotations to opt-in in test data

Browse Source 
#KT-38111 In Progress
This commit is contained in:
Alexander Likhachev
2021-07-14 15:13:51 +03:00
parent fa68dbc736
commit 68ced78d89
9 changed files with 12 additions and 12 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
+4 -4
View File
@@ -730,8 +730,8 @@ class NewMultiplatformIT : BaseGradleIT() {
// languageVersion = '1.3' // can't do this with Kotlin/Native 1.4+, done below for non-Native tasks // languageVersion = '1.3' // can't do this with Kotlin/Native 1.4+, done below for non-Native tasks
// apiVersion = '1.3' // can't do this with Kotlin/Native 1.4+, done below for non-Native tasks // apiVersion = '1.3' // can't do this with Kotlin/Native 1.4+, done below for non-Native tasks
enableLanguageFeature('InlineClasses') enableLanguageFeature('InlineClasses')
useExperimentalAnnotation('kotlin.ExperimentalUnsignedTypes') optInAnnotation('kotlin.ExperimentalUnsignedTypes')
useExperimentalAnnotation('kotlin.contracts.ExperimentalContracts') optInAnnotation('kotlin.contracts.ExperimentalContracts')
progressiveMode = true progressiveMode = true
} }
project.ext.set("kotlin.mpp.freeCompilerArgsForSourceSet.${'$'}name", ["-Xno-inline"]) project.ext.set("kotlin.mpp.freeCompilerArgsForSourceSet.${'$'}name", ["-Xno-inline"])
@@ -824,8 +824,8 @@ class NewMultiplatformIT : BaseGradleIT() {
) )
testMonotonousCheck( testMonotonousCheck(
"languageSettings.useExperimentalAnnotation('kotlin.ExperimentalUnsignedTypes')", "languageSettings.optInAnnotation('kotlin.ExperimentalUnsignedTypes')",
"The dependent source set must use all experimental annotations that its dependency uses." "The dependent source set must use all opt-in annotations that its dependency uses."
) )
// check that enabling a bugfix feature and progressive mode or advancing API level // check that enabling a bugfix feature and progressive mode or advancing API level
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeCurlInterop/build.gradle.kts
+1 -1
View File
@@ -21,7 +21,7 @@ kotlin {
targetBMain.dependsOn(nativeMain) targetBMain.dependsOn(nativeMain)
sourceSets.all { sourceSets.all {
languageSettings.useExperimentalAnnotation("kotlin.RequiresOptIn") languageSettings.optInAnnotation("kotlin.RequiresOptIn")
} }
targetA.compilations.getByName("main").cinterops.create("curl") targetA.compilations.getByName("main").cinterops.create("curl")
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchically/p1/build.gradle.kts
+1 -1
View File
@@ -75,7 +75,7 @@ kotlin {
sourceSets.all { sourceSets.all {
languageSettings.useExperimentalAnnotation("kotlin.RequiresOptIn") languageSettings.optInAnnotation("kotlin.RequiresOptIn")
} }
targets.withType<KotlinNativeTarget>().forEach { target -> targets.withType<KotlinNativeTarget>().forEach { target ->
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchicallyMultiModule/p1/build.gradle.kts
+1 -1
View File
@@ -68,7 +68,7 @@ kotlin {
sourceSets.all { sourceSets.all {
languageSettings.useExperimentalAnnotation("kotlin.RequiresOptIn") languageSettings.optInAnnotation("kotlin.RequiresOptIn")
} }
targets.withType<KotlinNativeTarget>().forEach { target -> targets.withType<KotlinNativeTarget>().forEach { target ->
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchicallyMultiModule/p2/build.gradle.kts
+1 -1
View File
@@ -71,7 +71,7 @@ kotlin {
} }
sourceSets.all { sourceSets.all {
languageSettings.useExperimentalAnnotation("kotlin.RequiresOptIn") languageSettings.optInAnnotation("kotlin.RequiresOptIn")
} }
targets.withType<KotlinNativeTarget>().forEach { target -> targets.withType<KotlinNativeTarget>().forEach { target ->
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchicallyMultiModule/p3/build.gradle.kts
+1 -1
View File
@@ -67,7 +67,7 @@ kotlin {
} }
sourceSets.all { sourceSets.all {
languageSettings.useExperimentalAnnotation("kotlin.RequiresOptIn") languageSettings.optInAnnotation("kotlin.RequiresOptIn")
} }
targets.withType<KotlinNativeTarget>().forEach { target -> targets.withType<KotlinNativeTarget>().forEach { target ->
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeInteropUsingPosixApis/build.gradle.kts
+1 -1
View File
@@ -22,7 +22,7 @@ kotlin {
targetBMain.dependsOn(nativeMain) targetBMain.dependsOn(nativeMain)
sourceSets.all { sourceSets.all {
languageSettings.useExperimentalAnnotation("kotlin.RequiresOptIn") languageSettings.optInAnnotation("kotlin.RequiresOptIn")
} }
targetA.compilations.getByName("main").cinterops.create("withPosix") { targetA.compilations.getByName("main").cinterops.create("withPosix") {
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeSQLiteAndCurlInterop/build.gradle.kts
+1 -1
View File
@@ -21,7 +21,7 @@ kotlin {
targetBMain.dependsOn(nativeMain) targetBMain.dependsOn(nativeMain)
sourceSets.all { sourceSets.all {
languageSettings.useExperimentalAnnotation("kotlin.RequiresOptIn") languageSettings.optInAnnotation("kotlin.RequiresOptIn")
} }
targetA.compilations.getByName("main").cinterops.create("sqlite") targetA.compilations.getByName("main").cinterops.create("sqlite")
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeSQLiteInterop/build.gradle.kts
+1 -1
View File
@@ -21,7 +21,7 @@ kotlin {
targetBMain.dependsOn(nativeMain) targetBMain.dependsOn(nativeMain)
sourceSets.all { sourceSets.all {
languageSettings.useExperimentalAnnotation("kotlin.RequiresOptIn") languageSettings.optInAnnotation("kotlin.RequiresOptIn")
} }
targetA.compilations.getByName("main").cinterops.create("sqlite") targetA.compilations.getByName("main").cinterops.create("sqlite")