Skip to content

Commit 73e120d

Browse files
committed
Rename shadow to shadowJar, because the shadow extension
1 parent d4d533b commit 73e120d

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

gradle-plugins/compose/build.gradle.kts

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ sourceSets.main.configure {
3939
java.srcDir(buildConfig.flatMap { it.generatedOutputDir })
4040
}
4141

42-
val embeddedDependencies by configurations.creating {
42+
val embeddedDependencies: Configuration by configurations.creating {
4343
isTransitive = false
4444
}
4545

@@ -75,22 +75,22 @@ dependencies {
7575

7676
val packagesToRelocate = listOf("de.undercouch", "com.squareup.kotlinpoet")
7777

78-
val shadow = tasks.named<ShadowJar>("shadowJar") {
78+
val shadowJar = tasks.named<ShadowJar>("shadowJar") {
7979
for (packageToRelocate in packagesToRelocate) {
8080
relocate(packageToRelocate, "org.jetbrains.compose.internal.$packageToRelocate")
8181
}
82-
archiveBaseName.set("shadow")
83-
archiveClassifier.set("")
84-
archiveVersion.set("")
82+
archiveBaseName = "shadow"
83+
archiveClassifier = ""
84+
archiveVersion = ""
8585
configurations = listOf(embeddedDependencies)
8686
exclude("META-INF/gradle-plugins/de.undercouch.download.properties")
8787
exclude("META-INF/versions/**")
8888
}
8989

9090
val jar = tasks.named<Jar>("jar") {
91-
dependsOn(shadow)
92-
from(zipTree(shadow.get().archiveFile))
93-
this.duplicatesStrategy = DuplicatesStrategy.INCLUDE
91+
dependsOn(shadowJar)
92+
from(zipTree(shadowJar.get().archiveFile))
93+
duplicatesStrategy = DuplicatesStrategy.INCLUDE
9494
}
9595

9696
val supportedGradleVersions = project.propertyList("compose.tests.gradle.versions")
@@ -150,7 +150,6 @@ for (jdkVersion in jdkVersionsForTests) {
150150
}
151151
val unpackJdkTask = tasks.register("unpackJdk$jdkVersion", Copy::class) {
152152
dependsOn(downloadJdkTask)
153-
val archive = archive
154153
val archiveTree = when {
155154
archive.name.endsWith(".tar.gz") -> tarTree(archive)
156155
archive.name.endsWith(".zip") -> zipTree(archive)

0 commit comments

Comments
 (0)