Skip to content

Commit

Permalink
Build: Move to goooler shadow plugin (apache#10568)
Browse files Browse the repository at this point in the history
Co-authored-by: Eduard Tudenhoefner <[email protected]>
  • Loading branch information
Fokko and nastra authored Jun 25, 2024
1 parent 8af8a4d commit 10fc04b
Show file tree
Hide file tree
Showing 12 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion aws-bundle/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

project(":iceberg-aws-bundle") {

apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'io.github.goooler.shadow'

tasks.jar.dependsOn tasks.shadowJar

Expand Down
2 changes: 1 addition & 1 deletion azure-bundle/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

project(":iceberg-azure-bundle") {

apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'io.github.goooler.shadow'

tasks.jar.dependsOn tasks.shadowJar

Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ buildscript {
gradlePluginPortal()
}
dependencies {
classpath 'com.github.johnrengelman:shadow:8.1.1'
classpath 'io.github.goooler.shadow:shadow-gradle-plugin:8.1.7'
classpath 'com.palantir.baseline:gradle-baseline-java:4.42.0'
// com.palantir.baseline:gradle-baseline-java:4.42.0 (the last version supporting Java 8) pulls
// in an old version of the errorprone, which doesn't work w/ Gradle 8, so bump errorpone as
Expand Down Expand Up @@ -257,7 +257,7 @@ subprojects {
}

project(':iceberg-bundled-guava') {
apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'io.github.goooler.shadow'

tasks.jar.dependsOn tasks.shadowJar

Expand Down
2 changes: 1 addition & 1 deletion flink/v1.17/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}") {
}

project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}") {
apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'io.github.goooler.shadow'

tasks.jar.dependsOn tasks.shadowJar

Expand Down
2 changes: 1 addition & 1 deletion flink/v1.18/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}") {
}

project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}") {
apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'io.github.goooler.shadow'

tasks.jar.dependsOn tasks.shadowJar

Expand Down
2 changes: 1 addition & 1 deletion flink/v1.19/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}") {
}

project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}") {
apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'io.github.goooler.shadow'

tasks.jar.dependsOn tasks.shadowJar

Expand Down
2 changes: 1 addition & 1 deletion gcp-bundle/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

project(":iceberg-gcp-bundle") {

apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'io.github.goooler.shadow'

tasks.jar.dependsOn tasks.shadowJar

Expand Down
2 changes: 1 addition & 1 deletion hive-runtime/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
def hiveVersions = (System.getProperty("hiveVersions") != null ? System.getProperty("hiveVersions") : System.getProperty("defaultHiveVersions")).split(",")

project(':iceberg-hive-runtime') {
apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'io.github.goooler.shadow'

tasks.jar.dependsOn tasks.shadowJar

Expand Down
2 changes: 1 addition & 1 deletion hive3-orc-bundle/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
// name. This is to be used by Hive3 for features including e.g. vectorization.
project(':iceberg-hive3-orc-bundle') {

apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'io.github.goooler.shadow'

tasks.jar.dependsOn tasks.shadowJar

Expand Down
2 changes: 1 addition & 1 deletion spark/v3.3/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ project(":iceberg-spark:iceberg-spark-extensions-${sparkMajorVersion}_${scalaVer
}

project(":iceberg-spark:iceberg-spark-runtime-${sparkMajorVersion}_${scalaVersion}") {
apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'io.github.goooler.shadow'

tasks.jar.dependsOn tasks.shadowJar

Expand Down
2 changes: 1 addition & 1 deletion spark/v3.4/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ project(":iceberg-spark:iceberg-spark-extensions-${sparkMajorVersion}_${scalaVer
}

project(":iceberg-spark:iceberg-spark-runtime-${sparkMajorVersion}_${scalaVersion}") {
apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'io.github.goooler.shadow'

tasks.jar.dependsOn tasks.shadowJar

Expand Down
2 changes: 1 addition & 1 deletion spark/v3.5/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ project(":iceberg-spark:iceberg-spark-extensions-${sparkMajorVersion}_${scalaVer
}

project(":iceberg-spark:iceberg-spark-runtime-${sparkMajorVersion}_${scalaVersion}") {
apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'io.github.goooler.shadow'

tasks.jar.dependsOn tasks.shadowJar

Expand Down

0 comments on commit 10fc04b

Please sign in to comment.