From bc44a32250ac6f5e0da752418487f9688fcd3de6 Mon Sep 17 00:00:00 2001
From: James Henderson <james@jarohen.dev>
Date: Mon, 20 Jan 2025 20:20:32 +0000
Subject: [PATCH] Gradle 'shadow' plugin has gone to a community org:
 https://github.com/GradleUp/shadow/issues/908

---
 buildSrc/build.gradle.kts                              | 7 ++++---
 buildSrc/src/main/kotlin/xtdb/DataReaderTransformer.kt | 4 ++--
 cloud-benchmark/aws/build.gradle.kts                   | 2 +-
 cloud-benchmark/azure/build.gradle.kts                 | 2 +-
 cloud-benchmark/google-cloud/build.gradle.kts          | 2 +-
 cloud-benchmark/local/build.gradle.kts                 | 2 +-
 docker/aws/build.gradle.kts                            | 2 +-
 docker/azure/build.gradle.kts                          | 2 +-
 docker/google-cloud/build.gradle.kts                   | 2 +-
 docker/standalone/build.gradle.kts                     | 2 +-
 modules/bench/build.gradle.kts                         | 2 +-
 modules/kafka-connect/build.gradle.kts                 | 2 +-
 monitoring/docker-image/build.gradle.kts               | 2 +-
 13 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 8f9db3e7d1..5c45410e7e 100644
--- 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
index bdad480f8c..88ab8fd2eb 100644
--- 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
index 891e428d69..dea0471673 100644
--- 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
index 83b9178bc2..d8b4492e29 100644
--- 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
index 98b899dfb1..8c7b75c56b 100644
--- 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
index 47808c3f48..c0ec74dc4e 100644
--- 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
index ff82b4362c..8aef247bdd 100644
--- 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
index 2ec41b36a9..2ae420ead6 100644
--- 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
index 026f3bc782..3c65085cd3 100644
--- 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
index 029bf5f102..8627466ac2 100644
--- 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
index 2e95ba8183..506dae9576 100644
--- 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
index 0ddb1b7d1b..815d37d79b 100644
--- 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
index 3f735ac777..f9c1a68460 100644
--- 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 {