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

[Gradle] Configure process resources task names from Java source sets

Browse Source 
#KT-56645 Fixed
This commit is contained in:
Alexander.Likhachev
2023-02-27 16:39:43 +01:00
committed by Space Team
parent 11049c1ab6
commit 1af19e6903
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinWithJavaCompilationFactory.kt
+1
View File
@@ -38,6 +38,7 @@ class KotlinWithJavaCompilationFactory<KotlinOptionsType : KotlinCommonOptions,
} }
val compilationImplFactory = KotlinCompilationImplFactory( val compilationImplFactory = KotlinCompilationImplFactory(
processResourcesTaskNameFactory = { _, _ -> javaSourceSet.processResourcesTaskName },
compilerOptionsFactory = { _, _ -> compilerOptionsFactory = { _, _ ->
val compilerOptions = compilerOptionsFactory() val compilerOptions = compilerOptionsFactory()
val kotlinOptions = kotlinOptionsFactory(compilerOptions.options) val kotlinOptions = kotlinOptionsFactory(compilerOptions.options)
libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/ResourcesTasksTest.kt
-2
View File
@@ -11,13 +11,11 @@ import org.jetbrains.kotlin.gradle.dsl.kotlinExtension
import org.jetbrains.kotlin.gradle.plugin.mpp.InternalKotlinCompilation import org.jetbrains.kotlin.gradle.plugin.mpp.InternalKotlinCompilation
import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.targets import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.targets
import org.jetbrains.kotlin.gradle.util.buildProjectWithJvm import org.jetbrains.kotlin.gradle.util.buildProjectWithJvm
import kotlin.test.Ignore
import kotlin.test.Test import kotlin.test.Test
import kotlin.test.assertEquals import kotlin.test.assertEquals
class ResourcesTasksTest { class ResourcesTasksTest {
@Test @Test
@Ignore
fun `test - default resources task names are consistent`() { fun `test - default resources task names are consistent`() {
val project = buildProjectWithJvm() val project = buildProjectWithJvm()
val jvmTarget = project.kotlinExtension.targets.single() val jvmTarget = project.kotlinExtension.targets.single()