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

[Gradle] Simplify optInAnnotation function name to optIn in DSL

Browse Source 
#KT-38111
This commit is contained in:
Alexander Likhachev
2021-07-19 15:02:40 +03:00
parent e276dec4de
commit b93bd1fe09
11 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/LanguageSettingsBuilder.kt
+2 -2
View File
@@ -18,10 +18,10 @@ interface LanguageSettingsBuilder : LanguageSettings {
override val enabledLanguageFeatures: Set<String>
@Deprecated("Unsupported and will be removed in next major releases", replaceWith = ReplaceWith("optInAnnotation(name)"))
@Deprecated("Unsupported and will be removed in next major releases", replaceWith = ReplaceWith("optIn(name)"))
fun useExperimentalAnnotation(name: String)
fun optInAnnotation(name: String)
fun optIn(annotationName: String)
override val experimentalAnnotationsInUse: Set<String>
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt
+3 -3
View File
@@ -730,8 +730,8 @@ class NewMultiplatformIT : BaseGradleIT() {
// languageVersion = '1.4'
// apiVersion = '1.4'
enableLanguageFeature('InlineClasses')
optInAnnotation('kotlin.ExperimentalUnsignedTypes')
optInAnnotation('kotlin.contracts.ExperimentalContracts')
optIn('kotlin.ExperimentalUnsignedTypes')
optIn('kotlin.contracts.ExperimentalContracts')
progressiveMode = true
}
project.ext.set("kotlin.mpp.freeCompilerArgsForSourceSet.${'$'}name", ["-Xno-inline"])
@@ -824,7 +824,7 @@ class NewMultiplatformIT : BaseGradleIT() {
)
testMonotonousCheck(
"languageSettings.optInAnnotation('kotlin.ExperimentalUnsignedTypes')",
"languageSettings.optIn('kotlin.ExperimentalUnsignedTypes')",
"The dependent source set must use all opt-in annotations that its dependency uses."
)
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)
sourceSets.all {
languageSettings.optInAnnotation("kotlin.RequiresOptIn")
languageSettings.optIn("kotlin.RequiresOptIn")
}
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 {
languageSettings.optInAnnotation("kotlin.RequiresOptIn")
languageSettings.optIn("kotlin.RequiresOptIn")
}
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 {
languageSettings.optInAnnotation("kotlin.RequiresOptIn")
languageSettings.optIn("kotlin.RequiresOptIn")
}
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 {
languageSettings.optInAnnotation("kotlin.RequiresOptIn")
languageSettings.optIn("kotlin.RequiresOptIn")
}
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 {
languageSettings.optInAnnotation("kotlin.RequiresOptIn")
languageSettings.optIn("kotlin.RequiresOptIn")
}
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)
sourceSets.all {
languageSettings.optInAnnotation("kotlin.RequiresOptIn")
languageSettings.optIn("kotlin.RequiresOptIn")
}
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)
sourceSets.all {
languageSettings.optInAnnotation("kotlin.RequiresOptIn")
languageSettings.optIn("kotlin.RequiresOptIn")
}
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)
sourceSets.all {
languageSettings.optInAnnotation("kotlin.RequiresOptIn")
languageSettings.optIn("kotlin.RequiresOptIn")
}
targetA.compilations.getByName("main").cinterops.create("sqlite")
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultLanguageSettingsBuilder.kt
+4 -4
View File
@@ -77,8 +77,8 @@ internal class DefaultLanguageSettingsBuilder(@Transient private val project: Pr
return optInAnnotationsInUse
}
override fun optInAnnotation(name: String) {
optInAnnotationsInUseImpl += name
override fun optIn(annotationName: String) {
optInAnnotationsInUseImpl += annotationName
}
override fun useExperimentalAnnotation(name: String) {
@@ -86,9 +86,9 @@ internal class DefaultLanguageSettingsBuilder(@Transient private val project: Pr
project,
"Kotlin language settings function",
"useExperimentalAnnotation",
"optInAnnotation"
"optIn"
)
optInAnnotation(name)
optIn(name)
}
/* A Kotlin task that is responsible for code analysis of the owner of this language settings builder. */