From f016fd47669c81987ccd0e93395be64b7c5be09c Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Wed, 4 May 2022 15:00:55 +0200 Subject: [PATCH] Fix 'compilerDummyJar' configuration was not properly exposed This fixes error: Project :kotlin-daemon-embeddable declares a dependency from configuration 'compilerDummyJar' to configuration 'compilerDummyJar' which is not declared in the descriptor for project :kotlin-compiler-embeddable. --- buildSrc/src/main/kotlin/embeddable.kt | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/kotlin/embeddable.kt b/buildSrc/src/main/kotlin/embeddable.kt index 941e7c5ff3f..3ccd4a8ad79 100644 --- a/buildSrc/src/main/kotlin/embeddable.kt +++ b/buildSrc/src/main/kotlin/embeddable.kt @@ -126,10 +126,13 @@ fun Project.compilerDummyForDependenciesRewriting( const val COMPILER_DUMMY_JAR_CONFIGURATION_NAME = "compilerDummyJar" fun Project.compilerDummyJar(task: TaskProvider, body: Jar.() -> Unit = {}) { - task.configure(body) - task.configure { - addArtifact(COMPILER_DUMMY_JAR_CONFIGURATION_NAME, this, this) + configurations.getOrCreate(COMPILER_DUMMY_JAR_CONFIGURATION_NAME).apply { + isCanBeResolved = false + isCanBeConsumed = true } + + task.configure(body) + addArtifact(COMPILER_DUMMY_JAR_CONFIGURATION_NAME, task) } const val EMBEDDABLE_COMPILER_TASK_NAME = "embeddable" @@ -137,7 +140,11 @@ fun Project.embeddableCompilerDummyForDependenciesRewriting( taskName: String = EMBEDDABLE_COMPILER_TASK_NAME, body: ShadowJar.() -> Unit = {} ): TaskProvider { - val compilerDummyJar = configurations.getOrCreate("compilerDummyJar") + val compilerDummyJar = configurations.getOrCreate(COMPILER_DUMMY_JAR_CONFIGURATION_NAME).apply { + isCanBeResolved = true + isCanBeConsumed = false + } + dependencies.add( compilerDummyJar.name, dependencies.project(":kotlin-compiler-embeddable", configuration = COMPILER_DUMMY_JAR_CONFIGURATION_NAME)