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

[Gradle] Rename to HasConfigurableKotlinCompilerOptions

Browse Source 
Added "Kotlin" to better indicate to what this interface belongs to.

^KT-65196
This commit is contained in:
Yahor Berdnikau
2024-02-23 09:41:39 +01:00
committed by Space Team
parent edf05b69ac
commit bdb96dc0db
14 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api
+4 -4
View File
@@ -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 {
libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/HasConfigurableCompilerOptions.kt → libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/HasConfigurableKotlinCompilerOptions.kt
+1 -1
View File
@@ -12,7 +12,7 @@ import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
* DSL entity with the ability to configure Kotlin compiler options.
*/
@ExperimentalKotlinGradlePluginApi
interface HasConfigurableCompilerOptions<CO : KotlinCommonCompilerOptions> {
interface HasConfigurableKotlinCompilerOptions<CO : KotlinCommonCompilerOptions> {
/**
* Represents the compiler options used by a Kotlin compilation process.
libraries/tools/kotlin-gradle-plugin-tcs-android/src/main/kotlin/org/jetbrains/kotlin/gradle/android/PrototypeAndroidTarget.kt
+2 -2
View File
@@ -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<KotlinJvmCompilerOptions> {
HasConfigurableKotlinCompilerOptions<KotlinJvmCompilerOptions> {
internal val kotlin = super.project.extensions.getByType<KotlinMultiplatformExtension>()
@Suppress("unchecked_cast")
libraries/tools/kotlin-gradle-plugin/api/kotlin-gradle-plugin.api
+1 -1
View File
@@ -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;
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformExtension.kt
+1 -1
View File
@@ -36,7 +36,7 @@ abstract class KotlinMultiplatformExtension
KotlinTargetContainerWithWasmPresetFunctions,
KotlinTargetContainerWithNativeShortcuts,
KotlinHierarchyDsl,
HasConfigurableCompilerOptions<KotlinCommonCompilerOptions>,
HasConfigurableKotlinCompilerOptions<KotlinCommonCompilerOptions>,
KotlinMultiplatformSourceSetConventions by KotlinMultiplatformSourceSetConventionsImpl {
@Deprecated(
PRESETS_API_IS_DEPRECATED_MESSAGE,
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/compilerOptionsDslHelpers.kt
+1 -1
View File
@@ -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!")
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMetadataTarget.kt
+2 -2
View File
@@ -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<KotlinCompilation<*>>(project, KotlinPlatformType.common),
HasConfigurableCompilerOptions<KotlinCommonCompilerOptions> {
HasConfigurableKotlinCompilerOptions<KotlinCommonCompilerOptions> {
override val artifactsTaskName: String
// The IDE import looks at this task name to determine the artifact and register the path to the artifact;
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetImpl.kt
Vendored
+2 -2
View File
@@ -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<KotlinCommonCompilerOptions> {
HasConfigurableKotlinCompilerOptions<KotlinCommonCompilerOptions> {
fun interface ArtifactsTaskLocator {
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/android/KotlinAndroidTarget.kt
+2 -3
View File
@@ -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<KotlinJvmCompilerOptions> {
HasConfigurableKotlinCompilerOptions<KotlinJvmCompilerOptions> {
final override val disambiguationClassifier: String = targetName
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/dsl/KotlinJsTargetDsl.kt
+2 -2
View File
@@ -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<KotlinJsBinaryContainer>,
HasConfigurableCompilerOptions<KotlinJsCompilerOptions> {
HasConfigurableKotlinCompilerOptions<KotlinJsCompilerOptions> {
var moduleName: String?
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmTarget.kt
+1 -1
View File
@@ -47,7 +47,7 @@ import javax.inject.Inject
abstract class KotlinJvmTarget @Inject constructor(
project: Project,
) : KotlinOnlyTarget<KotlinJvmCompilation>(project, KotlinPlatformType.jvm),
HasConfigurableCompilerOptions<KotlinJvmCompilerOptions>,
HasConfigurableKotlinCompilerOptions<KotlinJvmCompilerOptions>,
KotlinTargetWithTests<JvmClasspathTestRunSource, KotlinJvmTestRun> {
override val testRuns: NamedDomainObjectContainer<KotlinJvmTestRun> by lazy {
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinWithJavaTarget.kt
+1 -1
View File
@@ -29,7 +29,7 @@ abstract class KotlinWithJavaTarget<KotlinOptionsType : KotlinCommonOptions, CO
@Suppress("TYPEALIAS_EXPANSION_DEPRECATION") compilerOptionsFactory: () -> DeprecatedHasCompilerOptions<CO>,
kotlinOptionsFactory: (CO) -> KotlinOptionsType
) : AbstractKotlinTarget(project),
HasConfigurableCompilerOptions<KotlinJvmCompilerOptions> {
HasConfigurableKotlinCompilerOptions<KotlinJvmCompilerOptions> {
override var disambiguationClassifier: String? = null
internal set
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTarget.kt
+1 -1
View File
@@ -34,7 +34,7 @@ import javax.inject.Inject
abstract class KotlinNativeTarget @Inject constructor(
project: Project,
val konanTarget: KonanTarget,
) : HasConfigurableCompilerOptions<KotlinNativeCompilerOptions>,
) : HasConfigurableKotlinCompilerOptions<KotlinNativeCompilerOptions>,
KotlinTargetWithBinaries<KotlinNativeCompilation, KotlinNativeBinaryContainer>(
project,
KotlinPlatformType.native
libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/externalTargetApiUtils.kt
+1 -1
View File
@@ -24,7 +24,7 @@ class FakeCompilation(delegate: Delegate) : DecoratedExternalKotlinCompilation(d
}
class FakeTarget(delegate: Delegate) : DecoratedExternalKotlinTarget(delegate),
HasConfigurableCompilerOptions<KotlinJvmCompilerOptions> {
HasConfigurableKotlinCompilerOptions<KotlinJvmCompilerOptions> {
@Suppress("UNCHECKED_CAST")
override val compilations: NamedDomainObjectContainer<FakeCompilation>