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 1d02813529c..44b8850e80f 100644 --- a/libraries/tools/kotlin-gradle-plugin/api/kotlin-gradle-plugin.api +++ b/libraries/tools/kotlin-gradle-plugin/api/kotlin-gradle-plugin.api @@ -182,7 +182,7 @@ public final class org/jetbrains/kotlin/gradle/plugin/mpp/external/CreateExterna public static final fun createExternalKotlinTarget (Lorg/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformExtension;Lorg/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetDescriptor;)Lorg/jetbrains/kotlin/gradle/plugin/mpp/external/DecoratedExternalKotlinTarget; } -public abstract class org/jetbrains/kotlin/gradle/plugin/mpp/external/DecoratedExternalKotlinCompilation : org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalDecoratedKotlinCompilation { +public abstract class org/jetbrains/kotlin/gradle/plugin/mpp/external/DecoratedExternalKotlinCompilation : org/jetbrains/kotlin/gradle/plugin/mpp/DecoratedKotlinCompilation { public fun (Lorg/jetbrains/kotlin/gradle/plugin/mpp/external/DecoratedExternalKotlinCompilation$Delegate;)V } @@ -222,10 +222,6 @@ public class org/jetbrains/kotlin/gradle/plugin/mpp/external/DecoratedExternalKo public fun withSourcesJar (Z)V } -public abstract class org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalDecoratedKotlinCompilation : org/jetbrains/kotlin/gradle/plugin/mpp/DecoratedKotlinCompilation { - public fun (Lorg/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalDecoratedKotlinCompilation$Delegate;)V -} - public abstract interface class org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinCompilationDescriptor { public abstract fun getCompilationAssociator ()Lorg/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinCompilationDescriptor$CompilationAssociator; public abstract fun getCompilationFactory ()Lorg/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinCompilationDescriptor$CompilationFactory; @@ -233,7 +229,6 @@ public abstract interface class org/jetbrains/kotlin/gradle/plugin/mpp/external/ public abstract fun getCompileAllTaskName ()Ljava/lang/String; public abstract fun getCompileTaskName ()Ljava/lang/String; public abstract fun getConfigure ()Lkotlin/jvm/functions/Function1; - public abstract fun getDecoratedKotlinCompilationFactory ()Lorg/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinCompilationDescriptor$DecoratedKotlinCompilationFactory; public abstract fun getDefaultSourceSet ()Lorg/jetbrains/kotlin/gradle/plugin/KotlinSourceSet; public abstract fun getFriendArtifactResolver ()Lorg/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinCompilationDescriptor$FriendArtifactResolver; } @@ -246,9 +241,6 @@ public abstract interface class org/jetbrains/kotlin/gradle/plugin/mpp/external/ public abstract fun create (Lorg/jetbrains/kotlin/gradle/plugin/mpp/external/DecoratedExternalKotlinCompilation$Delegate;)Lorg/jetbrains/kotlin/gradle/plugin/mpp/DecoratedKotlinCompilation; } -public abstract interface class org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinCompilationDescriptor$DecoratedKotlinCompilationFactory : org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinCompilationDescriptor$CompilationFactory { -} - public abstract interface class org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinCompilationDescriptor$FriendArtifactResolver { public abstract fun resolveFriendPaths (Lorg/jetbrains/kotlin/gradle/plugin/mpp/external/DecoratedExternalKotlinCompilation;)Lorg/gradle/api/file/FileCollection; } @@ -261,7 +253,6 @@ public final class org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotli public final fun getCompileAllTaskName ()Ljava/lang/String; public final fun getCompileTaskName ()Ljava/lang/String; public final fun getConfigure ()Lkotlin/jvm/functions/Function1; - public final fun getDecoratedKotlinCompilationFactory ()Lorg/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinCompilationDescriptor$DecoratedKotlinCompilationFactory; public final fun getDefaultSourceSet ()Lorg/jetbrains/kotlin/gradle/plugin/KotlinSourceSet; public final fun getFriendArtifactResolver ()Lorg/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinCompilationDescriptor$FriendArtifactResolver; public final fun setCompilationAssociator (Lorg/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinCompilationDescriptor$CompilationAssociator;)V @@ -270,7 +261,6 @@ public final class org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotli public final fun setCompileAllTaskName (Ljava/lang/String;)V public final fun setCompileTaskName (Ljava/lang/String;)V public final fun setConfigure (Lkotlin/jvm/functions/Function1;)V - public final fun setDecoratedKotlinCompilationFactory (Lorg/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinCompilationDescriptor$DecoratedKotlinCompilationFactory;)V public final fun setDefaultSourceSet (Lorg/jetbrains/kotlin/gradle/plugin/KotlinSourceSet;)V public final fun setFriendArtifactResolver (Lorg/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinCompilationDescriptor$FriendArtifactResolver;)V } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/DecoratedExternalKotlinCompilation.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/DecoratedExternalKotlinCompilation.kt index 7d6c2fb3022..52513f46ce6 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/DecoratedExternalKotlinCompilation.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/DecoratedExternalKotlinCompilation.kt @@ -20,22 +20,8 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.KotlinCompilationI * Creating an instance will require an instance of [Delegate] which can only be retrieved by calling into the * [DecoratedExternalKotlinTarget.createCompilation] functions and providing a [ExternalKotlinCompilationDescriptor.compilationFactory] */ -@Suppress("deprecation_error") @ExternalKotlinTargetApi -abstract class DecoratedExternalKotlinCompilation(delegate: Delegate) : ExternalDecoratedKotlinCompilation(delegate) { - class Delegate internal constructor(compilation: KotlinCompilationImpl) : ExternalDecoratedKotlinCompilation.Delegate(compilation) -} - -/** - * Renamed DecoratedExternalKotlinCompilation: - * Scheduled for removal with Kotlin 2.0 - */ -@Deprecated( - "Renamed to 'DecoratedExternalKotlinCompilation'", level = DeprecationLevel.ERROR, - replaceWith = ReplaceWith("DecoratedExternalKotlinCompilation") -) -@ExternalKotlinTargetApi -abstract class ExternalDecoratedKotlinCompilation(delegate: Delegate) : +abstract class DecoratedExternalKotlinCompilation(delegate: Delegate) : DecoratedKotlinCompilation(delegate.compilation) { open class Delegate internal constructor(internal open val compilation: KotlinCompilationImpl) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinCompilationDescriptor.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinCompilationDescriptor.kt index c815d347803..781732601cf 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinCompilationDescriptor.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinCompilationDescriptor.kt @@ -21,16 +21,6 @@ import kotlin.properties.Delegates @ExternalKotlinTargetApi interface ExternalKotlinCompilationDescriptor { - /** - * Scheduled for removal in Kotlin 2.0 - */ - @Deprecated( - "Renamed to 'CompilationFactory'", level = DeprecationLevel.ERROR, - replaceWith = ReplaceWith("CompilationFactory") - ) - @ExternalKotlinTargetApi - fun interface DecoratedKotlinCompilationFactory> : CompilationFactory - /** * Factory creating the decorated instance ([DecoratedExternalKotlinCompilation] using the backing implementation inside * the [DecoratedExternalKotlinCompilation.Delegate] @@ -61,13 +51,6 @@ interface ExternalKotlinCompilationDescriptor val compilationFactory: CompilationFactory val friendArtifactResolver: FriendArtifactResolver? val compilationAssociator: CompilationAssociator? @@ -76,7 +59,7 @@ interface ExternalKotlinCompilationDescriptor ExternalKotlinCompilationDescriptor( - configure: ExternalKotlinCompilationDescriptorBuilder.() -> Unit + configure: ExternalKotlinCompilationDescriptorBuilder.() -> Unit, ): ExternalKotlinCompilationDescriptor { return ExternalKotlinCompilationDescriptorBuilder().also(configure).run { ExternalKotlinCompilationDescriptorImpl( @@ -84,7 +67,7 @@ fun ExternalKotlinCompilationDescriptor compileTaskName = compileTaskName, compileAllTaskName = compileAllTaskName, defaultSourceSet = defaultSourceSet, - compilationFactory = compilationFactory ?: decoratedKotlinCompilationFactory, + compilationFactory = compilationFactory, friendArtifactResolver = friendArtifactResolver, compilationAssociator = compilationAssociator, configure = this.configure @@ -98,11 +81,7 @@ class ExternalKotlinCompilationDescriptorBuilder by Delegates.notNull() - var compilationFactory: CompilationFactory? = null - + var compilationFactory: CompilationFactory by Delegates.notNull() var friendArtifactResolver: FriendArtifactResolver? = null var compilationAssociator: CompilationAssociator? = null var configure: ((T) -> Unit)? = null @@ -122,9 +101,5 @@ private data class ExternalKotlinCompilationDescriptorImpl, override val friendArtifactResolver: FriendArtifactResolver?, override val compilationAssociator: CompilationAssociator?, - override val configure: ((T) -> Unit)? -) : ExternalKotlinCompilationDescriptor { - @Suppress("deprecation_error", "OVERRIDE_DEPRECATION") - override val decoratedKotlinCompilationFactory: DecoratedKotlinCompilationFactory - get() = DecoratedKotlinCompilationFactory { compilationFactory.create(it) } -} \ No newline at end of file + override val configure: ((T) -> Unit)?, +) : ExternalKotlinCompilationDescriptor \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetComponent.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetComponent.kt index 2e13967e335..8aa321ec113 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetComponent.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetComponent.kt @@ -61,5 +61,3 @@ internal class ExternalKotlinTargetComponent( override fun getCoordinates(): ModuleVersionIdentifier = getCoordinatesFromPublicationDelegateAndProject(publicationDelegate, target.project, null) } - -