Merge branch 'release/4.0.4'

GravitLauncher · Aug 18, 2024 · f1da265 · f1da265
2 parents 7a37b8f + 165ca84
commit f1da265
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -13,7 +13,7 @@ javafx {
 sourceCompatibility = '17'
 targetCompatibility = '17'
 group 'pro.gravit.launcher'
-version '4.0.3'
+version '4.0.4'
 def mainClassName = "pro.gravit.launcher.gui.JavaRuntimeModule"
 
 task sourcesJar(type: Jar) {
@@ -61,11 +61,11 @@ repositories {
 }
 
 dependencies {
-    implementation "pro.gravit.launcher:launcher-core:5.6.3"
-    implementation "pro.gravit.launcher:launcher-ws-api:5.6.3"
-    implementation "pro.gravit.launcher:launcher-client-api:5.6.3"
-    implementation "pro.gravit.launcher:launcher-client-start-api:5.6.3"
-    implementation "pro.gravit.launcher:launcher-client-starter-api:5.6.3"
+    implementation "pro.gravit.launcher:launcher-core:5.6.6"
+    implementation "pro.gravit.launcher:launcher-ws-api:5.6.6"
+    implementation "pro.gravit.launcher:launcher-client-api:5.6.6"
+    implementation "pro.gravit.launcher:launcher-client-start-api:5.6.6"
+    implementation "pro.gravit.launcher:launcher-client-starter-api:5.6.6"
     implementation "pro.gravit.utils.enfs:enfs:2.0.1-SNAPSHOT"
     implementation 'io.netty:netty-codec-http:4.1.67.Final'
     implementation 'com.github.oshi:oshi-core:5.8.1'

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

diff --git a/gradlew.bat b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

diff --git a/src/main/java/pro/gravit/launcher/gui/JavaFXApplication.java b/src/main/java/pro/gravit/launcher/gui/JavaFXApplication.java
@@ -143,7 +143,7 @@ public void start(Stage stage) {
                 debugMode = true;
             }
         } catch (Throwable e) {
-            if (!(e instanceof ClassNotFoundException)) {
+            if (!(e instanceof ClassNotFoundException) && !(e instanceof NoClassDefFoundError)) {
                 LogHelper.error(e);
             }
         }

diff --git a/src/main/java/pro/gravit/launcher/gui/JavaRuntimeModule.java b/src/main/java/pro/gravit/launcher/gui/JavaRuntimeModule.java
@@ -29,7 +29,7 @@ public class JavaRuntimeModule extends LauncherModule {
 
     public JavaRuntimeModule() {
         super(new LauncherModuleInfo("StdJavaRuntime",
-                                     new Version(4, 0, 3, 1, Version.Type.STABLE),
+                                     new Version(4, 0, 4, 1, Version.Type.STABLE),
                                      0, new String[]{}, new String[]{"runtime"}));
     }