From aba495f63caae7035507f0c76d0cac30ea922e33 Mon Sep 17 00:00:00 2001 From: Alexander Likhachev Date: Tue, 15 Feb 2022 13:18:41 +0300 Subject: [PATCH] [Gradle] Remove deprecated experimental annotation methods & properties #KT-47763 Fixed --- .../gradle/plugin/LanguageSettingsBuilder.kt | 6 ----- .../plugin/mpp/GradleProjectModuleBuilder.kt | 2 +- .../mpp/pm20/DependencyGraphResolver.kt | 1 - .../plugin/mpp/pm20/DependencyResolution.kt | 3 +-- .../plugin/mpp/pm20/KotlinGradleFragment.kt | 2 +- .../plugin/sources/DefaultKotlinSourceSet.kt | 2 +- .../sources/DefaultLanguageSettingsBuilder.kt | 25 +------------------ .../targets/native/tasks/KotlinNativeTasks.kt | 4 --- .../src/main/kotlin/LanguageSettings.kt | 2 -- 9 files changed, 5 insertions(+), 42 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/LanguageSettingsBuilder.kt b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/LanguageSettingsBuilder.kt index 498d2522f81..95db10f824d 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/LanguageSettingsBuilder.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/LanguageSettingsBuilder.kt @@ -18,11 +18,5 @@ interface LanguageSettingsBuilder : LanguageSettings { override val enabledLanguageFeatures: Set - @Deprecated("Unsupported and will be removed in next major releases", replaceWith = ReplaceWith("optIn(name)")) - fun useExperimentalAnnotation(name: String) - fun optIn(annotationName: String) - - @Deprecated("Unsupported and will be removed in next major releases", replaceWith = ReplaceWith("optInAnnotationsInUse")) - override val experimentalAnnotationsInUse: Set } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/GradleProjectModuleBuilder.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/GradleProjectModuleBuilder.kt index 0198429c799..02ec19e1306 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/GradleProjectModuleBuilder.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/GradleProjectModuleBuilder.kt @@ -165,7 +165,7 @@ class GradleProjectModuleBuilder(private val addInferredSourceSetVisibilityAsExp ?: listOf(compilation.defaultSourceSetName) variantNames.forEach { variantName -> - val variant = BasicKotlinModuleVariant(this@apply, variantName, DefaultLanguageSettingsBuilder(project)) + val variant = BasicKotlinModuleVariant(this@apply, variantName, DefaultLanguageSettingsBuilder()) moduleByFragment[variant] = this@apply variantToCompilation[variant] = compilation fragments.add(variant) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/DependencyGraphResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/DependencyGraphResolver.kt index 31acf413e75..12c9272ce19 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/DependencyGraphResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/DependencyGraphResolver.kt @@ -50,7 +50,6 @@ class GradleKotlinDependencyGraphResolver( ?: buildSyntheticPlainModule( component, component.variants.singleOrNull()?.displayName ?: "default", - requestingModule.project ) fun nodeFromModule(componentResult: ResolvedComponentResult, kotlinModule: KotlinModule): GradleDependencyGraphNode { diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/DependencyResolution.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/DependencyResolution.kt index 376ea8ab357..dda11157a96 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/DependencyResolution.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/DependencyResolution.kt @@ -116,11 +116,10 @@ class GradleModuleDependencyResolver( internal fun buildSyntheticPlainModule( resolvedComponentResult: ResolvedComponentResult, singleVariantName: String, - project: Project ): ExternalPlainKotlinModule { val moduleDependency = resolvedComponentResult.toModuleDependency() return ExternalPlainKotlinModule(BasicKotlinModule(moduleDependency.moduleIdentifier).apply { - BasicKotlinModuleVariant(this@apply, singleVariantName, DefaultLanguageSettingsBuilder(project)).apply { + BasicKotlinModuleVariant(this@apply, singleVariantName, DefaultLanguageSettingsBuilder()).apply { fragments.add(this) this.declaredModuleDependencies.addAll( resolvedComponentResult.dependencies diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinGradleFragment.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinGradleFragment.kt index f147cdc03ef..815e9511c56 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinGradleFragment.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinGradleFragment.kt @@ -41,7 +41,7 @@ open class KotlinGradleFragmentInternal @Inject constructor( // TODO pull up to KotlinModuleFragment // FIXME apply to compilation // FIXME check for consistency - override val languageSettings: LanguageSettingsBuilder = DefaultLanguageSettingsBuilder(project) + override val languageSettings: LanguageSettingsBuilder = DefaultLanguageSettingsBuilder() override fun refines(other: KotlinGradleFragment) { checkCanRefine(other) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultKotlinSourceSet.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultKotlinSourceSet.kt index 8e6b499d61c..9a44ca5fd44 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultKotlinSourceSet.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultKotlinSourceSet.kt @@ -64,7 +64,7 @@ class DefaultKotlinSourceSet( filter.include("**/*.kts") } - override val languageSettings: LanguageSettingsBuilder = DefaultLanguageSettingsBuilder(project) + override val languageSettings: LanguageSettingsBuilder = DefaultLanguageSettingsBuilder() override val resources: SourceDirectorySet = createDefaultSourceDirectorySet(project, "$name resources") diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultLanguageSettingsBuilder.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultLanguageSettingsBuilder.kt index 70870f61d5c..07734f958cd 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultLanguageSettingsBuilder.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultLanguageSettingsBuilder.kt @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.gradle.plugin.sources import org.gradle.api.InvalidUserDataException -import org.gradle.api.Project import org.gradle.api.file.FileCollection import org.gradle.api.provider.Provider import org.gradle.api.tasks.SourceTask @@ -18,12 +17,11 @@ import org.jetbrains.kotlin.gradle.plugin.LanguageSettingsBuilder import org.jetbrains.kotlin.gradle.plugin.statistics.KotlinBuildStatsService import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinNativeCompile -import org.jetbrains.kotlin.gradle.utils.SingleWarningPerBuild import org.jetbrains.kotlin.project.model.LanguageSettings import org.jetbrains.kotlin.statistics.metrics.BooleanMetrics import org.jetbrains.kotlin.statistics.metrics.StringMetrics -internal class DefaultLanguageSettingsBuilder(@Transient private val project: Project) : LanguageSettingsBuilder { +internal class DefaultLanguageSettingsBuilder : LanguageSettingsBuilder { private var languageVersionImpl: LanguageVersion? = null override var languageVersion: String? @@ -66,31 +64,10 @@ internal class DefaultLanguageSettingsBuilder(@Transient private val project: Pr override val optInAnnotationsInUse: Set = optInAnnotationsInUseImpl - override val experimentalAnnotationsInUse: Set - get() { - SingleWarningPerBuild.deprecation( - project, - "Kotlin language settings property", - "experimentalAnnotationsInUse", - "optInAnnotationsInUse" - ) - return optInAnnotationsInUse - } - override fun optIn(annotationName: String) { optInAnnotationsInUseImpl += annotationName } - override fun useExperimentalAnnotation(name: String) { - SingleWarningPerBuild.deprecation( - project, - "Kotlin language settings function", - "useExperimentalAnnotation", - "optIn" - ) - optIn(name) - } - /* A Kotlin task that is responsible for code analysis of the owner of this language settings builder. */ @Transient // not needed during Gradle Instant Execution var compilerPluginOptionsTask: Lazy = lazyOf(null) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt index 90695884cc3..1c0380f9ba7 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt @@ -371,10 +371,6 @@ constructor( val enabledLanguageFeatures: Set @Input get() = languageSettings.enabledLanguageFeatures - @Deprecated("Unsupported and will be removed in next major releases", replaceWith = ReplaceWith("optInAnnotationsInUse")) - val experimentalAnnotationsInUse: Set - @Internal get() = languageSettings.experimentalAnnotationsInUse - val optInAnnotationsInUse: Set @Input get() = languageSettings.optInAnnotationsInUse // endregion. diff --git a/libraries/tools/kotlin-project-model/src/main/kotlin/LanguageSettings.kt b/libraries/tools/kotlin-project-model/src/main/kotlin/LanguageSettings.kt index 75149c30b45..20a948bf4a6 100644 --- a/libraries/tools/kotlin-project-model/src/main/kotlin/LanguageSettings.kt +++ b/libraries/tools/kotlin-project-model/src/main/kotlin/LanguageSettings.kt @@ -11,7 +11,5 @@ interface LanguageSettings { val progressiveMode: Boolean val enabledLanguageFeatures: Set - @Deprecated("Unsupported and will be removed in next major releases", replaceWith = ReplaceWith("optInAnnotationsInUse")) - val experimentalAnnotationsInUse: Set val optInAnnotationsInUse: Set }