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

Fix 'compilerDummyJar' configuration was not properly exposed

Browse Source 
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.
This commit is contained in:
Yahor Berdnikau
2022-05-04 15:00:55 +02:00
committed by Space
parent e25778a719
commit f016fd4766
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/embeddable.kt
+11 -4
View File
@@ -126,10 +126,13 @@ fun Project.compilerDummyForDependenciesRewriting(
const val COMPILER_DUMMY_JAR_CONFIGURATION_NAME = "compilerDummyJar" const val COMPILER_DUMMY_JAR_CONFIGURATION_NAME = "compilerDummyJar"
fun Project.compilerDummyJar(task: TaskProvider<out Jar>, body: Jar.() -> Unit = {}) { fun Project.compilerDummyJar(task: TaskProvider<out Jar>, body: Jar.() -> Unit = {}) {
task.configure(body) configurations.getOrCreate(COMPILER_DUMMY_JAR_CONFIGURATION_NAME).apply {
task.configure { isCanBeResolved = false
addArtifact(COMPILER_DUMMY_JAR_CONFIGURATION_NAME, this, this) isCanBeConsumed = true
} }
task.configure(body)
addArtifact(COMPILER_DUMMY_JAR_CONFIGURATION_NAME, task)
} }
const val EMBEDDABLE_COMPILER_TASK_NAME = "embeddable" const val EMBEDDABLE_COMPILER_TASK_NAME = "embeddable"
@@ -137,7 +140,11 @@ fun Project.embeddableCompilerDummyForDependenciesRewriting(
taskName: String = EMBEDDABLE_COMPILER_TASK_NAME, taskName: String = EMBEDDABLE_COMPILER_TASK_NAME,
body: ShadowJar.() -> Unit = {} body: ShadowJar.() -> Unit = {}
): TaskProvider<ShadowJar> { ): TaskProvider<ShadowJar> {
val compilerDummyJar = configurations.getOrCreate("compilerDummyJar") val compilerDummyJar = configurations.getOrCreate(COMPILER_DUMMY_JAR_CONFIGURATION_NAME).apply {
isCanBeResolved = true
isCanBeConsumed = false
}
dependencies.add( dependencies.add(
compilerDummyJar.name, compilerDummyJar.name,
dependencies.project(":kotlin-compiler-embeddable", configuration = COMPILER_DUMMY_JAR_CONFIGURATION_NAME) dependencies.project(":kotlin-compiler-embeddable", configuration = COMPILER_DUMMY_JAR_CONFIGURATION_NAME)