diff --git a/Logo_Radio-Capullo.svg b/Logo_Radio-Capullo.svg
index a9471c8..481a67a 100644
--- a/Logo_Radio-Capullo.svg
+++ b/Logo_Radio-Capullo.svg
@@ -89,52 +89,8 @@
transform="matrix(-0.78801075,0.61566148,0.61566148,0.78801075,0,0)" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
disconected -> then reconnected
- // automatically
- backgroundScope.launch(Dispatchers.IO) { SnapserverProcess(radioRepository).start() }
- snapclientProcessConnectionState = snapclientProcess.connectionState.drop(1).first()
- assert(snapclientProcessConnectionState == SnapclientProcess.ConnectionState.CONNECTED)
- }
-
@OptIn(ExperimentalCoroutinesApi::class)
@Test
fun snapcastControlClientReconnect() {
diff --git a/app/src/androidTest/java/tech/capullo/radio/SnapclientProcessTest.kt b/app/src/androidTest/java/tech/capullo/radio/SnapclientProcessTest.kt
new file mode 100644
index 0000000..b6b7491
--- /dev/null
+++ b/app/src/androidTest/java/tech/capullo/radio/SnapclientProcessTest.kt
@@ -0,0 +1,116 @@
+package tech.capullo.radio
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.drop
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.take
+import kotlinx.coroutines.flow.toList
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.test.StandardTestDispatcher
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
+import kotlinx.coroutines.test.runTest
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import tech.capullo.radio.data.ConfFileDataSource
+import tech.capullo.radio.data.RadioAdvertisingDataSource
+import tech.capullo.radio.data.RadioRepository
+import tech.capullo.radio.snapcast.SnapcastControlClient
+import tech.capullo.radio.snapcast.SnapclientProcess
+import tech.capullo.radio.snapcast.SnapserverProcess
+
+@RunWith(AndroidJUnit4::class)
+class SnapclientProcessTest {
+
+ private lateinit var radioRepository: RadioRepository
+ private lateinit var appContext: android.content.Context
+
+ @Before
+ fun setup() {
+ appContext = InstrumentationRegistry.getInstrumentation().targetContext
+ val confFileDataSource = ConfFileDataSource(appContext)
+ val radioAdvertisingDataSource = RadioAdvertisingDataSource(appContext)
+ radioRepository = RadioRepository(confFileDataSource, radioAdvertisingDataSource)
+ }
+
+ @OptIn(ExperimentalCoroutinesApi::class)
+ @Test
+ fun snapclientSuccessfulFirstTryConnection() = runTest {
+ // Setup
+ backgroundScope.launch(Dispatchers.IO) { SnapserverProcess(radioRepository).start() }
+
+ val snapclientProcess = SnapclientProcess(appContext, radioRepository)
+ backgroundScope.launch(Dispatchers.IO) { snapclientProcess.start() }
+
+ // Succesfull Connection on the first try
+ val snapclientProcessConnectionState = snapclientProcess.connectionState.drop(1).first()
+ assert(snapclientProcessConnectionState == SnapclientProcess.ConnectionState.CONNECTED)
+ }
+
+ @OptIn(ExperimentalCoroutinesApi::class)
+ @Test
+ fun snapclientHandlesInvalidHostAddress() = runTest {
+ val snapclientProcess =
+ SnapclientProcess(appContext, radioRepository)
+
+ backgroundScope.launch(Dispatchers.IO) {
+ snapclientProcess.start(
+ snapserverAddress = "someHostAddressThatFailsToResolve",
+ )
+ }
+ val snapclientProcessConnectionState = snapclientProcess.connectionState.take(2).toList()
+ assert(snapclientProcessConnectionState[0] == SnapclientProcess.ConnectionState.STARTING)
+ assert(snapclientProcessConnectionState[1] == SnapclientProcess.ConnectionState.ERROR)
+ }
+
+ @OptIn(ExperimentalCoroutinesApi::class)
+ @Test
+ fun snapclientRetryAndReconnectBehavior() = runTest {
+ // Setup
+ val snapclientProcess = SnapclientProcess(appContext, radioRepository)
+ backgroundScope.launch(Dispatchers.IO) { snapclientProcess.start() }
+
+ // connecting to a valid host (localhost) but no server is online yet
+ var snapclientProcessConnectionState = snapclientProcess.connectionState.drop(1).first()
+ assert(snapclientProcessConnectionState == SnapclientProcess.ConnectionState.ERROR)
+
+ // bring the snapserver online...
+ val serverJob = backgroundScope.launch(Dispatchers.IO) {
+ SnapserverProcess(radioRepository).start()
+ }
+ // ... snapclient process has retry mechanism
+ snapclientProcessConnectionState = snapclientProcess.connectionState.drop(1).first()
+ assert(snapclientProcessConnectionState == SnapclientProcess.ConnectionState.CONNECTED)
+
+ // plug the server off in the middle of a session
+ serverJob.cancel()
+
+ // trick to make the snapserver process stdout to print something
+ // causing the readLine() function call [SnapserverProcess.kt:45] to unblock
+ // and ensureActive to recognize the process has been canceled
+ backgroundScope.launch(UnconfinedTestDispatcher(testScheduler)) {
+ // run it in a background scope since the control client has an auto retry mechanism
+ try {
+ val snapcastControlClient = SnapcastControlClient(
+ "127.0.0.1",
+ ioDispatcher = StandardTestDispatcher(testScheduler),
+ )
+ snapcastControlClient.initialize()
+ } catch (_: Exception) {}
+ }
+
+ serverJob.join()
+
+ snapclientProcessConnectionState = snapclientProcess.connectionState.first()
+ assert(snapclientProcessConnectionState == SnapclientProcess.ConnectionState.ERROR)
+
+ // make the server come back online, simulating connected -> disconected -> then reconnected
+ // automatically
+ backgroundScope.launch(Dispatchers.IO) { SnapserverProcess(radioRepository).start() }
+ snapclientProcessConnectionState = snapclientProcess.connectionState.drop(1).first()
+ assert(snapclientProcessConnectionState == SnapclientProcess.ConnectionState.CONNECTED)
+ }
+}
diff --git a/app/src/main/java/tech/capullo/radio/snapcast/SnapcastControlClient.kt b/app/src/main/java/tech/capullo/radio/snapcast/SnapcastControlClient.kt
index 7cae23a..e17117f 100644
--- a/app/src/main/java/tech/capullo/radio/snapcast/SnapcastControlClient.kt
+++ b/app/src/main/java/tech/capullo/radio/snapcast/SnapcastControlClient.kt
@@ -190,6 +190,16 @@ class SnapcastControlClient(
session?.sendSerialized(setVolume)
}
+ suspend fun sendSetLatency(clientId: String, latency: Int) {
+ val setLatency = ClientSetLatencyRequest(
+ id = requestIdCounter++,
+ params = LatencyParams(clientId, latency),
+ )
+
+ Log.d(TAG, "sendSetLatency: $setLatency")
+ session?.sendSerialized(setLatency)
+ }
+
companion object {
private val TAG = SnapcastControlClient::class.simpleName
}
diff --git a/app/src/main/java/tech/capullo/radio/snapcast/SnapcastJSONRPC.kt b/app/src/main/java/tech/capullo/radio/snapcast/SnapcastJSONRPC.kt
index c416882..31681cf 100644
--- a/app/src/main/java/tech/capullo/radio/snapcast/SnapcastJSONRPC.kt
+++ b/app/src/main/java/tech/capullo/radio/snapcast/SnapcastJSONRPC.kt
@@ -12,12 +12,14 @@ import kotlinx.serialization.json.jsonObject
// Requests
// https://github.com/badaix/snapcast/blob/develop/doc/json_rpc_api/control.md#requests-1
+val JSON_RPC_VERSION: String = "2.0"
+
@OptIn(ExperimentalSerializationApi::class)
@Serializable
data class ServerGetStatusRequest(
val id: Int,
@EncodeDefault
- val jsonrpc: String = "2.0",
+ val jsonrpc: String = JSON_RPC_VERSION,
@EncodeDefault
val method: String = "Server.GetStatus",
)
@@ -129,7 +131,7 @@ data class StreamQuery(
data class ClientSetVolumeRequest(
val id: Int,
@EncodeDefault
- val jsonrpc: String = "2.0",
+ val jsonrpc: String = JSON_RPC_VERSION,
@EncodeDefault
val method: String = "Client.SetVolume",
val params: VolumeParams,
@@ -142,6 +144,23 @@ data class VolumeParams(
val volume: Volume,
)
+@Serializable
+data class ClientSetLatencyRequest(
+ val id: Int,
+ @EncodeDefault
+ val jsonrpc: String = JSON_RPC_VERSION,
+ @EncodeDefault
+ val method: String = "Client.SetLatency",
+ val params: LatencyParams,
+)
+
+@Serializable
+data class LatencyParams(
+ @SerialName("id")
+ val clientId: String,
+ val latency: Int,
+)
+
// Notifications
// https://github.com/badaix/snapcast/blob/develop/doc/json_rpc_api/control.md#notifications
@Serializable
@@ -178,6 +197,13 @@ data class ClientOnConnect(
val params: ClientParams,
) : Notification()
+@Serializable
+data class ClientOnLatencyChanged(
+ override val jsonrpc: String,
+ override val method: String,
+ val params: LatencyParams,
+) : Notification()
+
@Serializable
data class ServerOnUpdate(
override val jsonrpc: String,
@@ -195,6 +221,7 @@ object NotificationSerializer : JsonContentPolymorphicSerializer(
"\"Client.OnVolumeChanged\"" -> ClientOnVolumeChanged.serializer()
"\"Client.OnDisconnect\"" -> ClientOnDisconnect.serializer()
"\"Client.OnConnect\"" -> ClientOnConnect.serializer()
+ "\"Client.OnLatencyChanged\"" -> ClientOnLatencyChanged.serializer()
else -> GenericNotification.serializer()
}
}
diff --git a/app/src/main/res/drawable/capullo_launcher_foreground.xml b/app/src/main/res/drawable/capullo_launcher_foreground.xml
index fe83764..7832ca5 100644
--- a/app/src/main/res/drawable/capullo_launcher_foreground.xml
+++ b/app/src/main/res/drawable/capullo_launcher_foreground.xml
@@ -3,61 +3,12 @@
android:height="108dp"
android:viewportWidth="700"
android:viewportHeight="700">
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/app/src/main/res/drawable/google_home_devices_24px.xml b/app/src/main/res/drawable/google_home_devices_24px.xml
index cf0332f..620210b 100644
--- a/app/src/main/res/drawable/google_home_devices_24px.xml
+++ b/app/src/main/res/drawable/google_home_devices_24px.xml
@@ -3,7 +3,7 @@
android:height="24dp"
android:viewportWidth="960"
android:viewportHeight="960"
- android:tint="?attr/colorControlNormal">
+ android:tint="?android:attr/colorControlNormal">
diff --git a/app/src/main/res/drawable/volume_off_24px.xml b/app/src/main/res/drawable/volume_off_24px.xml
index f2204e7..f661386 100644
--- a/app/src/main/res/drawable/volume_off_24px.xml
+++ b/app/src/main/res/drawable/volume_off_24px.xml
@@ -3,7 +3,7 @@
android:height="24dp"
android:viewportWidth="960"
android:viewportHeight="960"
- android:tint="?attr/colorControlNormal"
+ android:tint="?android:attr/colorControlNormal"
android:autoMirrored="true">
\(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+ APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
+ [ -h "$app_path" ]
+do
+ ls=$( ls -ld "$app_path" )
+ link=${ls#*' -> '}
+ 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"
-APP_BASE_NAME=`basename "$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"'
+# This is normally unused
+# 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 -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
- CYGWIN* )
- cygwin=true
- ;;
- Darwin* )
- darwin=true
- ;;
- MINGW* )
- msys=true
- ;;
- NONSTOP* )
- nonstop=true
- ;;
+case "$( uname )" in #(
+ CYGWIN* ) cygwin=true ;; #(
+ Darwin* ) 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,88 +131,118 @@ Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
- 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.
+ JAVACMD=java
+ 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
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ] ; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
- MAX_FD="$MAX_FD_LIMIT"
- fi
- ulimit -n $MAX_FD
- if [ $? -ne 0 ] ; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+ case $MAX_FD in #(
+ max*)
+ # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC2039,SC3045
+ MAX_FD=$( ulimit -H -n ) ||
+ warn "Could not query maximum file descriptor limit"
+ esac
+ case $MAX_FD in #(
+ '' | soft) :;; #(
+ *)
+ # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC2039,SC3045
+ ulimit -n "$MAX_FD" ||
+ warn "Could not set maximum file descriptor limit to $MAX_FD"
+ esac
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
+# Collect all arguments for the java command, stacking in reverse order:
+# * args from the command line
+# * the main class name
+# * -classpath
+# * -D...appname settings
+# * --module-path (only if needed)
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
# 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
+if "$cygwin" || "$msys" ; then
+ APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+
+ JAVACMD=$( cygpath --unix "$JAVACMD" )
+
# 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\""
+ 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
- i=`expr $i + 1`
+ # 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
- 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
-save () {
- for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
- echo " "
-}
-APP_ARGS=`save "$@"`
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# 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" \
+ -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" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 107acd3..8508ef6 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,89 +1,82 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="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
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@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 ##########################################################################
+@rem
+@rem gradlew startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables, and ensure extensions are enabled
+setlocal EnableExtensions
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+"%COMSPEC%" /c exit 1
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+"%COMSPEC%" /c exit 1
+
+:execute
+@rem Setup the command line
+
+
+
+@rem Execute gradlew
+@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
+@rem which allows us to clear the local environment before executing the java command
+endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
+
+:exitWithErrorLevel
+@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
+"%COMSPEC%" /c exit %ERRORLEVEL%