Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ subprojects {

java {
toolchain {
// default java version for the project, some subprojects are pinned to java 8 for backwards compatibility (see their configs).
// default java version for the project
languageVersion = JavaLanguageVersion.of(17)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -224,10 +224,6 @@ public static FileSystem getPackFileSystem(File pack) throws IOException {
? FileSystems.getDefault()
// for resource packs in jar or zip files
: FileSystems.newFileSystem(URI.create("jar:" + pack.toURI()), Collections.emptyMap());
} catch (ZipError e) {
// This catch is required for Java 8. This error appears safe to catch.
// https://stackoverflow.com/a/51715939
throw new IOException(e);
} catch (FileSystemAlreadyExistsException e) {
// for resource packs in jar or zip files (re-use existing fs)
return FileSystems.getFileSystem(URI.create("jar:" + pack.toURI()));
Expand Down
11 changes: 9 additions & 2 deletions launcher/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
apply plugin: 'application'
apply plugin: 'org.openjfx.javafxplugin'

mainClassName = 'se.llbit.chunky.launcher.ChunkyLauncher'

Expand All @@ -20,11 +21,17 @@ dependencies {

java {
toolchain {
languageVersion = JavaLanguageVersion.of(8) // pinned to java 8 for backwards compatibility
vendor = JvmVendorSpec.AMAZON // using corretto as it's one of few jdks to include jfx (on windows+linux) and isn't oracle
// keep this pinned to java 17 for backwards compatibility even if we update to Java 25 in Chunky 2.6
languageVersion = JavaLanguageVersion.of(17)
}
}

javafx {
version = '17'
configuration = 'implementation'
modules = ['javafx.base', 'javafx.controls', 'javafx.fxml']
}

sourceSets {
main {
java {
Expand Down
12 changes: 10 additions & 2 deletions lib/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
apply plugin: 'org.openjfx.javafxplugin'

sourceSets.main.java {
srcDir 'src'
}
Expand All @@ -8,7 +10,13 @@ configurations {

java {
toolchain {
languageVersion = JavaLanguageVersion.of(8) // pinned to java 8 for backwards compatibility
vendor = JvmVendorSpec.AMAZON // using corretto as it's one of few jdks to include jfx (on windows+linux) and isn't oracle
// keep this pinned to java 17 for backwards compatibility even if we update to Java 25 in Chunky 2.6
languageVersion = JavaLanguageVersion.of(17)
}
}

javafx {
version = '17'
configuration = 'implementation'
modules = ['javafx.base', 'javafx.controls', 'javafx.fxml']
}
Loading