Skip to content

Commit 7ed36ea

Browse files
authored
Upgrade to Gradle 9.4.1 (#2696)
* Upgrade to Gradle 9.4.1 * Remove JDK 11 from Gradle 9 CI matrix
1 parent 6388607 commit 7ed36ea

File tree

7 files changed

+10
-17
lines changed

7 files changed

+10
-17
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ jobs:
241241
fail-fast: false
242242
matrix:
243243
os: [ubuntu-latest,windows-latest,macOS-latest]
244-
jdk: [11, 17, 21]
244+
jdk: [17, 21]
245245
include:
246246
- os: ubuntu-latest
247247
osName: linux
@@ -252,8 +252,6 @@ jobs:
252252
- os: macOS-latest
253253
osName: mac
254254
deploy: false
255-
- jdk: 11
256-
deploy: false
257255
- jdk: 17
258256
deploy: false
259257

common.gradle

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,10 @@ ext.pomConfig = {
119119
}
120120
}
121121

122-
artifacts {
123-
archives jar
124-
archives sourcesJar
122+
tasks.named('assemble') {
123+
dependsOn sourcesJar
125124
if (buildJavaDoc == "true") {
126-
archives javadocJar
125+
dependsOn javadocJar
127126
}
128127
}
129128

@@ -204,7 +203,6 @@ signing {
204203
def signingPassword = gradle.rootProject.findProperty('signingPassword')
205204
useInMemoryPgpKeys(signingKey, signingPassword)
206205

207-
sign configurations.archives
208206
sign publishing.publications.maven
209207
}
210208
tasks.withType(Sign) {

gradle/wrapper/gradle-wrapper.jar

5.08 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

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.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 2 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jme3-screenshot-tests/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ dependencies {
1616

1717
implementation 'com.aventstack:extentreports:5.1.2'
1818
implementation platform('org.junit:junit-bom:5.9.1')
19-
implementation 'org.junit.jupiter:junit-jupiter-api'
19+
implementation 'org.junit.jupiter:junit-jupiter'
20+
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
2021
testRuntimeOnly project(':jme3-testdata')
2122
}
2223

0 commit comments

Comments
 (0)