diff --git a/libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api b/libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api index a2be5add4a7..a567d0deeed 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api +++ b/libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api @@ -8,15 +8,15 @@ public final class org/jetbrains/kotlin/gradle/dsl/ExplicitApiMode : java/lang/E public static fun values ()[Lorg/jetbrains/kotlin/gradle/dsl/ExplicitApiMode; } -public abstract interface class org/jetbrains/kotlin/gradle/dsl/HasConfigurableCompilerOptions { +public abstract interface class org/jetbrains/kotlin/gradle/dsl/HasConfigurableKotlinCompilerOptions { public abstract fun compilerOptions (Lkotlin/jvm/functions/Function1;)V public abstract fun compilerOptions (Lorg/gradle/api/Action;)V public abstract fun getCompilerOptions ()Lorg/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerOptions; } -public final class org/jetbrains/kotlin/gradle/dsl/HasConfigurableCompilerOptions$DefaultImpls { - public static fun compilerOptions (Lorg/jetbrains/kotlin/gradle/dsl/HasConfigurableCompilerOptions;Lkotlin/jvm/functions/Function1;)V - public static fun compilerOptions (Lorg/jetbrains/kotlin/gradle/dsl/HasConfigurableCompilerOptions;Lorg/gradle/api/Action;)V +public final class org/jetbrains/kotlin/gradle/dsl/HasConfigurableKotlinCompilerOptions$DefaultImpls { + public static fun compilerOptions (Lorg/jetbrains/kotlin/gradle/dsl/HasConfigurableKotlinCompilerOptions;Lkotlin/jvm/functions/Function1;)V + public static fun compilerOptions (Lorg/jetbrains/kotlin/gradle/dsl/HasConfigurableKotlinCompilerOptions;Lorg/gradle/api/Action;)V } public final class org/jetbrains/kotlin/gradle/dsl/JsDiagnosticMode : java/lang/Enum { diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/HasConfigurableCompilerOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/HasConfigurableKotlinCompilerOptions.kt similarity index 93% rename from libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/HasConfigurableCompilerOptions.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/HasConfigurableKotlinCompilerOptions.kt index a426df8969c..8071fe656e6 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/HasConfigurableCompilerOptions.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/HasConfigurableKotlinCompilerOptions.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi * DSL entity with the ability to configure Kotlin compiler options. */ @ExperimentalKotlinGradlePluginApi -interface HasConfigurableCompilerOptions { +interface HasConfigurableKotlinCompilerOptions { /** * Represents the compiler options used by a Kotlin compilation process. diff --git a/libraries/tools/kotlin-gradle-plugin-tcs-android/src/main/kotlin/org/jetbrains/kotlin/gradle/android/PrototypeAndroidTarget.kt b/libraries/tools/kotlin-gradle-plugin-tcs-android/src/main/kotlin/org/jetbrains/kotlin/gradle/android/PrototypeAndroidTarget.kt index c60db6c4900..1bc8bf78052 100644 --- a/libraries/tools/kotlin-gradle-plugin-tcs-android/src/main/kotlin/org/jetbrains/kotlin/gradle/android/PrototypeAndroidTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin-tcs-android/src/main/kotlin/org/jetbrains/kotlin/gradle/android/PrototypeAndroidTarget.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.gradle.android import org.gradle.api.NamedDomainObjectContainer import org.gradle.kotlin.dsl.getByType import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi -import org.jetbrains.kotlin.gradle.dsl.HasConfigurableCompilerOptions +import org.jetbrains.kotlin.gradle.dsl.HasConfigurableKotlinCompilerOptions import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jetbrains.kotlin.gradle.plugin.mpp.external.DecoratedExternalKotlinTarget @@ -22,7 +22,7 @@ class PrototypeAndroidTarget( delegate: Delegate, val androidDsl: PrototypeAndroidDsl ) : DecoratedExternalKotlinTarget(delegate), - HasConfigurableCompilerOptions { + HasConfigurableKotlinCompilerOptions { internal val kotlin = super.project.extensions.getByType() @Suppress("unchecked_cast") diff --git a/libraries/tools/kotlin-gradle-plugin/api/kotlin-gradle-plugin.api b/libraries/tools/kotlin-gradle-plugin/api/kotlin-gradle-plugin.api index a170581827b..8cc707cf532 100644 --- a/libraries/tools/kotlin-gradle-plugin/api/kotlin-gradle-plugin.api +++ b/libraries/tools/kotlin-gradle-plugin/api/kotlin-gradle-plugin.api @@ -1,4 +1,4 @@ -public abstract class org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformExtension : org/jetbrains/kotlin/gradle/dsl/KotlinProjectExtension, org/jetbrains/kotlin/gradle/dsl/HasConfigurableCompilerOptions, org/jetbrains/kotlin/gradle/dsl/KotlinHierarchyDsl, org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformSourceSetConventions, org/jetbrains/kotlin/gradle/dsl/KotlinTargetContainerWithJsPresetFunctions, org/jetbrains/kotlin/gradle/dsl/KotlinTargetContainerWithNativeShortcuts, org/jetbrains/kotlin/gradle/dsl/KotlinTargetContainerWithPresetFunctions, org/jetbrains/kotlin/gradle/dsl/KotlinTargetContainerWithWasmPresetFunctions { +public abstract class org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformExtension : org/jetbrains/kotlin/gradle/dsl/KotlinProjectExtension, org/jetbrains/kotlin/gradle/dsl/HasConfigurableKotlinCompilerOptions, org/jetbrains/kotlin/gradle/dsl/KotlinHierarchyDsl, org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformSourceSetConventions, org/jetbrains/kotlin/gradle/dsl/KotlinTargetContainerWithJsPresetFunctions, org/jetbrains/kotlin/gradle/dsl/KotlinTargetContainerWithNativeShortcuts, org/jetbrains/kotlin/gradle/dsl/KotlinTargetContainerWithPresetFunctions, org/jetbrains/kotlin/gradle/dsl/KotlinTargetContainerWithWasmPresetFunctions { public fun android ()Lorg/jetbrains/kotlin/gradle/plugin/mpp/KotlinAndroidTarget; public fun android (Ljava/lang/String;)Lorg/jetbrains/kotlin/gradle/plugin/mpp/KotlinAndroidTarget; public fun android (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlin/gradle/plugin/mpp/KotlinAndroidTarget; diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformExtension.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformExtension.kt index 54a82cdb89f..653cd303169 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformExtension.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformExtension.kt @@ -36,7 +36,7 @@ abstract class KotlinMultiplatformExtension KotlinTargetContainerWithWasmPresetFunctions, KotlinTargetContainerWithNativeShortcuts, KotlinHierarchyDsl, - HasConfigurableCompilerOptions, + HasConfigurableKotlinCompilerOptions, KotlinMultiplatformSourceSetConventions by KotlinMultiplatformSourceSetConventionsImpl { @Deprecated( PRESETS_API_IS_DEPRECATED_MESSAGE, diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/compilerOptionsDslHelpers.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/compilerOptionsDslHelpers.kt index 40c98ef8f8c..7eaa9c090d0 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/compilerOptionsDslHelpers.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/compilerOptionsDslHelpers.kt @@ -47,7 +47,7 @@ internal fun KotlinMultiplatformExtension.syncCommonOptions( internal val KotlinTarget.targetCompilerOptions: KotlinCommonCompilerOptions get() = when (this) { - is HasConfigurableCompilerOptions<*> -> compilerOptions + is HasConfigurableKotlinCompilerOptions<*> -> compilerOptions // Required for external targets that do not implement 'HasConfigurableCompilerOptions' interface is DecoratedExternalKotlinTarget -> delegate.compilerOptions else -> throw IllegalStateException("'KotlinTarget' type ${this.javaClass} does not allow to configure compiler options!") diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMetadataTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMetadataTarget.kt index 91e619c9448..e0d15886eb7 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMetadataTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMetadataTarget.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.gradle.plugin.mpp import org.gradle.api.Project import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi -import org.jetbrains.kotlin.gradle.dsl.HasConfigurableCompilerOptions +import org.jetbrains.kotlin.gradle.dsl.HasConfigurableKotlinCompilerOptions import org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions import org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptionsDefault import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation @@ -21,7 +21,7 @@ import javax.inject.Inject abstract class KotlinMetadataTarget @Inject constructor( project: Project, ) : KotlinOnlyTarget>(project, KotlinPlatformType.common), - HasConfigurableCompilerOptions { + HasConfigurableKotlinCompilerOptions { override val artifactsTaskName: String // The IDE import looks at this task name to determine the artifact and register the path to the artifact; diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetImpl.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetImpl.kt index 4121ca7b825..cc513b9c681 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetImpl.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetImpl.kt @@ -14,7 +14,7 @@ import org.gradle.api.publish.maven.MavenPublication import org.gradle.api.tasks.TaskProvider import org.jetbrains.kotlin.gradle.InternalKotlinGradlePluginApi import org.jetbrains.kotlin.gradle.PRESETS_API_IS_DEPRECATED_MESSAGE -import org.jetbrains.kotlin.gradle.dsl.HasConfigurableCompilerOptions +import org.jetbrains.kotlin.gradle.dsl.HasConfigurableKotlinCompilerOptions import org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType @@ -39,7 +39,7 @@ internal class ExternalKotlinTargetImpl internal constructor( val kotlinTargetComponent: ExternalKotlinTargetComponent, private val artifactsTaskLocator: ArtifactsTaskLocator, ) : InternalKotlinTarget, - HasConfigurableCompilerOptions { + HasConfigurableKotlinCompilerOptions { fun interface ArtifactsTaskLocator { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/android/KotlinAndroidTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/android/KotlinAndroidTarget.kt index 8384a991a00..e41e4b8e745 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/android/KotlinAndroidTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/android/KotlinAndroidTarget.kt @@ -11,11 +11,10 @@ import org.gradle.api.artifacts.Configuration import org.gradle.api.attributes.Attribute import org.gradle.api.attributes.AttributeContainer import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi -import org.jetbrains.kotlin.gradle.dsl.HasConfigurableCompilerOptions +import org.jetbrains.kotlin.gradle.dsl.HasConfigurableKotlinCompilerOptions import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptionsDefault import org.jetbrains.kotlin.gradle.plugin.* -import org.jetbrains.kotlin.gradle.plugin.internal.attributesConfigurationHelper import org.jetbrains.kotlin.gradle.tasks.DefaultKotlinJavaToolchain import org.jetbrains.kotlin.gradle.utils.* import org.jetbrains.kotlin.gradle.utils.dashSeparatedName @@ -30,7 +29,7 @@ abstract class KotlinAndroidTarget @Inject constructor( final override val targetName: String, project: Project, ) : AbstractKotlinTarget(project), - HasConfigurableCompilerOptions { + HasConfigurableKotlinCompilerOptions { final override val disambiguationClassifier: String = targetName diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/dsl/KotlinJsTargetDsl.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/dsl/KotlinJsTargetDsl.kt index dc8e3ca26ac..993d5e209ea 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/dsl/KotlinJsTargetDsl.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/dsl/KotlinJsTargetDsl.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.gradle.targets.js.dsl import org.gradle.api.Action import org.gradle.api.GradleException import org.gradle.api.NamedDomainObjectContainer -import org.jetbrains.kotlin.gradle.dsl.HasConfigurableCompilerOptions +import org.jetbrains.kotlin.gradle.dsl.HasConfigurableKotlinCompilerOptions import org.jetbrains.kotlin.gradle.dsl.KotlinJsCompilerOptions import org.jetbrains.kotlin.gradle.dsl.KotlinJsDce import org.jetbrains.kotlin.gradle.plugin.KotlinTarget @@ -40,7 +40,7 @@ interface KotlinJsTargetDsl : KotlinTarget, KotlinTargetWithNodeJsDsl, HasBinaries, - HasConfigurableCompilerOptions { + HasConfigurableKotlinCompilerOptions { var moduleName: String? diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmTarget.kt index 0efc95331ce..4949ac9d53b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmTarget.kt @@ -47,7 +47,7 @@ import javax.inject.Inject abstract class KotlinJvmTarget @Inject constructor( project: Project, ) : KotlinOnlyTarget(project, KotlinPlatformType.jvm), - HasConfigurableCompilerOptions, + HasConfigurableKotlinCompilerOptions, KotlinTargetWithTests { override val testRuns: NamedDomainObjectContainer by lazy { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinWithJavaTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinWithJavaTarget.kt index 8d9ccdc75a4..4ec1ec16a57 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinWithJavaTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinWithJavaTarget.kt @@ -29,7 +29,7 @@ abstract class KotlinWithJavaTarget DeprecatedHasCompilerOptions, kotlinOptionsFactory: (CO) -> KotlinOptionsType ) : AbstractKotlinTarget(project), - HasConfigurableCompilerOptions { + HasConfigurableKotlinCompilerOptions { override var disambiguationClassifier: String? = null internal set diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTarget.kt index 967052e1e80..e98452cfc4f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTarget.kt @@ -34,7 +34,7 @@ import javax.inject.Inject abstract class KotlinNativeTarget @Inject constructor( project: Project, val konanTarget: KonanTarget, -) : HasConfigurableCompilerOptions, +) : HasConfigurableKotlinCompilerOptions, KotlinTargetWithBinaries( project, KotlinPlatformType.native diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/externalTargetApiUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/externalTargetApiUtils.kt index b07e71163f8..6ec91376e3d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/externalTargetApiUtils.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/externalTargetApiUtils.kt @@ -24,7 +24,7 @@ class FakeCompilation(delegate: Delegate) : DecoratedExternalKotlinCompilation(d } class FakeTarget(delegate: Delegate) : DecoratedExternalKotlinTarget(delegate), - HasConfigurableCompilerOptions { + HasConfigurableKotlinCompilerOptions { @Suppress("UNCHECKED_CAST") override val compilations: NamedDomainObjectContainer