Skip to content

Commit 31fe30f

Browse files
committed
Rename shadow to shadowJar, because the shadow extension
1 parent ab8952b commit 31fe30f

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

@@ -74,22 +74,22 @@ dependencies {
7474

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

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

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

9595
val supportedGradleVersions = project.propertyList("compose.tests.gradle.versions")
@@ -148,7 +148,6 @@ for (jdkVersion in jdkVersionsForTests) {
148148
}
149149
val unpackJdkTask = tasks.register("unpackJdk$jdkVersion", Copy::class) {
150150
dependsOn(downloadJdkTask)
151-
val archive = archive
152151
val archiveTree = when {
153152
archive.name.endsWith(".tar.gz") -> tarTree(archive)
154153
archive.name.endsWith(".zip") -> zipTree(archive)

0 commit comments

Comments
 (0)