From d9f572bc0b50695238c04d62abd411083ce7ef26 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Wed, 10 May 2023 15:25:38 +0200 Subject: [PATCH] [Gradle] Remove old ExternalTargetApiExtensions KT-58601 --- .../gradle/android/AndroidKotlinSourceSet.kt | 1 - .../api/kotlin-gradle-plugin.api | 6 ---- .../external/ExternalTargetApiExtensions.kt | 29 ------------------- 3 files changed, 36 deletions(-) delete mode 100644 libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalTargetApiExtensions.kt diff --git a/libraries/tools/kotlin-gradle-plugin-tcs-android/src/main/kotlin/org/jetbrains/kotlin/gradle/android/AndroidKotlinSourceSet.kt b/libraries/tools/kotlin-gradle-plugin-tcs-android/src/main/kotlin/org/jetbrains/kotlin/gradle/android/AndroidKotlinSourceSet.kt index 18ccb5ad76e..c261f165712 100644 --- a/libraries/tools/kotlin-gradle-plugin-tcs-android/src/main/kotlin/org/jetbrains/kotlin/gradle/android/AndroidKotlinSourceSet.kt +++ b/libraries/tools/kotlin-gradle-plugin-tcs-android/src/main/kotlin/org/jetbrains/kotlin/gradle/android/AndroidKotlinSourceSet.kt @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.gradle.android import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet -import org.jetbrains.kotlin.gradle.plugin.mpp.external.extras import org.jetbrains.kotlin.tooling.core.extrasKeyOf class AndroidKotlinSourceSet { 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 b0799f52e6d..1d02813529c 100644 --- a/libraries/tools/kotlin-gradle-plugin/api/kotlin-gradle-plugin.api +++ b/libraries/tools/kotlin-gradle-plugin/api/kotlin-gradle-plugin.api @@ -326,9 +326,3 @@ public final class org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotli public static final fun ExternalKotlinTargetDescriptor (Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetDescriptor; } -public final class org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalTargetApiExtensionsKt { - public static final fun getExtras (Lorg/jetbrains/kotlin/gradle/plugin/KotlinCompilation;)Lorg/jetbrains/kotlin/tooling/core/MutableExtras; - public static final fun getExtras (Lorg/jetbrains/kotlin/gradle/plugin/KotlinSourceSet;)Lorg/jetbrains/kotlin/tooling/core/MutableExtras; - public static final fun getExtras (Lorg/jetbrains/kotlin/gradle/plugin/KotlinTarget;)Lorg/jetbrains/kotlin/tooling/core/MutableExtras; -} - diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalTargetApiExtensions.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalTargetApiExtensions.kt deleted file mode 100644 index 9d00abf593d..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalTargetApiExtensions.kt +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.gradle.plugin.mpp.external - -import org.jetbrains.kotlin.gradle.ExternalKotlinTargetApi -import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation -import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet -import org.jetbrains.kotlin.gradle.plugin.KotlinTarget -import org.jetbrains.kotlin.gradle.plugin.mpp.internal -import org.jetbrains.kotlin.gradle.plugin.sources.internal -import org.jetbrains.kotlin.tooling.core.MutableExtras - -/* Scheduled for removal with Kotlin 2.0 */ -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") -@ExternalKotlinTargetApi -val KotlinSourceSet.extras: MutableExtras get() = this.internal.extras - -/* Scheduled for removal with Kotlin 2.0 */ -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") -@ExternalKotlinTargetApi -val KotlinCompilation<*>.extras: MutableExtras get() = this.internal.extras - -/* Scheduled for removal with Kotlin 2.0 */ -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") -@ExternalKotlinTargetApi -val KotlinTarget.extras: MutableExtras get() = this.internal.extras