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

[Gradle] Remove ownModuleName input

Browse Source 
^KT-64504 Verification Pending
This commit is contained in:
Yahor Berdnikau
2024-02-09 17:59:44 +01:00
committed by Space Team
parent 9fb920874c
commit 4971af293c
6 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt
+10 -4
View File
@@ -300,8 +300,7 @@ internal open class GradleCompilerRunner(
if (task is AbstractKotlinCompile<*>) {
val module = IncrementalModuleEntry(
project.path,
@Suppress("DEPRECATION") // remove with KT-64504
task.ownModuleName.get(),
task.taskModuleName,
project.layout.buildDirectory.get().asFile,
task.buildHistoryFile.get().asFile,
task.abiSnapshotFile.get().asFile
@@ -336,8 +335,7 @@ internal open class GradleCompilerRunner(
val kotlinTask = mainCompilation.compileTaskProvider.get() as? AbstractKotlinCompile<*> ?: continue
val module = IncrementalModuleEntry(
project.path,
@Suppress("DEPRECATION") // remove with KT-64504
kotlinTask.ownModuleName.get(),
kotlinTask.taskModuleName,
project.layout.buildDirectory.get().asFile,
kotlinTask.buildHistoryFile.get().asFile,
kotlinTask.abiSnapshotFile.get().asFile
@@ -370,6 +368,14 @@ internal open class GradleCompilerRunner(
}
}
private val AbstractKotlinCompile<*>.taskModuleName
get() = when (this) {
is KotlinCompile -> compilerOptions.moduleName.get()
is Kotlin2JsCompile -> compilerOptions.moduleName.get()
is KotlinCompileCommon -> moduleName.get()
else -> throw IllegalStateException("Unknown AbstractKotlinCompile task instance: ${this::class.qualifiedName}")
}
private fun jarForJavaSourceSet(
project: Project,
sourceSetName: String,
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinBaseApiPlugin.kt
-2
View File
@@ -86,8 +86,6 @@ abstract class KotlinBaseApiPlugin : DefaultKotlinBasePlugin(), KotlinJvmFactory
KotlinCompileConfig(myProject, kotlinExtension)
)
registeredKotlinJvmCompileTask.configure {
@Suppress("DEPRECATION")
it.ownModuleName.set(compilerOptions.moduleName)
@Suppress("DEPRECATION")
it.moduleName.set(compilerOptions.moduleName)
}
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/AbstractKotlinCompile.kt
-4
View File
@@ -112,10 +112,6 @@ abstract class AbstractKotlinCompile<T : CommonCompilerArguments> @Inject constr
.map { it.normalize().relativeTo(buildDirFile).invariantSeparatorsPath }.toSet()
}
@Deprecated("Scheduled for removal with Kotlin 2.0", ReplaceWith("moduleName"))
@get:Input
abstract val ownModuleName: Property<String>
@get:Internal
val startParameters = BuildReportsService.getStartParameters(project)
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/AbstractKotlinCompileConfig.kt
-2
View File
@@ -118,8 +118,6 @@ internal abstract class AbstractKotlinCompileConfig<TASK : AbstractKotlinCompile
)
}
@Suppress("DEPRECATION")
task.ownModuleName.set(project.provider { compilationInfo.moduleName })
task.sourceSetName.value(providers.provider { compilationInfo.compilationName })
task.multiPlatformEnabled.value(
providers.provider {
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/KotlinCompileConfig.kt
-6
View File
@@ -104,12 +104,6 @@ internal open class BaseKotlinCompileConfig<TASK : KotlinCompile> : AbstractKotl
task.associatedJavaCompileTaskName.value(javaTask.map { it.name })
}
@Suppress("DEPRECATION")
task.ownModuleName.value(
providers.provider {
task.parentKotlinOptions.orNull?.moduleName ?: compilationInfo.moduleName
})
task.nagTaskModuleNameUsage.value(true).disallowChanges()
}
}