diff --git a/.gitignore b/.gitignore index 4430b926c..87c9c4c0e 100644 --- a/.gitignore +++ b/.gitignore @@ -102,3 +102,4 @@ app/src/litewalletDebug/google-services.json /app/debug/google-services.json /.idea/dictionaries/grunt.xml androidTestResultsUserPreferences.xml +.idea/deploymentTargetSelector.xml diff --git a/app/build.gradle b/app/build.gradle index 45dc85227..143cec762 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,6 +25,11 @@ android { buildConfig true viewBinding true } + bundle { + language { + enableSplit = false + } + } assetPacks = [":install_time_asset_pack",":fast_follow_asset_pack_01"] signingConfigs { release { @@ -61,10 +66,10 @@ android { defaultConfig { testInstrumentationRunner = 'androidx.test.runner.AndroidJUnitRunner' applicationId = 'com.loafwallet' - minSdkVersion 31 + minSdkVersion 29 targetSdkVersion 34 - versionCode 20241118 - versionName "v2.12.2" + versionCode 20241130 + versionName "v2.12.4" multiDexEnabled true archivesBaseName = "${versionName}(${versionCode})" @@ -78,8 +83,10 @@ android { // libraries Gradle should build and package with your APK. abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a' } + ndkVersion "25.1.8937393" externalNativeBuild { cmake { + version "3.22.1" arguments "-DANDROID_TOOLCHAIN=clang" } } @@ -365,6 +372,10 @@ dependencies { // Get the latest version from https://mvnrepository.com/artifact/com.appsflyer/af-android-sdk implementation 'com.appsflyer:af-android-sdk:6.15.1' + + //test + testImplementation "io.mockk:mockk:1.13.13" + testImplementation 'junit:junit:4.13.2' } diff --git a/app/src/main/java/com/breadwallet/entities/IntroLanguageResource.kt b/app/src/main/java/com/breadwallet/entities/IntroLanguageResource.kt index 4e1bc4781..073708662 100644 --- a/app/src/main/java/com/breadwallet/entities/IntroLanguageResource.kt +++ b/app/src/main/java/com/breadwallet/entities/IntroLanguageResource.kt @@ -7,8 +7,8 @@ class IntroLanguageResource { private val EUR: String = "EUR" private val RMB: String = "RMB" private val JPY: String = "JPY" - fun loadResources() : Array{ - return arrayOf ( + fun loadResources(): Array { + return arrayOf( IntroLanguage( Language.ENGLISH.code, Language.ENGLISH.title, @@ -115,4 +115,8 @@ class IntroLanguageResource { ) ) } + + fun findLanguageIndex(language: Language): Int { + return loadResources().map { intro -> intro.lang }.indexOf(language) + } } diff --git a/app/src/main/java/com/breadwallet/presenter/activities/intro/IntroActivity.java b/app/src/main/java/com/breadwallet/presenter/activities/intro/IntroActivity.java index 56a710d13..7fc659981 100644 --- a/app/src/main/java/com/breadwallet/presenter/activities/intro/IntroActivity.java +++ b/app/src/main/java/com/breadwallet/presenter/activities/intro/IntroActivity.java @@ -6,6 +6,7 @@ import android.content.Intent; import android.graphics.Point; import android.os.Bundle; +import android.os.Handler; import android.util.Log; import android.view.View; import android.widget.Button; @@ -14,13 +15,12 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.appsflyer.AppsFlyerLib; import com.breadwallet.entities.IntroLanguageResource; +import com.breadwallet.entities.Language; import com.breadwallet.presenter.activities.SetPinActivity; import com.breadwallet.presenter.entities.PartnerNames; import com.breadwallet.tools.adapter.CountryLanguageAdapter; import com.breadwallet.tools.util.LocaleHelper; -import com.google.android.material.snackbar.Snackbar; //import com.breadwallet.BuildConfig; import com.breadwallet.R; import com.breadwallet.presenter.activities.BreadActivity; @@ -78,6 +78,10 @@ protected void onCreate(Bundle savedInstanceState) { countryLanguageAdapter = new CountryLanguageAdapter(this, introLanguageResource.loadResources()); listLangRecyclerView.setAdapter(countryLanguageAdapter); + Language currentLanguage = LocaleHelper.Companion.getInstance().getCurrentLocale(); + int currentIndex = introLanguageResource.findLanguageIndex(currentLanguage); + countryLanguageAdapter.updateCenterPosition(currentIndex); + new Handler().post(() -> listLangRecyclerView.scrollToPosition(currentIndex)); listLangRecyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() { @Override public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) { @@ -90,12 +94,12 @@ public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newStat countryLanguageAdapter.updateCenterPosition(centerPosition); description.setText(countryLanguageAdapter.selectedDesc()); showDialogForItem(countryLanguageAdapter.selectedMessage()); + listLangRecyclerView.smoothScrollToPosition(centerPosition); } } } }); - listLangRecyclerView.setLayoutManager(layoutManager); setListeners(); diff --git a/app/src/main/java/com/breadwallet/tools/adapter/TransactionListAdapter.java b/app/src/main/java/com/breadwallet/tools/adapter/TransactionListAdapter.java index a2aa5acce..85d7cb8b7 100644 --- a/app/src/main/java/com/breadwallet/tools/adapter/TransactionListAdapter.java +++ b/app/src/main/java/com/breadwallet/tools/adapter/TransactionListAdapter.java @@ -1,4 +1,5 @@ package com.breadwallet.tools.adapter; + import android.app.Activity; import android.content.Context; import android.util.TypedValue; @@ -45,6 +46,7 @@ public class TransactionListAdapter extends RecyclerView.Adapter backUpFeed; private List itemFeed; private final int txType = 0; @@ -58,6 +60,9 @@ public TransactionListAdapter(Context mContext, List items) { this.syncingResId = R.layout.syncing_item; this.promptResId = R.layout.prompt_item; this.mContext = mContext; + + cachedOpsAll = Utils.fetchPartnerKey(mContext, PartnerNames.OPSALL); + items = new ArrayList<>(); init(items); } @@ -179,8 +184,7 @@ private void setTexts(final TxHolder convertView, int position) { Set outputAddressSet = new HashSet(Arrays.asList(item.getTo())); - final String opsString = Utils.fetchPartnerKey(mContext, PartnerNames.OPSALL); - List opsList = new ArrayList(Arrays.asList(opsString.split(","))); + List opsList = new ArrayList(Arrays.asList(cachedOpsAll.split(","))); Set opsSet = new HashSet<>(); opsSet.addAll(opsList); List outputAddresses = outputAddressSet.stream().filter(element -> !opsSet.contains(element)).collect(Collectors.toList()); diff --git a/app/src/main/java/com/breadwallet/tools/security/BRKeyStore.java b/app/src/main/java/com/breadwallet/tools/security/BRKeyStore.java index c8c7a7fcc..60b86a11c 100644 --- a/app/src/main/java/com/breadwallet/tools/security/BRKeyStore.java +++ b/app/src/main/java/com/breadwallet/tools/security/BRKeyStore.java @@ -27,6 +27,7 @@ import com.breadwallet.tools.util.TypesConverter; import com.breadwallet.tools.util.Utils; import com.breadwallet.wallet.BRWalletManager; +import com.google.firebase.crashlytics.FirebaseCrashlytics; import com.platform.entities.WalletInfo; import com.platform.tools.KVStoreManager; @@ -36,6 +37,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; +import java.security.GeneralSecurityException; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; import java.security.KeyStore; @@ -239,8 +241,11 @@ private synchronized static byte[] _getData(final Context context, String alias, if (encryptedData != null) { //new format data is present, good byte[] iv = retrieveEncryptedData(context, alias_iv); - if (iv == null) - throw new NullPointerException("iv is missing when data isn't: " + alias); + if (iv == null) { + NullPointerException exception = new NullPointerException("iv is missing when data isn't: " + alias); + FirebaseCrashlytics.getInstance().recordException(exception); + return null; + } Cipher outCipher; outCipher = Cipher.getInstance(NEW_CIPHER_ALGORITHM); @@ -251,8 +256,9 @@ private synchronized static byte[] _getData(final Context context, String alias, return decryptedData; } } catch (IllegalBlockSizeException | BadPaddingException e) { - Timber.e(e); - throw new RuntimeException("failed to decrypt data: " + e.getMessage()); + Timber.e(e, "failed to decrypt data: " + alias); + FirebaseCrashlytics.getInstance().recordException(e); + return null; } } //no new format data, get the old one and migrate it to the new format @@ -264,7 +270,9 @@ private synchronized static byte[] _getData(final Context context, String alias, if (!fileExists) { return null;/* file also not there, fine then */ } - Timber.e(new BRKeystoreErrorException("file is present but the key is gone: " + alias)); + BRKeystoreErrorException exception = new BRKeystoreErrorException("file is present but the key is gone: " + alias); + Timber.e(exception); + FirebaseCrashlytics.getInstance().recordException(exception); return null; } @@ -275,12 +283,15 @@ private synchronized static byte[] _getData(final Context context, String alias, removeAliasAndFiles(keyStore, alias, context); //report it if one exists and not the other. if (ivExists != aliasExists) { - Timber.e(new BRKeystoreErrorException("alias or iv isn't on the disk: " + alias + ", aliasExists:" + aliasExists)); - return null; + BRKeystoreErrorException exception = new BRKeystoreErrorException("alias or iv isn't on the disk: " + alias + ", aliasExists:" + aliasExists); + Timber.e(exception); + FirebaseCrashlytics.getInstance().recordException(exception); } else { - Timber.e(new BRKeystoreErrorException("!ivExists && !aliasExists: " + alias)); - return null; + BRKeystoreErrorException exception = new BRKeystoreErrorException("!ivExists && !aliasExists: " + alias); + Timber.e(exception); + FirebaseCrashlytics.getInstance().recordException(exception); } + return null; } byte[] iv = readBytesFromFile(getFilePath(alias_iv, context)); @@ -309,36 +320,14 @@ private synchronized static byte[] _getData(final Context context, String alias, storeEncryptedData(context, encryptedData, alias); return result; - } catch (InvalidKeyException e) { - if (e instanceof UserNotAuthenticatedException) { - /** user not authenticated, ask the system for authentication */ - Timber.e(e, "timber:_getData: showAuthenticationScreen: %s", alias); - showAuthenticationScreen(context, request_code, alias); - throw (UserNotAuthenticatedException) e; - } else { - Timber.e(e, "timber:_getData: InvalidKeyException"); - if (e instanceof KeyPermanentlyInvalidatedException) - showKeyInvalidated(context); - throw new UserNotAuthenticatedException(); //just to not go any further - } - } catch (IOException | CertificateException | KeyStoreException e) { - /** keyStore.load(null) threw the Exception, meaning the keystore is unavailable */ - Timber.d(e, "_getData: keyStore.load(null) threw the Exception, meaning the keystore is unavailable"); - if (e instanceof FileNotFoundException) { - Timber.e(new RuntimeException("the key is present but the phrase on the disk no", e), "_getData: File not found exception"); - throw new RuntimeException(e.getMessage()); - } else { - Timber.e(e); - throw new RuntimeException(e.getMessage()); - } - } catch (UnrecoverableKeyException | NoSuchAlgorithmException | NoSuchPaddingException | - InvalidAlgorithmParameterException e) { - /** if for any other reason the keystore fails, crash! */ - Timber.e(e, "timber:getData: error"); - throw new RuntimeException(e.getMessage()); - } catch (BadPaddingException | IllegalBlockSizeException | NoSuchProviderException e) { - Timber.e(e); - throw new RuntimeException(e.getMessage()); + } catch (UserNotAuthenticatedException e) { + Timber.e(e, "timber:_getData: showAuthenticationScreen: %s", alias); + showAuthenticationScreen(context, request_code, alias); + throw e; + } catch (GeneralSecurityException | IOException e) { + Timber.e(e, "timber:getData: error retrieving"); + FirebaseCrashlytics.getInstance().recordException(e); + throw new IllegalStateException(e); } finally { lock.unlock(); } diff --git a/app/src/main/java/com/breadwallet/tools/util/LocaleHelper.kt b/app/src/main/java/com/breadwallet/tools/util/LocaleHelper.kt index 4474f56e0..2c60a245e 100644 --- a/app/src/main/java/com/breadwallet/tools/util/LocaleHelper.kt +++ b/app/src/main/java/com/breadwallet/tools/util/LocaleHelper.kt @@ -3,6 +3,8 @@ package com.breadwallet.tools.util import android.content.Context import android.content.SharedPreferences import android.os.Build +import androidx.appcompat.app.AppCompatDelegate +import androidx.core.os.LocaleListCompat import androidx.preference.PreferenceManager import com.breadwallet.entities.Language import java.util.* @@ -34,6 +36,8 @@ class LocaleHelper private constructor() { Locale.setDefault(locale) val config = context.resources.configuration config.setLocale(locale) + val localeList = LocaleListCompat.forLanguageTags(language.code) + AppCompatDelegate.setApplicationLocales(localeList) return context.createConfigurationContext(config) } diff --git a/app/src/main/java/com/breadwallet/tools/util/Utils.java b/app/src/main/java/com/breadwallet/tools/util/Utils.java index 4c7087547..8e77006d8 100644 --- a/app/src/main/java/com/breadwallet/tools/util/Utils.java +++ b/app/src/main/java/com/breadwallet/tools/util/Utils.java @@ -303,10 +303,13 @@ else if (name == PartnerNames.PUSHERSTAGING) { /// Description: 1715876807 public static long tieredOpsFee(Context app, long sendAmount) { + double doubleRate = 83.000; double sendAmountDouble = new Double(String.valueOf(sendAmount)); String usIso = Currency.getInstance(new Locale("en", "US")).getCurrencyCode(); CurrencyEntity currency = CurrencyDataSource.getInstance(app).getCurrencyByIso(usIso); - double doubleRate = currency.rate; + if (currency != null) { + doubleRate = currency.rate; + } double usdInLTC = sendAmountDouble * doubleRate / 100_000_000.0; usdInLTC = Math.floor(usdInLTC * 100) / 100; diff --git a/app/src/main/res/layout/activity_intro.xml b/app/src/main/res/layout/activity_intro.xml index 813c79ba9..a194c783e 100644 --- a/app/src/main/res/layout/activity_intro.xml +++ b/app/src/main/res/layout/activity_intro.xml @@ -43,13 +43,13 @@ + resolutionStrategy.eachDependency {details -> // on below line we are getting to see the details using requested. def requested = details.requested // in below line we are requesting a group. @@ -29,7 +29,7 @@ buildscript { // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files - classpath 'com.google.gms:google-services:4.4.0' + classpath 'com.google.gms:google-services:4.4.2' classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9' diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 8c0fb64a8..2c3521197 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 87f66c4f2..9355b4155 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Sat Jan 20 19:11:29 EST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 91a7e269e..f5feea6d6 100755 --- a/gradlew +++ b/gradlew @@ -1,79 +1,130 @@ -#!/usr/bin/env bash +#!/bin/sh + +# +# 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. +# 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. +# 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/. +# ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +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 -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +# 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 +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum -warn ( ) { +warn () { echo "$*" -} +} >&2 -die ( ) { +die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# 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 -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- -APP_HOME="`pwd -P`" -cd "$SAVED" >&- - 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 @@ -82,83 +133,120 @@ 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" ] ; 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" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - # 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\"" + 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=$((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 -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +# 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, 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" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# 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 aec99730b..9b42019c7 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,4 +1,22 @@ -@if "%DEBUG%" == "" @echo off +@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 Gradle startup script for Windows @@ -8,26 +26,30 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal -@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= - 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% +@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 init +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>&2 goto fail @@ -35,54 +57,36 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +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. +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 goto fail -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - :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 %CMD_LINE_ARGS% +"%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 +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 -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% :mainEnd if "%OS%"=="Windows_NT" endlocal