Skip to content

Migrate Shadow plugin to v9 #5593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Goooler wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −7
Open

Migrate Shadow plugin to v9 #5593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle-plugins/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
10 changes: 6 additions & 4 deletions gradle-plugins/compose/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down Expand Up @@ -88,21 +88,23 @@ dependencies {

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

val shadow = tasks.named<ShadowJar>("shadowJar") {
val shadowJar = tasks.named<ShadowJar>("shadowJar") {
for (packageToRelocate in packagesToRelocate) {
relocate(packageToRelocate, "org.jetbrains.compose.internal.$packageToRelocate")
}
archiveBaseName.set("shadow")
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>("jar") {
dependsOn(shadow)
from(zipTree(shadow.get().archiveFile))
dependsOn(shadowJar)
from(zipTree(shadowJar.get().archiveFile))
this.duplicatesStrategy = DuplicatesStrategy.INCLUDE
}

Expand Down
4 changes: 2 additions & 2 deletions gradle-plugins/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand All @@ -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" }