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

[Gradle] Fix warnings in ConfigureBuildSideEffect

Browse Source 
^KT-56904 In Progress
This commit is contained in:
Yahor Berdnikau
2024-02-08 21:58:53 +01:00
committed by Space Team
parent 36233bd17d
commit e72704ce86
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt
+3
View File
@@ -186,6 +186,9 @@ interface KotlinCompilationToRunnableFiles<T : KotlinCommonOptionsDeprecated> :
override var runtimeDependencyFiles: FileCollection override var runtimeDependencyFiles: FileCollection
} }
@Suppress("Deprecation")
typealias DeprecatedKotlinCompilationToRunnableFiles<T> = KotlinCompilationToRunnableFiles<T>
@Deprecated("Scheduled for removal with Kotlin 2.0") @Deprecated("Scheduled for removal with Kotlin 2.0")
@Suppress("EXTENSION_SHADOWED_BY_MEMBER", "deprecation") // kept for compatibility @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "deprecation") // kept for compatibility
val <T : KotlinCommonOptionsDeprecated> KotlinCompilation<T>.runtimeDependencyConfigurationName: String? val <T : KotlinCommonOptionsDeprecated> KotlinCompilation<T>.runtimeDependencyConfigurationName: String?
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/ConfigureBuildSideEffect.kt
+3 -4
View File
@@ -8,9 +8,9 @@ package org.jetbrains.kotlin.gradle.targets
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.api.plugins.JavaBasePlugin import org.gradle.api.plugins.JavaBasePlugin
import org.gradle.api.tasks.TaskProvider import org.gradle.api.tasks.TaskProvider
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation import org.jetbrains.kotlin.gradle.plugin.*
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilationToRunnableFiles
@Suppress("TYPEALIAS_EXPANSION_DEPRECATION")
internal val ConfigureBuildSideEffect = KotlinTargetSideEffect { target -> internal val ConfigureBuildSideEffect = KotlinTargetSideEffect { target ->
val project = target.project val project = target.project
@@ -18,8 +18,7 @@ internal val ConfigureBuildSideEffect = KotlinTargetSideEffect { target ->
val buildDependent = project.tasks.named(JavaBasePlugin.BUILD_DEPENDENTS_TASK_NAME) val buildDependent = project.tasks.named(JavaBasePlugin.BUILD_DEPENDENTS_TASK_NAME)
val testCompilation = target.compilations.findByName(KotlinCompilation.TEST_COMPILATION_NAME) val testCompilation = target.compilations.findByName(KotlinCompilation.TEST_COMPILATION_NAME)
@Suppress("DEPRECATION") if (testCompilation is DeprecatedKotlinCompilationToRunnableFiles) {
if (testCompilation is KotlinCompilationToRunnableFiles) {
addDependsOnTaskInOtherProjects(project, buildNeeded, true, testCompilation.runtimeDependencyConfigurationName) addDependsOnTaskInOtherProjects(project, buildNeeded, true, testCompilation.runtimeDependencyConfigurationName)
addDependsOnTaskInOtherProjects(project, buildDependent, false, testCompilation.runtimeDependencyConfigurationName) addDependsOnTaskInOtherProjects(project, buildDependent, false, testCompilation.runtimeDependencyConfigurationName)
} }