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

Revert "[Gradle] Add deprecated accessor to sourceSets inside KotlinSourceSet"

Browse Source 
This reverts commit 5fba2962b9.
This commit is contained in:
Yahor Berdnikau
2024-01-10 17:30:28 +01:00
committed by Space Team
parent cf290a73fc
commit e8704cc556
6 changed files with 4 additions and 44 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
-1
View File
@@ -1109,7 +1109,6 @@ public abstract interface class org/jetbrains/kotlin/gradle/plugin/KotlinSourceS
public abstract fun getLanguageSettings ()Lorg/jetbrains/kotlin/gradle/plugin/LanguageSettingsBuilder;
public abstract fun getResources ()Lorg/gradle/api/file/SourceDirectorySet;
public abstract fun getRuntimeOnlyMetadataConfigurationName ()Ljava/lang/String;
public abstract fun getSourceSets ()Lorg/gradle/api/NamedDomainObjectContainer;
public abstract fun kotlin (Lkotlin/jvm/functions/Function1;)Lorg/gradle/api/file/SourceDirectorySet;
public abstract fun kotlin (Lorg/gradle/api/Action;)Lorg/gradle/api/file/SourceDirectorySet;
public abstract fun languageSettings (Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlin/gradle/plugin/LanguageSettingsBuilder;
libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinSourceSet.kt
-9
View File
@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.gradle.plugin
import org.gradle.api.Action
import org.gradle.api.Named
import org.gradle.api.NamedDomainObjectContainer
import org.gradle.api.file.SourceDirectorySet
import org.jetbrains.kotlin.gradle.dsl.KotlinGradlePluginDsl
import org.jetbrains.kotlin.tooling.core.HasMutableExtras
@@ -48,12 +47,4 @@ interface KotlinSourceSet : Named, HasProject, HasMutableExtras, HasKotlinDepend
val customSourceFilesExtensions: Iterable<String> // lazy iterable expected
fun addCustomSourceFilesExtensions(extensions: List<String>) {}
@Deprecated(
"Accessing 'sourceSets' container inside another KotlinSourceSet is deprecated. " +
"Consider accessing 'sourceSets' only on the Kotlin extension level.",
level = DeprecationLevel.WARNING,
replaceWith = ReplaceWith("project.kotlin.sourceSets")
)
val sourceSets: NamedDomainObjectContainer<KotlinSourceSet>
}
libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTarget.kt
+2 -3
View File
@@ -83,9 +83,8 @@ interface KotlinTarget : Named, HasAttributes, HasProject, HasMutableExtras {
@Deprecated(
"Accessing 'sourceSets' container on the Kotlin target level DSL is deprecated. " +
"Consider accessing 'sourceSets' on the Kotlin extension level.",
level = DeprecationLevel.WARNING,
replaceWith = ReplaceWith("project.kotlin.sourceSets")
"Consider configuring 'sourceSets' on the Kotlin extension level.",
level = DeprecationLevel.WARNING
)
val sourceSets: NamedDomainObjectContainer<KotlinSourceSet>
}