Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Added more tweaks to screens and dependencies
Arty Bishop5a0ff019e96e
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/MainTheme.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/MainTheme.ktindex b49b71f9..ab77848f 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/MainTheme.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/MainTheme.kt@@ -86,7 +86,7 @@ private val darkScheme = darkColorScheme(// inversePrimary = Color(0xFF121212),secondary = Color(0xFFE0E0E0),onSecondary = Color(0xFF000000),- secondaryContainer = Color(0xFF484848), // navBar indicator,+ secondaryContainer = Color(0xFF404040), // navBar indicator,onSecondaryContainer = Color(0xFFE0E0E0), // navBar active icon// tertiary = Color(0xFF121212),// onTertiary = Color(0xFF121212),@@ -94,9 +94,9 @@ private val darkScheme = darkColorScheme(// onTertiaryContainer = Color(0xFF121212),background = Color(0xFF121212),onBackground = Color(0xFFE0E0E0),- surface = Color(0xFF242424), // card background+ surface = Color(0xFF202020), // card backgroundonSurface = Color(0xFFE0E0E0), // on card background- surfaceVariant = Color(0xFF484848), // buttons background+ surfaceVariant = Color(0xFF404040), // buttons backgroundonSurfaceVariant = Color(0xFFE0E0E0), // navBar inactive iconsurfaceTint = Color(0x00000000),// inverseSurface = Color(0xFF121212),@@ -112,7 +112,7 @@ private val darkScheme = darkColorScheme(surfaceContainer = Color(0xFF121212), // navBar background// surfaceContainerHigh = Color(0xFF121212),surfaceContainerHighest = Color(0xFF242424), // filled card background- surfaceContainerLow = Color(0xFF242424), // elevated card background+ surfaceContainerLow = Color(0xFF202020), // elevated card background// surfaceContainerLowest = Color(0xFF121212),// surfaceDim = Color(0xFF121212),)diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesScreen.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesScreen.ktindex 1c552a02..c833faeb 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesScreen.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesScreen.kt@@ -121,6 +121,7 @@ private fun PassesList(navigateToRadar: (Int, Long) -> Unit,refreshPasses: () -> Unit) {+ val isVerticalLayout = isVerticalLayout()val refreshState = rememberPullToRefreshState()ElevatedCard(modifier = Modifier.fillMaxSize()) {PullToRefreshBox(@@ -145,7 +146,8 @@ private fun PassesList(NearEarthPass(pass = pass,navigateToRadar = navigateToRadar,- modifier = Modifier.animateItem()+ modifier = Modifier.animateItem(),+ isVerticalLayout = isVerticalLayout)}}@@ -175,18 +177,20 @@ private fun NearEarthPassPreview() {private fun NearEarthPass(pass: OrbitalPass,navigateToRadar: (Int, Long) -> Unit,- modifier: Modifier = Modifier+ modifier: Modifier = Modifier,+ isVerticalLayout: Boolean = true) {val passSatId = stringResource(id = R.string.pass_satId, pass.catNum)+ val horizontalPadding = if (isVerticalLayout) 6.dp else 10.dpSurface(color = MaterialTheme.colorScheme.background, modifier = modifier) {Surface(modifier = Modifier- .padding(bottom = 2.dp, start = 1.dp, end = 1.dp)+ .padding(bottom = 2.dp).clickable { navigateToRadar(pass.catNum, pass.aosTime) }) {Column(verticalArrangement = Arrangement.spacedBy(1.dp),modifier = Modifier.background(color = MaterialTheme.colorScheme.surface)- .padding(horizontal = 6.dp, vertical = 4.dp)+ .padding(horizontal = horizontalPadding, vertical = 4.dp)) {Row(verticalAlignment = Alignment.CenterVertically) {Text(diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarView.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarView.ktindex 9d0a97fb..e253e924 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarView.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarView.kt@@ -136,13 +136,19 @@ fun RadarViewCompose(trackCreated.value = true}rotate(if (shouldUseCompass) -azimElev.first else 0f) {- if (shouldShowSweep) drawSweep(center, sweepDegrees.floatValue, radius, trackColor)+ if (shouldShowSweep) {+ drawSweep(center, sweepDegrees.floatValue, radius, trackColor)+ }drawRadar(radius, radarColor, strokeWidth, 3)drawInfo(radius, trackColor, measurer, 3)translate(center.x, center.y) {drawTrack(trackPath.value, trackEffect.value, aimColor, trackColor)- if (item.elevation > 0) drawPosition(item, radius, animScale.value, trackColor)- drawAim(azimElev.first, azimElev.second, radius, strokeWidth, aimColor)+ if (item.elevation > 0) {+ drawPosition(item, radius, animScale.value, trackColor)+ }+ if (shouldUseCompass) {+ drawAim(azimElev.first, azimElev.second, radius, strokeWidth, aimColor)+ }}sweepDegrees.floatValue = (sweepDegrees.floatValue + 360 / 12.0f / 60) % 360}diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/satellites/SatellitesScreen.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/satellites/SatellitesScreen.ktindex 0e9575b9..52e6e127 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/satellites/SatellitesScreen.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/satellites/SatellitesScreen.kt@@ -139,6 +139,7 @@ private fun SearchBar(setQuery: (String) -> Unit, modifier: Modifier = Modifier)modifier = modifier.padding(start = 12.dp),textStyle = TextStyle(fontSize = 16.sp,+ lineHeight = 20.sp,fontWeight = FontWeight.Medium,color = MaterialTheme.colorScheme.onSurface),@@ -147,8 +148,9 @@ private fun SearchBar(setQuery: (String) -> Unit, modifier: Modifier = Modifier)Text(text = stringResource(id = R.string.entries_search_hint),fontSize = 16.sp,- fontWeight = FontWeight.Normal,- color = MaterialTheme.colorScheme.onSurfaceVariant+ lineHeight = 20.sp,+ fontWeight = FontWeight.Medium,+ color = MaterialTheme.colorScheme.onSurface)}innerTextField()diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/satellites/SatellitesViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/satellites/SatellitesViewModel.ktindex 2a0ea3c7..b476acdf 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/satellites/SatellitesViewModel.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/satellites/SatellitesViewModel.kt@@ -54,6 +54,7 @@ class SatellitesViewModel(init {viewModelScope.launch {delay(1000)+ selectionRepo.setQuery(String())selectionRepo.setTypes(defaultTypes)selectionRepo.getEntriesFlow().collectLatest { items ->_uiState.update { it.copy(isLoading = false, itemsList = items) }diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex e5580d71..512ec21f 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -1,5 +1,5 @@[versions]-android-gradle-plugin = "8.11.1"+android-gradle-plugin = "8.12.0"google-ksp = "2.2.0-2.0.2"kotlin = "2.2.0"@@ -10,7 +10,7 @@ androidx-room = "2.7.2"compose-bom = "2025.07.00"compose-activity = "1.10.1"compose-lifecycle = "2.9.2"-compose-navigation = "2.9.2"+compose-navigation = "2.9.3"other-coroutines = "1.10.2"other-json = "20250517"@@ -20,8 +20,8 @@ other-osmdroid = "6.1.20"test-junit4 = "4.13.2"test-mockk = "1.14.5"-androidTest-junit = "1.2.1"-androidTest-espresso = "3.6.1"+androidTest-junit = "1.3.0"+androidTest-espresso = "3.7.0"[libraries]androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-core-ktx" }diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jarindex e708b1c0..8bdaf60c 100644Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differdiff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.propertiesindex 3dda1915..2a84e188 100644--- a/gradle/wrapper/gradle-wrapper.properties+++ b/gradle/wrapper/gradle-wrapper.properties@@ -1,6 +1,7 @@-#Sun Jul 13 12:20:27 BST 2025distributionBase=GRADLE_USER_HOMEdistributionPath=wrapper/dists-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip+networkTimeout=10000+validateDistributionUrl=truezipStoreBase=GRADLE_USER_HOMEzipStorePath=wrapper/distsdiff --git a/gradlew b/gradlewindex 4f906e0c..ef07e016 100755--- a/gradlew+++ b/gradlew@@ -1,7 +1,7 @@-#!/usr/bin/env sh+#!/bin/sh#-# Copyright 2015 the original author or authors.+# Copyright © 2015 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"-# Need this for relative symlinks.-while [ -h "$PRG" ] ; do- ls=`ls -ld "$PRG"`- link=`expr "$ls" : '.*-> \(.*\)$'`- 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 ;;+ esacdone-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=maximumwarn () {echo "$*"-}+} >&2die () {echoecho "$*"echoexit 1-}+} >&2# OS specific support (must be 'true' or 'false').cygwin=falsemsys=falsedarwin=falsenonstop=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+CLASSPATH="\\\"\\\""# Determine the Java command to use to start the JVM.if [ -n "$JAVA_HOME" ] ; thenif [ -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/javaelse- JAVACMD="$JAVA_HOME/bin/java"+ JAVACMD=$JAVA_HOME/bin/javafiif [ ! -x "$JAVACMD" ] ; thendie "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 thelocation of your Java installation."fielse- 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 thelocation of your Java installation."+ fifi# 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"+ esacfi-# 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" )+ CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )++ 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 argdone- 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" ;;- esacfi-# 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" \+ -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" "$@"diff --git a/gradlew.bat b/gradlew.batindex 107acd32..db3a6ac2 100644--- a/gradlew.bat+++ b/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" setlocalset DIRNAME=%~dp0-if "%DIRNAME%" == "" set DIRNAME=.+if "%DIRNAME%"=="" set DIRNAME=.+@rem This is normally unusedset APP_BASE_NAME=%~n0set APP_HOME=%DIRNAME%@@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHomeset JAVA_EXE=java.exe%JAVA_EXE% -version >NUL 2>&1-if "%ERRORLEVEL%" == "0" goto execute+if %ERRORLEVEL% equ 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.+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>&2goto fail@@ -56,32 +59,34 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exeif 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.+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>&2goto 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:failrem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead ofrem the _cmd.exe /c_ return code!-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1-exit /b 1+set EXIT_CODE=%ERRORLEVEL%+if %EXIT_CODE% equ 0 set EXIT_CODE=1+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%+exit /b %EXIT_CODE%:mainEndif "%OS%"=="Windows_NT" endlocal