Updated gradle, added ru translation

.android

@@ -0,0 +1,7 @@
+// DO NOT MODIFY; Generated by Android CLI for internal usage.
+(
+    project_name: "KtHeightMap",
+    package_id: "com.mirenkov.ktheightmap",
+    gen_at_version: "0.2.0",
+    main_activity_name: "MainActivity",
+)

TODO

@@ -8,7 +8,7 @@ fix:
     app rotation with placed point
 ui:
     (done) proper file loading menu
-    translation usage
+    (done) translation usage
 test:
     khm:
         read header

app/src/main/java/com/mirenkov/ktheightmap/MainActivity.kt

@@ -42,6 +42,7 @@ import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.res.stringResource
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner
@@ -139,27 +140,27 @@ fun ToolButton(viewModel: TileViewModel) {
             onDismissRequest = { expanded = false }
         ) {
             DropdownMenuItem(
-                text = { Text("Toggle debug") },
+                text = { Text(stringResource(R.string.pop_toggle_debug)) },
                 onClick = {
                     debug = !debug
                     expanded = false
                 }
             )
             DropdownMenuItem(
-                text = { Text("Place point") },
+                text = { Text(stringResource(R.string.pop_place_point)) },
                 onClick = {
                     pointRequested = true
                     expanded = false
                 }
             )
             DropdownMenuItem(
-                text = { Text("Set location") },
+                text = { Text(stringResource(R.string.pop_set_location)) },
                 onClick = {
                     dialogShown.value = true
                 }
             )
             DropdownMenuItem(
-                text = { Text("Settings") },
+                text = { Text(stringResource(R.string.pop_settings)) },
                 onClick = {
                     expanded = false
                     val intent = Intent(context, SettingsActivity::class.java)
@@ -182,7 +183,7 @@ fun SetLocationDialog(vm: TileViewModel, dialogShown: MutableState<Boolean>) {
         var offsetY by remember { vm.mapOffsetY }
         AlertDialog (
             onDismissRequest = { showLocationDialog = false },
-            title = { Text("Input coordinates") },
+            title = { Text(stringResource(R.string.dialog_input_coords)) },
             text = {
                 Column {
                     TextField(
@@ -190,7 +191,7 @@ fun SetLocationDialog(vm: TileViewModel, dialogShown: MutableState<Boolean>) {
                         onValueChange = { newValue ->
                             latitudeText = newValue
                         },
-                        label = { Text("Latitude") },
+                        label = { Text(stringResource(R.string.lat)) },
                         placeholder = { Text("60.086763") },
                         keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number)
                     )
@@ -199,7 +200,7 @@ fun SetLocationDialog(vm: TileViewModel, dialogShown: MutableState<Boolean>) {
                         onValueChange = { newValue ->
                             longitudeText = newValue
                         },
-                        label = { Text("Longitude") },
+                        label = { Text(stringResource(R.string.lon)) },
                         placeholder = { Text("30.014658") },
                         keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number)
                     )
@@ -211,11 +212,11 @@ fun SetLocationDialog(vm: TileViewModel, dialogShown: MutableState<Boolean>) {
                 offsetX = SphereMercator.mercateLon(longitude, vm.scale.floatValue.toInt(),  -vm.halvedOffsetX!!.toDouble() - TILE_SIZE).toFloat()
                 offsetY = SphereMercator.mercateLat(latitude, vm.scale.floatValue.toInt(), -vm.halvedOffsetY!!.toDouble() - TILE_SIZE).toFloat()
             }) {
-                    Text("Confirm".uppercase())
+                    Text(stringResource(R.string.confirm).uppercase())
                 } },
             dismissButton = { TextButton(onClick = { showLocationDialog = false }) {
-                Text("Cancel".uppercase())
+                Text(stringResource(R.string.cancel).uppercase())
             } }
         )
     }
-}
+}

app/src/main/java/com/mirenkov/ktheightmap/SettingsActivity.kt

@@ -33,6 +33,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.compose.ui.res.stringResource
 import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.mirenkov.ktheightmap.Global.Companion.fileIsValidZip
