Skip to content

Commit

Permalink
Update shadow plugin (#2062)
Browse files Browse the repository at this point in the history
* Update shadow plugin

* remove renovate rule for asm
  • Loading branch information
laurit committed Sep 26, 2024
1 parent 92c8c18 commit 230eb11
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"groupName": "spotless packages"
},
{
"matchPackagePrefixes": ["org.ow2.asm:"],
"groupName": "asm packages"
"matchPackagePrefixes": ["com.gradleup.shadow"],
"groupName": "gradle shadow packages"
},
{
// pinned version for compatibility
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,5 @@ dependencies {
implementation("io.opentelemetry.instrumentation:gradle-plugins:2.6.0-alpha")

// keep these versions in sync with settings.gradle.kts
implementation("gradle.plugin.com.github.johnrengelman:shadow:8.0.0")
implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.2")
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar

plugins {
id("com.github.johnrengelman.shadow")
id("com.gradleup.shadow")
}

tasks.withType<ShadowJar>().configureEach {
Expand Down
13 changes: 1 addition & 12 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,7 @@ pluginManagement {
id("com.bmuschko.docker-remote-api") version "9.4.0"
id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
id("com.github.jk1.dependency-license-report") version "2.9"
}
}

// We are using the following instead of having id("com.github.johnrengelman.shadow") version "8.1.1"
// in pluginManagement to make shadow plugin use a newer version of asm so that it wouldn't fail on
// classes compiled for jdk 21 (jackson-core 2.16.1 has such classes). This can be removed when
// shadow plugin is updated.
buildscript {
dependencies {
classpath("com.github.johnrengelman:shadow:8.1.1")
classpath("org.ow2.asm:asm:9.7")
classpath("org.ow2.asm:asm-commons:9.7")
id("com.gradleup.shadow") version "8.3.2"
}
}

Expand Down

0 comments on commit 230eb11

Please sign in to comment.