Skip to content

Commit 5fade37

Browse files
committed
update to java 21
1 parent 25f51e4 commit 5fade37

File tree

7 files changed

+66
-41
lines changed

7 files changed

+66
-41
lines changed

.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ jobs:
1212
- name: Checkout code
1313
uses: actions/checkout@v3
1414

15-
- name: Set up JDK 17
15+
- name: Set up JDK 21
1616
uses: actions/setup-java@v3
1717
with:
1818
distribution: temurin
19-
java-version: 17
19+
java-version: 21
2020

2121
- name: Build jar
2222
run: gradlew build shadowJar --stacktrace --warning-mode all

build.gradle

+15-10
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,21 @@ plugins {
44
id 'eclipse'
55
id 'idea'
66
id 'org.openjfx.javafxplugin' version '0.0.12'
7-
id 'com.github.johnrengelman.shadow' version '7.1.2'
7+
id 'io.github.goooler.shadow' version '8.1.7'
88
id 'com.github.ben-manes.versions' version '0.42.0'
99
}
1010

1111
group 'net.querz'
12-
sourceCompatibility = JavaLanguageVersion.of(17)
13-
targetCompatibility = JavaLanguageVersion.of(17)
1412
compileJava.options.encoding = 'UTF-8'
1513
application.mainClass = 'net.querz.mcaselector.Main'
16-
configurations.implementation.canBeResolved = true
14+
//configurations.implementation.canBeResolved = true
15+
16+
java {
17+
sourceCompatibility = JavaVersion.VERSION_21
18+
}
1719

1820
javafx {
19-
version = "$sourceCompatibility"
21+
version = "$java.sourceCompatibility"
2022
modules = ['javafx.controls', 'javafx.swing']
2123
}
2224

@@ -30,29 +32,32 @@ repositories {
3032
maven {
3133
url 'https://jitpack.io/'
3234
}
35+
maven {
36+
url 'https://plugins.gradle.org/m2/'
37+
}
3338
}
3439

3540
dependencies {
3641
implementation 'com.github.Querz:NBT:56ac2af621'
3742
implementation 'com.google.code.gson:gson:2.10.1'
38-
implementation 'org.xerial:sqlite-jdbc:3.36.0.3'
43+
implementation 'org.xerial:sqlite-jdbc:3.45.2.0'
3944
implementation 'it.unimi.dsi:fastutil:8.5.8'
4045
implementation 'org.apache.logging.log4j:log4j-api:2.17.2'
4146
implementation 'org.apache.logging.log4j:log4j-core:2.17.2'
4247
implementation 'commons-cli:commons-cli:1.5.0'
43-
implementation 'me.tongfei:progressbar:0.9.3'
48+
implementation 'me.tongfei:progressbar:0.10.1'
4449
implementation 'org.codehaus.groovy:groovy-jsr223:3.0.11'
4550
implementation 'org.fxmisc.richtext:richtextfx:0.11.2'
4651
implementation 'org.lz4:lz4-java:1.8.0'
4752

4853
shadow 'com.github.Querz:NBT:56ac2af621'
4954
shadow 'com.google.code.gson:gson:2.10.1'
50-
shadow 'org.xerial:sqlite-jdbc:3.36.0.3'
55+
shadow 'org.xerial:sqlite-jdbc:3.45.2.0'
5156
shadow 'it.unimi.dsi:fastutil:8.5.8'
5257
shadow 'org.apache.logging.log4j:log4j-api:2.17.2'
5358
shadow 'org.apache.logging.log4j:log4j-core:2.17.2'
5459
shadow 'commons-cli:commons-cli:1.5.0'
55-
shadow 'me.tongfei:progressbar:0.9.3'
60+
shadow 'me.tongfei:progressbar:0.10.1'
5661
shadow 'org.codehaus.groovy:groovy-jsr223:3.0.11'
5762
shadow 'org.fxmisc.richtext:richtextfx:0.11.2'
5863
shadow 'org.lz4:lz4-java:1.8.0'
@@ -63,7 +68,7 @@ dependencies {
6368

6469
task copyRuntimeLibs(type: Copy) {
6570
from configurations.shadow
66-
into file("$buildDir/libs/lib/")
71+
into layout.buildDirectory.dir('libs/lib')
6772
exclude {it.file.name.startsWith('javafx')}
6873
}
6974

gradle/wrapper/gradle-wrapper.jar

-15.7 KB
Binary file not shown.
+3-1
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-7.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

gradlew

+33-18
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
#
4-
# Copyright © 2015-2021 the original authors.
4+
# Copyright © 2015-2021 the original authors.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@
3232
# Busybox and similar reduced shells will NOT work, because this script
3333
# requires all of these POSIX shell features:
3434
# * functions;
35-
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
36-
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
37-
# * compound commands having a testable exit status, especially «case»;
38-
# * various built-in commands including «command», «set», and «ulimit».
35+
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
36+
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
37+
# * compound commands having a testable exit status, especially «case»;
38+
# * various built-in commands including «command», «set», and «ulimit».
3939
#
4040
# Important for patching:
4141
#
@@ -55,7 +55,7 @@
5555
# Darwin, MinGW, and NonStop.
5656
#
5757
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
58+
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5959
# within the Gradle project.
6060
#
6161
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
8080
esac
8181
done
8282

83-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
84-
85-
APP_NAME="Gradle"
83+
# This is normally unused
84+
# shellcheck disable=SC2034
8685
APP_BASE_NAME=${0##*/}
87-
88-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
86+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87+
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
9088

9189
# Use the maximum available, or set MAX_FD != -1 to use that value.
9290
MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
133131
fi
134132
else
135133
JAVACMD=java
136-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
134+
if ! command -v java >/dev/null 2>&1
135+
then
136+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137137
138138
Please set the JAVA_HOME variable in your environment to match the
139139
location of your Java installation."
140+
fi
140141
fi
141142

142143
# Increase the maximum file descriptors if we can.
143144
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144145
case $MAX_FD in #(
145146
max*)
147+
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
148+
# shellcheck disable=SC2039,SC3045
146149
MAX_FD=$( ulimit -H -n ) ||
147150
warn "Could not query maximum file descriptor limit"
148151
esac
149152
case $MAX_FD in #(
150153
'' | soft) :;; #(
151154
*)
155+
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
156+
# shellcheck disable=SC2039,SC3045
152157
ulimit -n "$MAX_FD" ||
153158
warn "Could not set maximum file descriptor limit to $MAX_FD"
154159
esac
@@ -193,18 +198,28 @@ if "$cygwin" || "$msys" ; then
193198
done
194199
fi
195200