@@ -86,26 +87,26 @@ fun SettingsMain(vm: TileViewModel, launcher: ActivityResultLauncher<DocumentFil
     var enableClearTiles by remember { mutableStateOf(vm.repository.containsTiles()) }
     var enableClearHeight by remember { mutableStateOf(KhmParser.fileExists(ctx)) }
 
-    val loadToast = Toast.makeText(ctx, "File successfully loaded.", Toast.LENGTH_LONG)
+    val loadToast = Toast.makeText(ctx, stringResource(R.string.toast_file_loaded), Toast.LENGTH_LONG)
-    val clearTilesToast = Toast.makeText(ctx, "Tiles removed from database.", Toast.LENGTH_LONG)
+    val clearTilesToast = Toast.makeText(ctx, stringResource(R.string.toast_db_cleared), Toast.LENGTH_LONG)
-    val clearHeightToast = Toast.makeText(ctx, "Height data removed.", Toast.LENGTH_LONG)
+    val clearHeightToast = Toast.makeText(ctx, stringResource(R.string.toast_khm_cleared), Toast.LENGTH_LONG)
 
-    val selectedFileText = if (pathIsNotNull) filePath!!.split('/').last() else "none"
+    val selectedFileText = if (pathIsNotNull) filePath!!.split('/').last() else stringResource(R.string.set_selected_none_file)
 
     val fileSelectorRow = @Composable () {
         Row(Modifier.fillMaxWidth()) {
-            Button({ launcher.launch(null); launcherActive = true }) { Text("Select") }
+            Button({ launcher.launch(null); launcherActive = true }) { Text(stringResource(R.string.select)) }
-            Text("Selected file: $selectedFileText", Modifier.padding(8.dp, 0.dp).align(Alignment.CenterVertically))
+            Text(stringResource(R.string.set_selected_file_template, selectedFileText), Modifier.padding(8.dp, 0.dp).align(Alignment.CenterVertically))
         }
     }
 
     KtHeightMapTheme {
         Scaffold(floatingActionButton = { if (showLoading || launcherActive) CircularProgressIndicator() }) { paddingValues ->
             Column(Modifier.padding(paddingValues)) {
-                LabeledSection("Select file:", Modifier.padding(24.dp, 8.dp)) {
+                LabeledSection(stringResource(R.string.set_select_file_label), Modifier.padding(24.dp, 8.dp)) {
                     fileSelectorRow()
                 }
-                LabeledSection("Load file as...", Modifier.padding(24.dp, 8.dp)) {
+                LabeledSection(stringResource(R.string.set_load_file_label), Modifier.padding(24.dp, 8.dp)) {
                     Button({ filePath?.let {
                         showLoading = true
                         coroutineScope.launch(Dispatchers.IO) {
@@ -113,7 +114,7 @@ fun SettingsMain(vm: TileViewModel, launcher: ActivityResultLauncher<DocumentFil
                             enableClearTiles = true
                             coroutineScope.launch(Dispatchers.Main) { loadToast.show(); showLoading = false }
                         }
-                    } }, enabled = pathContainsSQLite) { Text("SQLite (.zip)") }
+                    } }, enabled = pathContainsSQLite) { Text(stringResource(R.string.set_sqlite_filetype)) }
                     Button({ filePath?.let {
                         showLoading = true
                         coroutineScope.launch(Dispatchers.IO) {
@@ -121,7 +122,7 @@ fun SettingsMain(vm: TileViewModel, launcher: ActivityResultLauncher<DocumentFil
                             enableClearTiles = true
                             coroutineScope.launch(Dispatchers.Main) { loadToast.show(); showLoading = false }
                         }
-                    } }, enabled = pathIsValidZip && !pathContainsSQLite) { Text("JPEG (.zip)") }
+                    } }, enabled = pathIsValidZip && !pathContainsSQLite) { Text(stringResource(R.string.set_jpeg_filetype)) }
                     Button({ filePath?.let {
                         showLoading = true
                         coroutineScope.launch(Dispatchers.IO) {
@@ -129,20 +130,20 @@ fun SettingsMain(vm: TileViewModel, launcher: ActivityResultLauncher<DocumentFil
                             enableClearHeight = true
                             coroutineScope.launch(Dispatchers.Main) { loadToast.show(); showLoading = false }
                         }
-                    } }, enabled = pathIsValidKhm) { Text("Height data (.khm)") }
+                    } }, enabled = pathIsValidKhm) { Text(stringResource(R.string.set_khm_filetype)) }
                 }
-                LabeledSection("Clear...", Modifier.padding(24.dp, 8.dp)) {
+                LabeledSection(stringResource(R.string.set_clear_label), Modifier.padding(24.dp, 8.dp)) {
                     Button({ coroutineScope.launch {
                         showLoading = true
                         vm.repository.clearTiles()
                         enableClearTiles = false
                         coroutineScope.launch(Dispatchers.Main) { clearTilesToast.show(); showLoading = false }
-                    } }, enabled = enableClearTiles) { Text("Tile data") }
+                    } }, enabled = enableClearTiles) { Text(stringResource(R.string.set_clear_db)) }
                     Button({
                         KhmParser.clear(ctx)
                         enableClearHeight = false
                         clearHeightToast.show()
-                    }, enabled = enableClearHeight) { Text("Height data") }
+                    }, enabled = enableClearHeight) { Text(stringResource(R.string.set_clear_khm)) }
                 }
             }
         }
