diff --git a/gradle-plugins/build.gradle.kts b/gradle-plugins/build.gradle.kts index a91abb674a..7311919b14 100644 --- a/gradle-plugins/build.gradle.kts +++ b/gradle-plugins/build.gradle.kts @@ -5,7 +5,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile plugins { alias(libs.plugins.kotlin.jvm) apply false alias(libs.plugins.publish.plugin) apply false - alias(libs.plugins.shadow.jar) apply false + alias(libs.plugins.shadow) apply false alias(libs.plugins.download) apply false } diff --git a/gradle-plugins/compose/build.gradle.kts b/gradle-plugins/compose/build.gradle.kts index 7dbf284ac1..68497acd11 100644 --- a/gradle-plugins/compose/build.gradle.kts +++ b/gradle-plugins/compose/build.gradle.kts @@ -7,7 +7,7 @@ plugins { alias(libs.plugins.publish.plugin) id("java-gradle-plugin") id("maven-publish") - alias(libs.plugins.shadow.jar) + alias(libs.plugins.shadow) alias(libs.plugins.download) } @@ -88,7 +88,7 @@ dependencies { val packagesToRelocate = listOf("de.undercouch", "com.squareup.kotlinpoet") -val shadow = tasks.named("shadowJar") { +val shadowJar = tasks.named("shadowJar") { for (packageToRelocate in packagesToRelocate) { relocate(packageToRelocate, "org.jetbrains.compose.internal.$packageToRelocate") } @@ -96,13 +96,15 @@ val shadow = tasks.named("shadowJar") { archiveClassifier.set("") archiveVersion.set("") configurations = listOf(embeddedDependencies) + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + failOnDuplicateEntries = true exclude("META-INF/gradle-plugins/de.undercouch.download.properties") exclude("META-INF/versions/**") } val jar = tasks.named("jar") { - dependsOn(shadow) - from(zipTree(shadow.get().archiveFile)) + dependsOn(shadowJar) + from(zipTree(shadowJar.get().archiveFile)) this.duplicatesStrategy = DuplicatesStrategy.INCLUDE } diff --git a/gradle-plugins/gradle/libs.versions.toml b/gradle-plugins/gradle/libs.versions.toml index fd4f212e7e..d0cf9e10a3 100644 --- a/gradle-plugins/gradle/libs.versions.toml +++ b/gradle-plugins/gradle/libs.versions.toml @@ -3,7 +3,7 @@ kotlin = "2.2.0" gradle-download-plugin = "5.5.0" kotlin-poet = "2.1.0" plugin-android = "8.10.1" -shadow-jar = "8.1.1" +shadow = "9.2.2" publish-plugin = "1.2.1" # we use "prefer" here for the strategy: "explicitly specified hot reload plugin always wins". plugin-hot-reload = { prefer = "1.1.0" } @@ -18,5 +18,5 @@ plugin-hot-reload = { module = "org.jetbrains.compose.hot-reload:hot-reload-grad [plugins] kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } download = { id = "de.undercouch.download", version.ref = "gradle-download-plugin" } -shadow-jar = { id = "com.github.johnrengelman.shadow", version.ref = "shadow-jar" } +shadow = { id = "com.gradleup.shadow", version.ref = "shadow" } publish-plugin = { id = "com.gradle.plugin-publish", version.ref = "publish-plugin" }