Merge branch 'release/5.2.2'

.github/workflows/push.yml

@@ -1,6 +1,5 @@
 name: push
-on:
+on: push
-  push:
 jobs:
   launcher:
     name: Launcher
@@ -49,31 +48,37 @@ jobs:
           name: Launcher
           path: artifacts
 
+      - name: Get version value, set to env
+        if: startsWith(github.event.ref, 'refs/tags')
+        run: echo "LAUNCHER_VERSION=$(echo ${{ github.event.ref }} | awk -F\/ '{print $3}')" >> $GITHUB_ENV
+
+      - name: Prebuild release files
+        if: startsWith(github.event.ref, 'refs/tags')
+        run: |
+          cd artifacts
+          zip -9 LauncherBase.zip libraries.zip LaunchServer.jar
+          zip -j -9 LaunchServerModules.zip ../modules/*_module/build/libs/*.jar
+          zip -j -9 LauncherModules.zip ../modules/*_lmodule/build/libs/*.jar
+          zip -j -9 ServerWrapperModules.zip ../modules/*_swmodule/build/libs/*.jar
+
       - name: Create release
         id: create_release
-        uses: actions/create-release@v1
+        uses: softprops/action-gh-release@v1
-        if: github.event.ref == 'refs/tags/*'
+        if: startsWith(github.event.ref, 'refs/tags')
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#       Список настроек тута: https://github.com/softprops/action-gh-release#-customizing
+#       Можно сделать пуш описания релиза из файла
         with:
-          tag_name: ${{ github.ref }}
+          name: GravitLauncher ${{ env.LAUNCHER_VERSION }}
-          release_name: GravitLauncher ${{ github.ref }}
           draft: false
           prerelease: false
-
+          files: |
-      - name: Pack release
+            libraries.zip
-        if: github.event.ref == 'refs/tags/*'
+            LaunchServer.jar
-        run: |
+            ServerWrapper.jar
-          cd artifacts/
+            LauncherAuthlib.jar
-          zip -r -9 ../Release.zip *
+            LauncherModules.zip
-
+            LaunchServerModules.zip
-      - name: Upload release
+            ServerWrapperModules.zip
-        if: github.event.ref == 'refs/tags/*'
+            LauncherBase.zip
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./Release.zip
-          asset_name: Release.zip
-          asset_content_type: application/zip

LaunchServer/build.gradle

@@ -49,16 +49,16 @@
 
 task sourcesJar(type: Jar) {
     from sourceSets.main.allJava
-    archiveClassifier = 'sources'
+    archiveClassifier.set('sources')
 }
 
 task javadocJar(type: Jar) {
     from javadoc
-    archiveClassifier = 'javadoc'
+    archiveClassifier.set('javadoc')
 }
 
 task cleanjar(type: Jar, dependsOn: jar) {
-    classifier = 'clean'
+    archiveClassifier.set('clean')
     manifest.attributes("Main-Class": mainClassName,
             "Premain-Class": mainAgentName,
             "Can-Redefine-Classes": "true",
@@ -92,8 +92,8 @@ pack project(':LauncherAPI')
     bundle group: 'io.jsonwebtoken', name: 'jjwt-gson', version: rootProject['verJwt']
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: rootProject['verJunit']
 
-    hikari 'io.micrometer:micrometer-core:1.5.10'
+    hikari 'io.micrometer:micrometer-core:1.7.2'
-    hikari('com.zaxxer:HikariCP:4.0.3') {
+    hikari('com.zaxxer:HikariCP:5.0.0') {
         exclude group: 'javassist'
         exclude group: 'io.micrometer'
         exclude group: 'org.slf4j'
@@ -112,7 +112,7 @@ pack project(':LauncherAPI')
     compileOnlyA group: 'com.google.guava', name: 'guava', version: rootProject['verGuavaC']
     // Do not update (laggy deps).
     compileOnlyA 'log4j:log4j:1.2.17'
-    compileOnlyA 'org.apache.logging.log4j:log4j-core:2.11.2'
+    compileOnlyA 'org.apache.logging.log4j:log4j-core:2.14.1'
 }
 
 task hikari(type: Copy) {

LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServerStarter.java

@@ -85,6 +85,9 @@ public static void main(String[] args) throws Exception {
                 logger.warn("LaunchServer signed incorrectly. Status: {}", result.type.name());
             }
         }
+        if (JVMHelper.getVersion() < 17) {
+            logger.warn("LaunchServer will end Java {} support in next release. Please install Java 17 or above", JVMHelper.getVersion());
+        }
 
         LaunchServerRuntimeConfig runtimeConfig;
         LaunchServerConfig config;

LaunchServer/src/main/java/pro/gravit/launchserver/auth/MySQLSourceConfig.java

@@ -32,8 +32,8 @@ public final class MySQLSourceConfig implements AutoCloseable {
     private String username;
     private String password;
     private String database;
-    private String timeZone;
+    private String timezone;
-    private boolean enableHikari;
+    private boolean useHikari;
 
     // Cache
     private transient DataSource source;
@@ -93,22 +93,26 @@ public synchronized Connection getConnection() throws SQLException {
             mysqlSource.setPassword(password);
             mysqlSource.setDatabaseName(database);
             mysqlSource.setTcpNoDelay(true);
-            if (timeZone != null) mysqlSource.setServerTimezone(timeZone);
+            if (timezone != null) mysqlSource.setServerTimezone(timezone);
             hikari = false;
             // Try using HikariCP
             source = mysqlSource;
-            if (enableHikari) {
+            if (useHikari) {
                 try {
                     Class.forName("com.zaxxer.hikari.HikariDataSource");
                     hikari = true; // Used for shutdown. Not instanceof because of possible classpath error
-                    HikariConfig cfg = new HikariConfig();
+                    HikariConfig hikariConfig = new HikariConfig();
-                    cfg.setDataSource(mysqlSource);
+                    hikariConfig.setDataSource(mysqlSource);
-                    cfg.setPoolName(poolName);
+                    hikariConfig.setPoolName(poolName);
-                    cfg.setMaximumPoolSize(MAX_POOL_SIZE);
+                    hikariConfig.setMinimumIdle(1);
+                    hikariConfig.setMaximumPoolSize(MAX_POOL_SIZE);
+                    hikariConfig.setConnectionTestQuery("SELECT 1");
+                    hikariConfig.setConnectionTimeout(1000);
+                    hikariConfig.setAutoCommit(true);
+                    hikariConfig.setLeakDetectionThreshold(2000);
                     // Set HikariCP pool
                     // Replace source with hds
-                    source = new HikariDataSource(cfg);
+                    source = new HikariDataSource(hikariConfig);
-                    logger.warn("HikariCP pooling enabled for '{}'", poolName);
                 } catch (ClassNotFoundException ignored) {
                     logger.debug("HikariCP isn't in classpath for '{}'", poolName);
                 }

LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/AuthCoreProvider.java

@@ -286,6 +286,9 @@ public void invoke(String... args) throws Exception {
 
     public User checkServer(Client client, String username, String serverID) throws IOException {
         User user = getUserByUsername(username);
+        if (user == null) {
+            return null;
+        }
         if (user.getUsername().equals(username) && user.getServerId().equals(serverID)) {
             return user;
         }

LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/MySQLAuthProvider.java

@@ -24,9 +24,10 @@ public final class MySQLAuthProvider extends AuthProvider {
     @Override
     public void init(LaunchServer srv) {
         super.init(srv);
+        if (mySQLHolder == null) throw new RuntimeException("[Verify][AuthProvider] mySQLHolder cannot be null");
         if (query == null) throw new RuntimeException("[Verify][AuthProvider] query cannot be null");
         if (message == null) throw new RuntimeException("[Verify][AuthProvider] message cannot be null");
-        if (mySQLHolder == null) throw new RuntimeException("[Verify][AuthProvider] mySQLHolder cannot be null");
+        if (queryParams == null) throw new RuntimeException("[Verify][AuthProvider] queryParams cannot be null");
     }
 
     @Override

LaunchServer/src/main/java/pro/gravit/launchserver/manangers/AuthManager.java

@@ -235,6 +235,9 @@ public PlayerProfile getPlayerProfile(Client client) {
         PlayerProfile playerProfile;
         if (client.useOAuth) {
             User user = client.getUser();
+            if (user == null) {
+                return null;
+            }
             playerProfile = getPlayerProfile(client.auth, user);
             if (playerProfile != null) return playerProfile;
         }
@@ -253,6 +256,9 @@ public PlayerProfile getPlayerProfile(AuthProviderPair pair, String username, Cl
         UUID uuid = null;
         if (pair.isUseCore()) {
             User user = pair.core.getUserByUsername(username);
+            if (user == null) {
+                return null;
+            }
             PlayerProfile playerProfile = getPlayerProfile(pair, user);
             uuid = user.getUUID();
             if (playerProfile != null) return playerProfile;
@@ -280,6 +286,9 @@ public PlayerProfile getPlayerProfile(AuthProviderPair pair, UUID uuid, ClientPr
         String username = null;
         if (pair.isUseCore()) {
             User user = pair.core.getUserByUUID(uuid);
+            if (user == null) {
+                return null;
+            }
             PlayerProfile playerProfile = getPlayerProfile(pair, user);
             username = user.getUsername();
             if (playerProfile != null) return playerProfile;
@@ -303,6 +312,9 @@ public PlayerProfile getPlayerProfile(AuthProviderPair pair, User user) {
         if (user instanceof UserSupportTextures) {
             return new PlayerProfile(user.getUUID(), user.getUsername(), ((UserSupportTextures) user).getSkinTexture(), ((UserSupportTextures) user).getCloakTexture());
         }
+        if (pair.textureProvider == null) {
+            throw new NullPointerException("TextureProvider not found");
+        }
         return getPlayerProfile(user.getUUID(), user.getUsername(), "", pair.textureProvider);
     }
 

Launcher/build.gradle

@@ -23,7 +23,7 @@
 }
 
 jar {
-    classifier = 'clean'
+    archiveClassifier.set('clean')
     manifest.attributes("Main-Class": mainClassName,
             "Premain-Class": mainAgentName,
             "Multi-Release": "true")
@@ -31,17 +31,17 @@
 
 task sourcesJar(type: Jar) {
     from sourceSets.main.allJava
-    archiveClassifier = 'sources'
+    archiveClassifier.set('sources')
 }
 
 task javadocJar(type: Jar) {
     from javadoc
-    archiveClassifier = 'javadoc'
+    archiveClassifier.set('javadoc')
 }
 
 shadowJar {
     duplicatesStrategy = 'EXCLUDE'
-    classifier = null
+    archiveClassifier.set(null)
     relocate 'org.objectweb.asm', 'pro.gravit.repackage.org.objectweb.asm'
     relocate 'io.netty', 'pro.gravit.repackage.io.netty'
     configurations = [project.configurations.pack]

LauncherAPI/build.gradle

@@ -29,7 +29,7 @@ java11Implementation files(sourceSets.main.output.classesDirs) { builtBy compile
     into('META-INF/versions/11') {
         from sourceSets.java11.output
     }
-    classifier = 'clean'
+    archiveClassifier.set('clean')
 }
 
 compileJava11Java {
@@ -39,12 +39,12 @@ java11Implementation files(sourceSets.main.output.classesDirs) { builtBy compile
 
 task sourcesJar(type: Jar) {
     from sourceSets.main.allJava
-    archiveClassifier = 'sources'
+    archiveClassifier.set('sources')
 }
 
 task javadocJar(type: Jar) {
     from javadoc
-    archiveClassifier = 'javadoc'
+    archiveClassifier.set('javadoc')
 }
 
 publishing {

LauncherCore/build.gradle

@@ -36,7 +36,7 @@ java11Implementation files(sourceSets.main.output.classesDirs) { builtBy compile
     into('META-INF/versions/11') {
         from sourceSets.java11.output
     }
-    classifier = 'clean'
+    archiveClassifier.set('clean')
 }
 compileJava11Java {
     sourceCompatibility = 11
@@ -45,12 +45,12 @@ java11Implementation files(sourceSets.main.output.classesDirs) { builtBy compile
 
 task sourcesJar(type: Jar) {
     from sourceSets.main.allJava
-    archiveClassifier = 'sources'
+    archiveClassifier.set('sources')
 }
 
 task javadocJar(type: Jar) {
     from javadoc
-    archiveClassifier = 'javadoc'
+    archiveClassifier.set('javadoc')
 }
 
 publishing {

LauncherCore/src/main/java/pro/gravit/launcher/hasher/HashedDir.java

@@ -68,6 +68,7 @@ public void remove(String name) {
         map.remove(name);
     }
 
+    @Deprecated
     public void removeR(String name) {
         LinkedList<String> dirs = new LinkedList<>();
         StringTokenizer t = new StringTokenizer(name, "/");
@@ -117,6 +118,9 @@ public FindRecursiveResult findRecursive(String path) {
             if (e == null && !t.hasMoreTokens()) {
                 break;
             }
+            if (e == null) {
+                throw new RuntimeException(String.format("Directory %s not found", name));
+            }
             if (e.getType() == Type.DIR) {
                 if (!t.hasMoreTokens()) {
                     entry = e;

LauncherCore/src/main/java/pro/gravit/utils/Version.java

@@ -6,7 +6,7 @@ public final class Version implements Comparable<Version> {
 
     public static final int MAJOR = 5;
     public static final int MINOR = 2;
-    public static final int PATCH = 1;
+    public static final int PATCH = 2;
     public static final int BUILD = 1;
     public static final Version.Type RELEASE = Type.STABLE;
     public final int major;

LauncherCore/src/main/java/pro/gravit/utils/helper/JVMHelper.java

@@ -29,6 +29,7 @@ public final class JVMHelper {
     public static final Runtime RUNTIME = Runtime.getRuntime();
     public static final ClassLoader LOADER = ClassLoader.getSystemClassLoader();
     public static final int JVM_VERSION = getVersion();
+    public static final int JVM_BUILD = getBuild();
 
     static {
         try {
@@ -54,6 +55,25 @@ public static int getVersion() {
         return Integer.parseInt(version);
     }
 
+    public static int getBuild() {
+        String version = System.getProperty("java.version");
+        int dot;
+        if (version.startsWith("1.")) {
+            dot = version.indexOf("_");
+        } else {
+            dot = version.lastIndexOf(".");
+        }
+        if (dot != -1) {
+            version = version.substring(dot + 1);
+        }
+        try {
+            return Integer.parseInt(version);
+        } catch (NumberFormatException exception) {
+            return 0;
+        }
+
+    }
+
     public static void appendVars(ProcessBuilder builder, Map<String, String> vars) {
         builder.environment().putAll(vars);
     }

LauncherCore/src/main/java/pro/gravit/utils/helper/JavaHelper.java

@@ -141,7 +141,10 @@ public static JavaVersionAndBuild getJavaVersion(String version) {
         JavaVersionAndBuild result = new JavaVersionAndBuild();
         if (version.startsWith("1.")) {
             result.version = Integer.parseInt(version.substring(2, 3));
-            result.build = Integer.parseInt(version.substring(version.indexOf('_') + 1));
+            int pos = version.indexOf('_');
+            if (pos != -1) {
+                result.build = Integer.parseInt(version.substring(pos + 1));
+            }
         } else {
             int dot = version.indexOf(".");
             if (dot != -1) {
@@ -170,12 +173,14 @@ public static class JavaVersion {
         public final Path jvmDir;
         public final int version;
         public final int build;
+        public final int bitness;
         public boolean enabledJavaFX;
 
         public JavaVersion(Path jvmDir, int version) {
             this.jvmDir = jvmDir;
             this.version = version;
             this.build = 0;
+            this.bitness = JVMHelper.OS_BITS;
             this.enabledJavaFX = true;
         }
 
@@ -183,11 +188,20 @@ public JavaVersion(Path jvmDir, int version, int build, boolean enabledJavaFX) {
             this.jvmDir = jvmDir;
             this.version = version;
             this.build = build;
+            this.bitness = JVMHelper.OS_BITS;
+            this.enabledJavaFX = enabledJavaFX;
+        }
+
+        public JavaVersion(Path jvmDir, int version, int build, int bitness, boolean enabledJavaFX) {
+            this.jvmDir = jvmDir;
+            this.version = version;
+            this.build = build;
+            this.bitness = bitness;
             this.enabledJavaFX = enabledJavaFX;
         }
 
         public static JavaVersion getCurrentJavaVersion() {
-            return new JavaVersion(Paths.get(System.getProperty("java.home")), JVMHelper.getVersion(), 0, isCurrentJavaSupportJavaFX());
+            return new JavaVersion(Paths.get(System.getProperty("java.home")), JVMHelper.getVersion(), JVMHelper.JVM_BUILD, JVMHelper.JVM_BITS, isCurrentJavaSupportJavaFX());
         }
 
         private static boolean isCurrentJavaSupportJavaFX() {
@@ -212,14 +226,21 @@ public static JavaVersion getByPath(Path jvmDir) throws IOException {
             }
             Path releaseFile = jvmDir.resolve("release");
             JavaVersionAndBuild versionAndBuild;
+            int bitness = JVMHelper.OS_BITS;
             if (IOHelper.isFile(releaseFile)) {
                 Properties properties = new Properties();
                 properties.load(IOHelper.newReader(releaseFile));
                 versionAndBuild = getJavaVersion(properties.getProperty("JAVA_VERSION").replaceAll("\"", ""));
+                String arch = properties.getProperty("JAVA_VERSION").replaceAll("\"", "");
+                if (arch.contains("x86_64")) {
+                    bitness = 64;
+                } else if (arch.contains("x86") || arch.contains("x32")) {
+                    bitness = 32;
+                }
             } else {
                 versionAndBuild = new JavaVersionAndBuild(isExistExtJavaLibrary(jvmDir, "jfxrt") ? 8 : 9, 0);
             }
-            JavaVersion resultJavaVersion = new JavaVersion(jvmDir, versionAndBuild.version, versionAndBuild.build, false);
+            JavaVersion resultJavaVersion = new JavaVersion(jvmDir, versionAndBuild.version, versionAndBuild.build, bitness, false);
             if (versionAndBuild.version <= 8) {
                 resultJavaVersion.enabledJavaFX = isExistExtJavaLibrary(jvmDir, "jfxrt");
             } else {

LauncherCore/src/main/java11/pro/gravit/utils/helper/JVMHelper.java

@@ -29,6 +29,7 @@ public final class JVMHelper {
     public static final Runtime RUNTIME = Runtime.getRuntime();
     public static final ClassLoader LOADER = ClassLoader.getSystemClassLoader();
     public static final int JVM_VERSION = getVersion();
+    public static final int JVM_BUILD = getBuild();
 
     static {
         try {
@@ -46,6 +47,10 @@ public static int getVersion() {
         return Runtime.version().feature();
     }
 
+    public static int getBuild() {
+        return Runtime.version().update();
+    }
+
     public static void appendVars(ProcessBuilder builder, Map<String, String> vars) {
         builder.environment().putAll(vars);
     }

ServerWrapper/build.gradle

@@ -18,7 +18,7 @@
 targetCompatibility = '1.8'
 
 jar {
-    classifier = 'clean'
+    archiveClassifier.set('clean')
     manifest.attributes("Main-Class": mainClassName,
             "Premain-Class": mainAgentName,
             "Can-Redefine-Classes": "true",
@@ -28,12 +28,12 @@
 
 task sourcesJar(type: Jar) {
     from sourceSets.main.allJava
-    archiveClassifier = 'sources'
+    archiveClassifier.set('sources')
 }
 
 task javadocJar(type: Jar) {
     from javadoc
-    archiveClassifier = 'javadoc'
+    archiveClassifier.set('javadoc')
 }
 
 dependencies {

build.gradle

@@ -2,10 +2,10 @@
     id 'com.github.johnrengelman.shadow' version '5.2.0' apply false
     id 'maven-publish'
     id 'signing'
-    id 'org.openjfx.javafxplugin' version '0.0.8' apply false
+    id 'org.openjfx.javafxplugin' version '0.0.10' apply false
 }
 group = 'pro.gravit.launcher'
-version = '5.2.1'
+version = '5.2.2'
 
 apply from: 'props.gradle'
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,79 +17,112 @@
 #
 
 ##############################################################################
-##
+#
-##  Gradle start up script for UN*X
+#   Gradle start up script for POSIX generated by Gradle.
-##
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
+app_path=$0
-# Need this for relative symlinks.
+
-while [ -h "$PRG" ] ; do
+# Need this for daisy-chained symlinks.
-    ls=`ls -ld "$PRG"`
+while
-    link=`expr "$ls" : '.*-> \(.*\)$'`
+  APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
-    if expr "$link" : '/.*' > /dev/null; then
+  [ -h "$app_path" ]
-        PRG="$link"
+do
-    else
+  ls=$(ls -ld "$app_path")
-        PRG=`dirname "$PRG"`"/$link"
+  link=${ls#*' -> '}
-    fi
+  case $link in #(
+  /*) app_path=$link ;; #(
+  *) app_path=$APP_HOME$link ;;
+  esac
 done
-SAVED="`pwd`"
+
-cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME=$(cd "${APP_HOME:-./}" && pwd -P) || exit
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn() {
   echo "$*"
-}
+} >&2
 
 die() {
   echo
   echo "$*"
   echo
   exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
+case "$(uname)" in #(
-  CYGWIN* )
+CYGWIN*) cygwin=true ;; #(
-    cygwin=true
+Darwin*) darwin=true ;; #(
-    ;;
+MSYS* | MINGW*) msys=true ;; #(
-  Darwin* )
+NONSTOP*) nonstop=true ;;
-    darwin=true
-    ;;
-  MSYS* | MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
-
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ]; then
   if [ -x "$JAVA_HOME/jre/sh/java" ]; then
     # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+    JAVACMD=$JAVA_HOME/jre/sh/java
   else
-        JAVACMD="$JAVA_HOME/bin/java"
+    JAVACMD=$JAVA_HOME/bin/java
   fi
   if [ ! -x "$JAVACMD" ]; then
     die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +131,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
   fi
 else
-    JAVACMD="java"
+  JAVACMD=java
   which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +139,99 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop"; then
-    MAX_FD_LIMIT=`ulimit -H -n`
+  case $MAX_FD in #(
-    if [ $? -eq 0 ] ; then
+  max*)
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+    MAX_FD=$(ulimit -H -n) ||
-            MAX_FD="$MAX_FD_LIMIT"
+      warn "Could not query maximum file descriptor limit"
-        fi
+    ;;
-        ulimit -n $MAX_FD
+  esac
-        if [ $? -ne 0 ] ; then
+  case $MAX_FD in #(
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
+  '' | soft) : ;; #(
-        fi
+  *)
-    else
+    ulimit -n "$MAX_FD" ||
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+      warn "Could not set maximum file descriptor limit to $MAX_FD"
-    fi
+    ;;
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
   esac
 fi
 
-# Escape application args
+# Collect all arguments for the java command, stacking in reverse order:
-save () {
+#   * args from the command line
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+#   * the main class name
-    echo " "
+#   * -classpath
-}
+#   * -D...appname settings
-APP_ARGS=`save "$@"`
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
+# For Cygwin or MSYS, switch paths to Windows format before running java
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+if "$cygwin" || "$msys"; then
+  APP_HOME=$(cygpath --path --mixed "$APP_HOME")
+  CLASSPATH=$(cygpath --path --mixed "$CLASSPATH")
+
+  JAVACMD=$(cygpath --unix "$JAVACMD")
+
+  # Now convert the arguments - kludge to limit ourselves to /bin/sh
+  for arg; do
+    if
+      case $arg in #(
+      -*) false ;; # don't mess with options #(
+      /?*)
+        t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
+        [ -e "$t" ]
+        ;; #(
+      *) false ;;
+      esac
+    then
+      arg=$(cygpath --path --ignore --mixed "$arg")
+    fi
+    # Roll the args list around exactly as many times as the number of
+    # args, so each arg winds up back in the position where it started, but
+    # possibly modified.
+    #
+    # NB: a `for` loop captures its iteration list before it begins, so
+    # changing the positional parameters here affects neither the number of
+    # iterations, nor the values presented in `arg`.
+    shift              # remove old arg
+    set -- "$@" "$arg" # push replacement arg
+  done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+  "-Dorg.gradle.appname=$APP_BASE_NAME" \
+  -classpath "$CLASSPATH" \
+  org.gradle.wrapper.GradleWrapperMain \
+  "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+  printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+    xargs -n1 |
+    sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+    tr '\n' ' '
+)" '"$@"'
 
 exec "$JAVACMD" "$@"