Skip to content

Commit 5daff13

Browse files
authored
Update to Java 21 (#69)
This removes the `ZipFileSystem.exists` hack and implements `FileSystemProvider.readAttributesIfExists` and `FileSystemProvider.exists`. While I was working on this, I also improved the #63 optimization in `readAttributes` by passing already known attributes.
1 parent 94900c6 commit 5daff13

11 files changed

Lines changed: 130 additions & 79 deletions

File tree

.github/workflows/build-prs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ jobs:
1616
build:
1717
uses: neoforged/actions/.github/workflows/build-prs.yml@main
1818
with:
19-
java: 17
19+
java: 21
2020
gradle_tasks: test

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
release:
1313
uses: neoforged/actions/.github/workflows/gradle-publish.yml@main
1414
with:
15-
java: 17
15+
java: 21
1616
pre_gradle_tasks: test
17-
gradle_tasks: publish
17+
gradle_tasks: publish
1818
secrets:
1919
DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
2020
MAVEN_USER: ${{ secrets.MAVEN_USER }}

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ allprojects {
2020

2121
group 'cpw.mods'
2222
java {
23-
toolchain.languageVersion = JavaLanguageVersion.of(17)
23+
toolchain.languageVersion = JavaLanguageVersion.of(project.java_version)
2424
modularity.inferModulePath.set(true)
2525
}
2626
version = gradleutils.version

gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
java_version=21
12
asm_version=9.3
23
jb_annotations_version=22.0.0

gradle/wrapper/gradle-wrapper.jar

-16 KB
Binary file not shown.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

gradlew

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

gradlew.bat

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

sjh-jmh/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dependencies {
2121

2222
task jmh(type: JavaExec, dependsOn: sourceSets.main.output) {
2323
javaLauncher = javaToolchains.launcherFor {
24-
languageVersion = JavaLanguageVersion.of(17)
24+
languageVersion = JavaLanguageVersion.of(project.java_version)
2525
}
2626
jvmArgs= [
2727
'-p', sourceSets.main.runtimeClasspath.asPath,

0 commit comments

Comments
 (0)