@@ -166,4 +167,4 @@ fun LabeledSection(text: String, modifier: Modifier = Modifier, content: @Compos
             modifier = modifier.fillMaxWidth()
         ) { content() }
     }
-}
+}

app/src/main/res/values-ru/strings.xml

@@ -0,0 +1,34 @@
+<resources>
+    <string name="app_name">KtHeightMap</string>
+
+    <string name="confirm">Подтвердить</string>
+    <string name="cancel">Отменить</string>
+    <string name="select">Выбрать</string>
+
+    <string name="lat">Широта</string>
+    <string name="lon">Долгота</string>
+
+    <string name="pop_toggle_debug">Вкл/выкл отладку</string>
+    <string name="pop_place_point">Установить точку</string>
+    <string name="pop_set_location">Установить координаты</string>
+    <string name="pop_settings">Открыть настройки</string>
+
+    <string name="dialog_input_coords">Введите координаты</string>
+
+    <string name="toast_file_loaded">Файл успешно загружен.</string>
+    <string name="toast_db_cleared">Тайлы удалены из базы данных.</string>
+    <string name="toast_khm_cleared">Высотные данные удалены.</string>
+    
+    <string name="set_select_file_label">Выбрать файл:</string>
+    <string name="set_load_file_label">Загрузить как...</string>
+    <string name="set_clear_label">Удалить...</string>
+    
+    <string name="set_selected_file_template">Выбранный файл: %1$s</string>
+    <string name="set_selected_none_file">пусто</string>
+    <string name="set_sqlite_filetype">SQLite (.zip)</string>
+    <string name="set_jpeg_filetype">JPEG (.zip)</string>
+    <string name="set_khm_filetype">Высотные данные (.khm)</string>
+
+    <string name="set_clear_db">Тайлы</string>
+    <string name="set_clear_khm">Высотные данные</string>
+</resources>

app/src/main/res/values/strings.xml

@@ -1,3 +1,34 @@
 <resources>
     <string name="app_name">KtHeightMap</string>
-</resources>
+
+    <string name="confirm">Confirm</string>
+    <string name="cancel">Cancel</string>
+    <string name="select">Select</string>
+
+    <string name="lat">Latitude</string>
+    <string name="lon">Longitude</string>
+
+    <string name="pop_toggle_debug">Toggle debug</string>
+    <string name="pop_place_point">Place point</string>
+    <string name="pop_set_location">Set location</string>
+    <string name="pop_settings">Open settings</string>
+
+    <string name="dialog_input_coords">Input coordinates</string>
+
+    <string name="toast_file_loaded">File successfully loaded.</string>
+    <string name="toast_db_cleared">Tiles removed from database.</string>
+    <string name="toast_khm_cleared">Height data removed.</string>
+    
+    <string name="set_select_file_label">Select file:</string>
+    <string name="set_load_file_label">Load file as...</string>
+    <string name="set_clear_label">Clear...</string>
+    
+    <string name="set_selected_file_template">Selected file: %1$s</string>
+    <string name="set_selected_none_file">none</string>
+    <string name="set_sqlite_filetype">SQLite (.zip)</string>
+    <string name="set_jpeg_filetype">JPEG (.zip)</string>
+    <string name="set_khm_filetype">Height data (.khm)</string>
+
+    <string name="set_clear_db">Tile data</string>
+    <string name="set_clear_khm">Height data</string>
+</resources>

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
-#Thu Jul 24 13:19:06 MSK 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 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.
@@ -15,81 +15,115 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
-##
+#
-##  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/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/.
+#
 ##############################################################################
 
 # 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="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
+# This is normally unused
-APP_BASE_NAME=`basename "$0"`
+# shellcheck disable=SC2034
-
+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.
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # 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
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # 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,88 +132,120 @@ 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.
+    if ! command -v java >/dev/null 2>&1
+    then
+        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
 location of your Java installation."
+    fi
 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
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-            MAX_FD="$MAX_FD_LIMIT"
+        # shellcheck disable=SC2039,SC3045
-        fi
+        MAX_FD=$( ulimit -H -n ) ||
-        ulimit -n $MAX_FD
+            warn "Could not query maximum file descriptor limit"
-        if [ $? -ne 0 ] ; then
+    esac
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
+    case $MAX_FD in  #(
-        fi
+      '' | soft) :;; #(
-    else
+      *)
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-    fi
+        # shellcheck disable=SC2039,SC3045
-fi
+        ulimit -n "$MAX_FD" ||
-
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
-# 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
+
+
+# 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"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# 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" "$@"

gradlew.bat

@@ -13,8 +13,10 @@
 @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
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +27,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,32 +59,34 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail
 
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+set EXIT_CODE=%ERRORLEVEL%
-exit /b 1
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal