Skip to content

Commit 23268ac

Browse files
authored
build: upgrade to Gradle 9.2.1 and migrate Shadow plugin (spiffe#380)
* Upgrade Gradle wrapper to 9.2.1 Signed-off-by: Max Lambrecht <maxlambrecht@gmail.com> * Downgrade shadows plugin to 9.0.0 Signed-off-by: Max Lambrecht <maxlambrecht@gmail.com> --------- Signed-off-by: Max Lambrecht <maxlambrecht@gmail.com>
1 parent ecebe7e commit 23268ac

6 files changed

Lines changed: 9 additions & 9 deletions

File tree

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
strategy:
1919
matrix:
20-
java-version: [ 11, 17, 21 ]
20+
java-version: [ 17, 21 ]
2121

2222
steps:
2323
- uses: actions/checkout@v6
@@ -51,7 +51,7 @@ jobs:
5151
runs-on: macos-latest
5252
strategy:
5353
matrix:
54-
java-version: [ 11, 17, 21 ]
54+
java-version: [ 17, 21 ]
5555

5656
steps:
5757
- uses: actions/checkout@v6

.github/workflows/coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Set up JDK
1515
uses: actions/setup-java@v5
1616
with:
17-
java-version: '16'
17+
java-version: '17'
1818
distribution: 'adopt'
1919
- name: Generate and upload coverage report
2020
env:

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ subprojects {
2222
mockitoVersion = '4.11.0'
2323
lombokVersion = '1.18.42'
2424
nimbusVersion = '10.6'
25-
shadowVersion = '8.1.1'
25+
shadowVersion = '9.0.0'
2626

2727
//IMPORTANT: This must be in sync with the shaded netty version in gRPC
2828
nettyVersion = '4.2.8.Final'
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

java-spiffe-helper/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
plugins {
2-
id "com.github.johnrengelman.shadow" version "${shadowVersion}"
2+
id "com.gradleup.shadow" version "${shadowVersion}"
33
}
44

55
description = "Java SPIFFE Library Helper module to store X.509 SVIDs and Bundles in a Java KeyStore in disk"
66

7-
apply plugin: 'com.github.johnrengelman.shadow'
7+
apply plugin: 'com.gradleup.shadow'
88

99
assemble.dependsOn shadowJar
1010

java-spiffe-provider/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
plugins {
2-
id "com.github.johnrengelman.shadow" version "${shadowVersion}"
2+
id "com.gradleup.shadow" version "${shadowVersion}"
33
}
44

55
description = "Java Security Provider implementation supporting X.509-SVIDs and methods for " +
66
"creating SSLContexts that are backed by the Workload API."
77

8-
apply plugin: 'com.github.johnrengelman.shadow'
8+
apply plugin: 'com.gradleup.shadow'
99

1010
assemble.dependsOn shadowJar
1111

0 commit comments

Comments
 (0)