[Gradle] Rename internal KotlinGradlePluginDsl into KotlinGradlePluginPublicDsl
This is an internal annotation that eventually should go away, and the name is clashing with more public annotation is going to be introduced in the API project. ^KT-57292 In Progress
This commit is contained in:
committed by
Space Team
parent
a02cf76d6c
commit
74b4adf8e2
@@ -32,7 +32,7 @@ kotlin {
|
||||
|
||||
apiValidation {
|
||||
publicMarkers.add("org.jetbrains.kotlin.gradle.ExternalKotlinTargetApi")
|
||||
publicMarkers.add("org.jetbrains.kotlin.gradle.dsl.KotlinGradlePluginDsl")
|
||||
publicMarkers.add("org.jetbrains.kotlin.gradle.dsl.KotlinGradlePluginPublicDsl")
|
||||
nonPublicMarkers.add("org.jetbrains.kotlin.gradle.InternalKotlinGradlePluginApi")
|
||||
additionalSourceSets.add("common")
|
||||
}
|
||||
|
||||
+4
-1
@@ -7,6 +7,9 @@ package org.jetbrains.kotlin.gradle.dsl
|
||||
|
||||
/**
|
||||
* Adhoc marker for APIs that are considered 'User facing dsl'.
|
||||
*
|
||||
* Annotated APIs will be binary validated.
|
||||
*
|
||||
* Please consider exposing public DSL in the Kotlin Gradle Plugin API artifact rather than adding this annotation.
|
||||
*/
|
||||
internal annotation class KotlinGradlePluginDsl
|
||||
internal annotation class KotlinGradlePluginPublicDsl
|
||||
+2
-2
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.gradle.utils.newInstance
|
||||
import javax.inject.Inject
|
||||
|
||||
@Suppress("DEPRECATION")
|
||||
@KotlinGradlePluginDsl
|
||||
@KotlinGradlePluginPublicDsl
|
||||
abstract class KotlinMultiplatformExtension
|
||||
@InternalKotlinGradlePluginApi constructor(project: Project) :
|
||||
KotlinProjectExtension(project),
|
||||
@@ -263,7 +263,7 @@ abstract class KotlinMultiplatformExtension
|
||||
}
|
||||
|
||||
@DeprecatedTargetPresetApi
|
||||
@KotlinGradlePluginDsl
|
||||
@KotlinGradlePluginPublicDsl
|
||||
interface TargetsFromPresetExtension : NamedDomainObjectCollection<KotlinTarget> {
|
||||
|
||||
@Deprecated(
|
||||
|
||||
+1
-1
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsTargetDsl
|
||||
import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
|
||||
import org.jetbrains.kotlin.konan.target.Family
|
||||
|
||||
@KotlinGradlePluginDsl
|
||||
@KotlinGradlePluginPublicDsl
|
||||
interface KotlinMultiplatformSourceSetConventions {
|
||||
val NamedDomainObjectContainer<KotlinSourceSet>.commonMain: NamedDomainObjectProvider<KotlinSourceSet>
|
||||
val NamedDomainObjectContainer<KotlinSourceSet>.commonTest: NamedDomainObjectProvider<KotlinSourceSet>
|
||||
|
||||
+1
-1
@@ -165,7 +165,7 @@ internal fun KotlinTopLevelExtension.explicitApiModeAsCompilerArg(): String? {
|
||||
return cliOption?.let { "-Xexplicit-api=$it" }
|
||||
}
|
||||
|
||||
@KotlinGradlePluginDsl
|
||||
@KotlinGradlePluginPublicDsl
|
||||
open class KotlinProjectExtension @Inject constructor(project: Project) : KotlinTopLevelExtension(project), KotlinSourceSetContainer, HasMutableExtras {
|
||||
final override val extras: MutableExtras = mutableExtrasOf()
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@ import org.jetbrains.kotlin.gradle.plugin.*
|
||||
import org.jetbrains.kotlin.gradle.targets.android.internal.InternalKotlinTargetPreset
|
||||
import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsTargetDsl
|
||||
|
||||
@KotlinGradlePluginDsl
|
||||
@KotlinGradlePluginPublicDsl
|
||||
interface KotlinTargetContainerWithJsPresetFunctions :
|
||||
KotlinTargetContainerWithPresetFunctions,
|
||||
KotlinJsCompilerTypeHolder {
|
||||
|
||||
+1
-1
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.tooling.core.extrasReadWriteProperty
|
||||
private const val SHORTCUTS_DEPRECATION_MESSAGE = "Use applyDefaultHierarchyTemplate() instead. " +
|
||||
"Deprecated since 1.9.20, scheduled for removal in 2.0"
|
||||
|
||||
@KotlinGradlePluginDsl
|
||||
@KotlinGradlePluginPublicDsl
|
||||
@Deprecated(SHORTCUTS_DEPRECATION_MESSAGE)
|
||||
interface KotlinTargetContainerWithNativeShortcuts : KotlinTargetContainerWithPresetFunctions, KotlinSourceSetContainer {
|
||||
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@ import org.jetbrains.kotlin.konan.target.DEPRECATED_TARGET_MESSAGE
|
||||
|
||||
private const val ANDROID_TARGET_MIGRATION_MESSAGE = "Please use androidTarget() instead. Learn more here: https://kotl.in/android-target-dsl"
|
||||
|
||||
@KotlinGradlePluginDsl
|
||||
@KotlinGradlePluginPublicDsl
|
||||
interface KotlinTargetContainerWithPresetFunctions : KotlinTargetsContainerWithPresets {
|
||||
|
||||
fun jvm(
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinWasmJsTargetDsl
|
||||
import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinWasmWasiTargetDsl
|
||||
import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinWasmTargetPreset
|
||||
|
||||
@KotlinGradlePluginDsl
|
||||
@KotlinGradlePluginPublicDsl
|
||||
interface KotlinTargetContainerWithWasmPresetFunctions : KotlinTargetContainerWithPresetFunctions {
|
||||
@ExperimentalWasmDsl
|
||||
fun wasmJs(
|
||||
|
||||
Reference in New Issue
Block a user