From c4416932850e9290309c97caad2e5aa6c6a3d52a Mon Sep 17 00:00:00 2001 From: "Thomas.B" Date: Mon, 23 Oct 2023 22:13:53 +0200 Subject: [PATCH 1/3] fix issue on champion detail --- .../learnoflegends/core/model/Champion.kt | 2 +- .../core/network/model/NetworkChampion.kt | 4 +- .../core/network/model/NetworkItem.kt | 2 +- .../learnoflegends/core/ui/util/HtmlUtils.kt | 3 +- .../feature/champion/ChampionScreen.kt | 2 +- .../feature/items/ItemsScreen.kt | 65 +++-- gradlew | 276 ++++++++++++------ 7 files changed, 234 insertions(+), 120 deletions(-) diff --git a/core/model/src/main/java/com/bagnolati/learnoflegends/core/model/Champion.kt b/core/model/src/main/java/com/bagnolati/learnoflegends/core/model/Champion.kt index e82e710..6e667e7 100644 --- a/core/model/src/main/java/com/bagnolati/learnoflegends/core/model/Champion.kt +++ b/core/model/src/main/java/com/bagnolati/learnoflegends/core/model/Champion.kt @@ -80,7 +80,7 @@ data class Champion( val range: List, val rangeBurn: String?, val image: ImageUrl, - val resource: String + val resource: String? = null ) { data class LevelTip( val label: List?, diff --git a/core/network/src/main/kotlin/com/bagnolati/learnoflegends/core/network/model/NetworkChampion.kt b/core/network/src/main/kotlin/com/bagnolati/learnoflegends/core/network/model/NetworkChampion.kt index 3c8cf1d..3c0bdb2 100644 --- a/core/network/src/main/kotlin/com/bagnolati/learnoflegends/core/network/model/NetworkChampion.kt +++ b/core/network/src/main/kotlin/com/bagnolati/learnoflegends/core/network/model/NetworkChampion.kt @@ -26,7 +26,7 @@ data class NetworkChampion( val enemytips: List = emptyList(), val passive: NetworkPassive? = null, val spells: List = emptyList(), - val skins: List = emptyList() + val skins: List = emptyList(), ) { @Serializable @@ -98,7 +98,7 @@ data class NetworkChampion( val range: List, val rangeBurn: String?, val image: NetworkImage, - val resource: String + val resource: String? = null ) { @Serializable data class NetworkLeveltip( diff --git a/core/network/src/main/kotlin/com/bagnolati/learnoflegends/core/network/model/NetworkItem.kt b/core/network/src/main/kotlin/com/bagnolati/learnoflegends/core/network/model/NetworkItem.kt index 78faf45..29744bf 100644 --- a/core/network/src/main/kotlin/com/bagnolati/learnoflegends/core/network/model/NetworkItem.kt +++ b/core/network/src/main/kotlin/com/bagnolati/learnoflegends/core/network/model/NetworkItem.kt @@ -18,7 +18,7 @@ data class NetworkItem( val plaintext: String, val stats: NetworkStats, val tags: List, - val depth: Int? = null + val depth: Int? = null, ) { @Serializable diff --git a/core/ui/src/main/kotlin/com/bagnolati/learnoflegends/core/ui/util/HtmlUtils.kt b/core/ui/src/main/kotlin/com/bagnolati/learnoflegends/core/ui/util/HtmlUtils.kt index 846b8d8..87ca705 100644 --- a/core/ui/src/main/kotlin/com/bagnolati/learnoflegends/core/ui/util/HtmlUtils.kt +++ b/core/ui/src/main/kotlin/com/bagnolati/learnoflegends/core/ui/util/HtmlUtils.kt @@ -54,7 +54,6 @@ import com.bagnolati.learnoflegends.core.model.HtmlTag.STATUS import com.bagnolati.learnoflegends.core.model.HtmlTag.TRUE_DAMAGE import com.bagnolati.learnoflegends.core.model.HtmlTag.UNDERLINE import com.bagnolati.learnoflegends.core.model.HtmlTag.UNIQUE -import com.bagnolati.learnoflegends.core.model.HtmlTag.values import com.bagnolati.learnoflegends.core.model.closeTag import com.bagnolati.learnoflegends.core.model.openTag import com.bagnolati.learnoflegends.core.ui.theme.colorBlue @@ -80,7 +79,7 @@ import com.bagnolati.learnoflegends.core.ui.theme.colorYellow fun String.fromHtmlToAnnotatedString(): AnnotatedString { var text = this@fromHtmlToAnnotatedString - values().forEach { tag -> + HtmlTag.values().forEach { tag -> var addBold = false var addItalic = false var addUnderLine = false diff --git a/feature/champion/src/main/kotlin/com/bagnolati/learnoflegends/feature/champion/ChampionScreen.kt b/feature/champion/src/main/kotlin/com/bagnolati/learnoflegends/feature/champion/ChampionScreen.kt index 61643fd..c1481fc 100644 --- a/feature/champion/src/main/kotlin/com/bagnolati/learnoflegends/feature/champion/ChampionScreen.kt +++ b/feature/champion/src/main/kotlin/com/bagnolati/learnoflegends/feature/champion/ChampionScreen.kt @@ -147,7 +147,7 @@ private fun Presentation( .padding(vertical = MaterialTheme.spacing.medium), ) { Text( - text = champion.name.fromHtmlToAnnotatedString(), + text = champion.name, style = MaterialTheme.typography.headlineLarge, modifier = Modifier.fillMaxWidth(), textAlign = TextAlign.Center ) diff --git a/feature/items/src/main/kotlin/com/bagnolati/learnoflegends/feature/items/ItemsScreen.kt b/feature/items/src/main/kotlin/com/bagnolati/learnoflegends/feature/items/ItemsScreen.kt index 82c38bd..b4efb5c 100644 --- a/feature/items/src/main/kotlin/com/bagnolati/learnoflegends/feature/items/ItemsScreen.kt +++ b/feature/items/src/main/kotlin/com/bagnolati/learnoflegends/feature/items/ItemsScreen.kt @@ -114,23 +114,6 @@ internal fun ItemsScreen( derivedStateOf { lazyItemsState.isScrollInProgress } } - val categories = listOf( - CONSUMABLE, - DISTRIBUTED, - TRINKET, - JUNGLE, - STARTER, - BOOT, - BASIC, - EPIC, - LEGENDARY, - MYTHIC, - ORNN, - EXCLUSIVE, - MINIONS_TURRET - ) - - // Collapse floating action button on scroll LaunchedEffect(isScrollInProgress) { if (!isScrollInProgress) delay(3.seconds) @@ -149,6 +132,37 @@ internal fun ItemsScreen( SortInfoRow(itemsUiState.sort) } + val categories = listOf( + CONSUMABLE, + DISTRIBUTED, + TRINKET, + JUNGLE, + STARTER, + BOOT, + BASIC, + EPIC, + LEGENDARY, + MYTHIC, + ORNN, + EXCLUSIVE, + MINIONS_TURRET + ) + + // Filter all items before for better performances + val consumableItems = remember(itemsUiState.items) { itemsUiState.items.filter { it.category == CONSUMABLE } } + val distributedItems = remember(itemsUiState.items) { itemsUiState.items.filter { it.category == DISTRIBUTED } } + val trinketItems = remember(itemsUiState.items) { itemsUiState.items.filter { it.category == TRINKET } } + val jungleItems = remember(itemsUiState.items) { itemsUiState.items.filter { it.category == JUNGLE } } + val starterItems = remember(itemsUiState.items) { itemsUiState.items.filter { it.category == STARTER } } + val bootItems = remember(itemsUiState.items) { itemsUiState.items.filter { it.category == BOOT } } + val basicItems = remember(itemsUiState.items) { itemsUiState.items.filter { it.category == BASIC } } + val epicItems = remember(itemsUiState.items) { itemsUiState.items.filter { it.category == EPIC } } + val legendaryItems = remember(itemsUiState.items) { itemsUiState.items.filter { it.category == LEGENDARY } } + val mythicItems = remember(itemsUiState.items) { itemsUiState.items.filter { it.category == MYTHIC } } + val ornnItems = remember(itemsUiState.items) { itemsUiState.items.filter { it.category == ORNN } } + val exclusiveItems = remember(itemsUiState.items) { itemsUiState.items.filter { it.category == EXCLUSIVE } } + val minionsTurretItems = remember(itemsUiState.items) { itemsUiState.items.filter { it.category == MINIONS_TURRET } } + LazyVerticalGrid( modifier = Modifier .fillMaxSize() @@ -173,7 +187,22 @@ internal fun ItemsScreen( selectItem(it) openItemDialog = true }, - items = itemsUiState.items.filter { it.category == category }, + items = when (category) { + STARTER -> starterItems + CONSUMABLE -> consumableItems + JUNGLE -> jungleItems + TRINKET -> trinketItems + DISTRIBUTED -> distributedItems + BOOT -> bootItems + BASIC -> basicItems + EPIC -> epicItems + LEGENDARY -> legendaryItems + MYTHIC -> mythicItems + ORNN -> ornnItems + EXCLUSIVE -> exclusiveItems + MINIONS_TURRET -> minionsTurretItems + else -> emptyList() + }, celleSize = cellSize, ) } diff --git a/gradlew b/gradlew index d71de43..90609c0 100755 --- a/gradlew +++ b/gradlew @@ -1,14 +1,19 @@ -#!/usr/bin/env sh +#!/usr/bin/ +env sh # + # Copyright 2015 the original author or authors. # + # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # + # https://www.apache.org/licenses/LICENSE-2.0 # + # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,103 +23,143 @@ ############################################################################## ## -## Gradle start up script for UN*X +## +Gradle start +up script +for +UN *X ## ############################################################################## # Attempt to set APP_HOME # Resolve links: $0 may be a link -PRG="$0" +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" +while [ -h "$PRG" ]; do +ls = +`ls -ld "$PRG"` +link = +`expr "$ls" : '.*-> \(.*\)$'` +if expr "$link" : '/.*' > /dev/ +null; +then + PRG = "$link" else -PRG=`dirname "$PRG"`"/$link" +PRG = +`dirname "$PRG"`"/$link" fi done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null - APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null +SAVED = "`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/ +null + APP_HOME = "`pwd -P`" +cd "$SAVED" >/dev/ +null - APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` + 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"' +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 "$*" +warn() { + echo + "$*" } -die () { +die() { + echo echo - echo "$*" + "$*" echo - exit 1 + exit + 1 } # OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) -cygwin=true -;; +cygwin = false +msys = false +darwin = false +nonstop = false +case "`uname`" +in + CYGWIN +* ) +cygwin = true;; Darwin* ) -darwin=true -;; +darwin = true;; MINGW* ) -msys=true -;; +msys = true;; NONSTOP* ) -nonstop=true -;; +nonstop = true;; esac - CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + 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 +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 +if [ ! -x "$JAVACMD" ]; +then + die +"ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME -Please set the JAVA_HOME variable in your environment to match the - location of your Java installation." +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" +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 - location of your Java installation." +Please set +the JAVA_HOME +variable in +your environment +to match +the + location +of your +Java installation +." 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" +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" + 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" @@ -122,64 +167,105 @@ 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\"" +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"` +if [ "$cygwin" = "true" -o "$msys" = "true" ]; +then + APP_HOME = +`cygpath --path --mixed "$APP_HOME"` +CLASSPATH = +`cygpath --path --mixed "$CLASSPATH"` -JAVACMD=`cygpath --unix "$JAVACMD"` +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="|" +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))" + OURCYGPATTERN = "(^($ROOTDIRS))" # Add a user-defined pattern to the cygpath arguments -if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" +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 + 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"` +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\"" +eval ` +echo args$i +`="\"$arg\"" fi - i=`expr $i + 1` + 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" ;; +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 " " + +save() { + for + i + do printf % s\\n + "$i" | sed + "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/"; + done + echo + " " } -APP_ARGS=`save "$@"` + +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" +eval set +-- +$DEFAULT_JVM_OPTS $JAVA_OPTS +$GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" exec "$JAVACMD" "$@" From 85c969b94a9027cefa8e50671b7fe4997253b9b3 Mon Sep 17 00:00:00 2001 From: "Thomas.B" Date: Mon, 23 Oct 2023 22:15:15 +0200 Subject: [PATCH 2/3] update version name --- app/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 3208cb5..53d7007 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -13,7 +13,7 @@ android { applicationId = "com.bagnolati.learnoflegends" versionCode = 5 - versionName = "1.2.0" // X.Y.Z; X = Major, Y = minor, Z = Patch level + versionName = "1.2.1" // X.Y.Z; X = Major, Y = minor, Z = Patch level testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { From 04f76b3777fb2c7793d2a0972541d9185360a22b Mon Sep 17 00:00:00 2001 From: "Thomas.B" Date: Mon, 23 Oct 2023 22:31:04 +0200 Subject: [PATCH 3/3] update gradlew --- gradlew | 276 +++++++++++++++++++------------------------------------- 1 file changed, 95 insertions(+), 181 deletions(-) diff --git a/gradlew b/gradlew index 90609c0..d71de43 100755 --- a/gradlew +++ b/gradlew @@ -1,19 +1,14 @@ -#!/usr/bin/ -env sh +#!/usr/bin/env sh # - # Copyright 2015 the original author or authors. # - # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # - # https://www.apache.org/licenses/LICENSE-2.0 # - # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -23,143 +18,103 @@ env sh ############################################################################## ## -## -Gradle start -up script -for -UN *X +## Gradle start up script for UN*X ## ############################################################################## # Attempt to set APP_HOME # Resolve links: $0 may be a link -PRG = "$0" +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" +while [ -h "$PRG" ] ; do +ls=`ls -ld "$PRG"` +link=`expr "$ls" : '.*-> \(.*\)$'` +if expr "$link" : '/.*' > /dev/null; then + PRG="$link" else -PRG = -`dirname "$PRG"`"/$link" +PRG=`dirname "$PRG"`"/$link" fi done -SAVED = "`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/ -null - APP_HOME = "`pwd -P`" -cd "$SAVED" >/dev/ -null +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null + APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null - APP_NAME = "Gradle" -APP_BASE_NAME = -`basename "$0"` + 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"' +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 - "$*" +warn () { + echo "$*" } -die() { - echo +die () { echo - "$*" + echo "$*" echo - exit - 1 + exit 1 } # OS specific support (must be 'true' or 'false'). -cygwin = false -msys = false -darwin = false -nonstop = false -case "`uname`" -in - CYGWIN -* ) -cygwin = true;; +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) +cygwin=true +;; Darwin* ) -darwin = true;; +darwin=true +;; MINGW* ) -msys = true;; +msys=true +;; NONSTOP* ) -nonstop = true;; +nonstop=true +;; esac - CLASSPATH = $APP_HOME / gradle / wrapper / gradle - wrapper.jar + 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 +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 +if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME -Please set -the JAVA_HOME -variable in -your environment -to match -the - location -of your -Java installation -." +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" +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 - location -of your -Java installation -." +Please set the JAVA_HOME variable in your environment to match the + location of your Java installation." 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" +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" + 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" @@ -167,105 +122,64 @@ 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\"" +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"` +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` +CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` -JAVACMD = -`cygpath --unix "$JAVACMD"` +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 = "|" +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))" + OURCYGPATTERN="(^($ROOTDIRS))" # Add a user-defined pattern to the cygpath arguments -if [ "$GRADLE_CYGPATTERN" != "" ]; -then - OURCYGPATTERN = "$OURCYGPATTERN|($GRADLE_CYGPATTERN)" +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 + 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"` +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\"" +eval `echo args$i`="\"$arg\"" fi - i = -` -expr $i -+ 1` + 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";; +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 - " " +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " } - -APP_ARGS = -`save "$@"` +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" +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" exec "$JAVACMD" "$@"