Gradle 'shadow' plugin has gone to a community org: GradleUp/shadow#908

jarohen · Jan 20, 2025 · bc44a32 · bc44a32
1 parent 7c19aaa
commit bc44a32
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 16 deletions.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     `kotlin-dsl`
-    id("com.github.johnrengelman.shadow") version "7.1.2"
+    id("com.gradleup.shadow") version "8.3.5"
 }
 
 repositories {
@@ -9,9 +9,10 @@ repositories {
 }
 
 dependencies {
-    implementation("org.clojure", "clojure", "1.12.0-rc1")
+    implementation("org.clojure", "clojure", "1.12.0")
     implementation(gradleApi())
-    implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
+    implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.5")
+    implementation("org.apache.ant:ant:1.10.13") // eugh. _all_ of Ant for the DataReaderTransformer?
 }
 
 java.toolchain.languageVersion.set(JavaLanguageVersion.of(21))

diff --git a/buildSrc/src/main/kotlin/xtdb/DataReaderTransformer.kt b/buildSrc/src/main/kotlin/xtdb/DataReaderTransformer.kt
@@ -5,8 +5,8 @@ import clojure.lang.PersistentHashMap
 import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
 import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext
 import org.gradle.api.file.FileTreeElement
-import shadow.org.apache.tools.zip.ZipEntry
-import shadow.org.apache.tools.zip.ZipOutputStream
+import org.apache.tools.zip.ZipEntry
+import org.apache.tools.zip.ZipOutputStream
 import java.io.InputStream
 
 class DataReaderTransformer : Transformer {

diff --git a/cloud-benchmark/aws/build.gradle.kts b/cloud-benchmark/aws/build.gradle.kts
@@ -3,7 +3,7 @@ import xtdb.DataReaderTransformer
 plugins {
     java
     application
-    id("com.github.johnrengelman.shadow")
+    id("com.gradleup.shadow")
 }
 
 dependencies {

diff --git a/cloud-benchmark/azure/build.gradle.kts b/cloud-benchmark/azure/build.gradle.kts
@@ -3,7 +3,7 @@ import xtdb.DataReaderTransformer
 plugins {
     java
     application
-    id("com.github.johnrengelman.shadow")
+    id("com.gradleup.shadow")
 }
 
 dependencies {

diff --git a/cloud-benchmark/google-cloud/build.gradle.kts b/cloud-benchmark/google-cloud/build.gradle.kts
@@ -3,7 +3,7 @@ import xtdb.DataReaderTransformer
 plugins {
     java
     application
-    id("com.github.johnrengelman.shadow")
+    id("com.gradleup.shadow")
 }
 
 dependencies {

diff --git a/cloud-benchmark/local/build.gradle.kts b/cloud-benchmark/local/build.gradle.kts
@@ -3,7 +3,7 @@ import xtdb.DataReaderTransformer
 plugins {
     java
     application
-    id("com.github.johnrengelman.shadow")
+    id("com.gradleup.shadow")
 }
 
 dependencies {

diff --git a/docker/aws/build.gradle.kts b/docker/aws/build.gradle.kts
@@ -3,7 +3,7 @@ import xtdb.DataReaderTransformer
 plugins {
     java
     application
-    id("com.github.johnrengelman.shadow")
+    id("com.gradleup.shadow")
 }
 
 dependencies {

diff --git a/docker/azure/build.gradle.kts b/docker/azure/build.gradle.kts
@@ -3,7 +3,7 @@ import xtdb.DataReaderTransformer
 plugins {
     java
     application
-    id("com.github.johnrengelman.shadow")
+    id("com.gradleup.shadow")
 }
 
 dependencies {

diff --git a/docker/google-cloud/build.gradle.kts b/docker/google-cloud/build.gradle.kts
@@ -3,7 +3,7 @@ import xtdb.DataReaderTransformer
 plugins {
     java
     application
-    id("com.github.johnrengelman.shadow")
+    id("com.gradleup.shadow")
 }
 
 dependencies {

diff --git a/docker/standalone/build.gradle.kts b/docker/standalone/build.gradle.kts
@@ -3,7 +3,7 @@ import xtdb.DataReaderTransformer
 plugins {
     java
     application
-    id("com.github.johnrengelman.shadow")
+    id("com.gradleup.shadow")
 }
 
 dependencies {

diff --git a/modules/bench/build.gradle.kts b/modules/bench/build.gradle.kts
@@ -3,7 +3,7 @@ import xtdb.DataReaderTransformer
 plugins {
     `java-library`
     id("dev.clojurephant.clojure")
-    id("com.github.johnrengelman.shadow")
+    id("com.gradleup.shadow")
 }
 
 java.toolchain.languageVersion.set(JavaLanguageVersion.of(21))

diff --git a/modules/kafka-connect/build.gradle.kts b/modules/kafka-connect/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("dev.clojurephant.clojure")
     kotlin("jvm")
     signing
-    id("com.github.johnrengelman.shadow")
+    id("com.gradleup.shadow")
 }
 
 ext {

diff --git a/monitoring/docker-image/build.gradle.kts b/monitoring/docker-image/build.gradle.kts
@@ -3,7 +3,7 @@ import xtdb.DataReaderTransformer
 plugins {
     java
     application
-    id("com.github.johnrengelman.shadow")
+    id("com.gradleup.shadow")
 }
 
 dependencies {