196-
# Collect all arguments for the java command;
197-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
198-
# shell script including quotes and variable substitutions, so put them in
199-
# double quotes to make sure that they get re-expanded; and
200-
# * put everything else in single quotes, so that it's not re-expanded.
201+
202+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
203+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
204+
205+
# Collect all arguments for the java command:
206+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
207+
# and any embedded shellness will be escaped.
208+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
209+
# treated as '${Hostname}' itself on the command line.
201210

202211
set -- \
203212
"-Dorg.gradle.appname=$APP_BASE_NAME" \
204213
-classpath "$CLASSPATH" \
205214
org.gradle.wrapper.GradleWrapperMain \
206215
"$@"
207216

217+
# Stop when "xargs" is not available.
218+
if ! command -v xargs >/dev/null 2>&1
219+
then
220+
die "xargs is not available"
221+
fi
222+
208223
# Use "xargs" to parse quoted args.
209224
#
210225
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

+9-6
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
@rem limitations under the License.
1515
@rem
1616

17-
@if "%DEBUG%" == "" @echo off
17+
@if "%DEBUG%"=="" @echo off
1818
@rem ##########################################################################
1919
@rem
2020
@rem Gradle startup script for Windows
@@ -25,7 +25,8 @@
2525
if "%OS%"=="Windows_NT" setlocal
2626

2727
set DIRNAME=%~dp0
28-
if "%DIRNAME%" == "" set DIRNAME=.
28+
if "%DIRNAME%"=="" set DIRNAME=.
29+
@rem This is normally unused
2930
set APP_BASE_NAME=%~n0
3031
set APP_HOME=%DIRNAME%
3132

@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
4041

4142
set JAVA_EXE=java.exe
4243
%JAVA_EXE% -version >NUL 2>&1
43-
if "%ERRORLEVEL%" == "0" goto execute
44+
if %ERRORLEVEL% equ 0 goto execute
4445

4546
echo.
4647
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
7576

7677
:end
7778
@rem End local scope for the variables with windows NT shell
78-
if "%ERRORLEVEL%"=="0" goto mainEnd
79+
if %ERRORLEVEL% equ 0 goto mainEnd
7980

8081
:fail
8182
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
8283
rem the _cmd.exe /c_ return code!
83-
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
84-
exit /b 1
84+
set EXIT_CODE=%ERRORLEVEL%
85+
if %EXIT_CODE% equ 0 set EXIT_CODE=1
86+
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
87+
exit /b %EXIT_CODE%
8588

8689
:mainEnd
8790
if "%OS%"=="Windows_NT" endlocal

installer/res/inno.iss

+4-4
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Type: filesandordirs; Name: "{app}\\jre"
4848

4949
[UninstallDelete]
5050
Type: filesandordirs; Name: "{app}\\jre"
51-
Type: filesandordirs; Name: "{app}\\zulu17.30.15-ca-fx-jre17.0.1-win_x64"
51+
Type: filesandordirs; Name: "{app}\\zulu21.32.17-ca-fx-jre21.0.2-win_x64"
5252
Type: filesandordirs; Name: "{app}\\MCA Selector.ini"
5353

5454
[Icons]
@@ -79,7 +79,7 @@ function NextButtonClick(CurPageID: Integer): Boolean;
7979
begin
8080
if CurPageID = wpReady then begin
8181
DownloadPage.Clear;
82-
DownloadPage.Add('https://cdn.azul.com/zulu/bin/zulu17.30.15-ca-fx-jre17.0.1-win_x64.zip', 'jre.zip', '');
82+
DownloadPage.Add('https://cdn.azul.com/zulu/bin/zulu21.32.17-ca-fx-jre21.0.2-win_x64.zip', 'jre.zip', '');
8383
DownloadPage.Show;
8484
try
8585
try
@@ -99,8 +99,8 @@ end;
9999
procedure RenameJRE;
100100
begin
101101
Log('Renaming jre directory');
102-
if not RenameFile(ExpandConstant('{app}\\zulu17.30.15-ca-fx-jre17.0.1-win_x64'), ExpandConstant('{app}\\jre')) then begin
102+
if not RenameFile(ExpandConstant('{app}\\zulu21.32.17-ca-fx-jre21.0.2-win_x64'), ExpandConstant('{app}\\jre')) then begin
103103
Log('Failed to rename jre folder, creating custom ini');
104-
SaveStringToFile(ExpandConstant('{app}\\MCA Selector.ini'), 'vm.location=zulu17.30.15-ca-fx-jre17.0.1-win_x64\\bin\\server\\jvm.dll', False);
104+
SaveStringToFile(ExpandConstant('{app}\\MCA Selector.ini'), 'vm.location=zulu21.32.17-ca-fx-jre21.0.2-win_x64\\bin\\server\\jvm.dll', False);
105105
end;
106106
end;

0 commit comments

Comments
 (0)