diff --git a/ShoppingList/build.gradle b/ShoppingList/build.gradle
index f848a98..4479377 100644
--- a/ShoppingList/build.gradle
+++ b/ShoppingList/build.gradle
@@ -7,7 +7,7 @@ if (localPropertiesFile.exists()) {
}
android {
- compileSdkVersion rootProject.ext.compileSdkVersion
+ compileSdk targetSdkVersion
defaultConfig {
applicationId "org.openintents.shopping"
@@ -48,8 +48,8 @@ android {
def propertyFile = new File(projectDir, "build-private.properties")
compileOptions {
- sourceCompatibility = '1.8'
- targetCompatibility = '1.8'
+ sourceCompatibility = "1.8"
+ targetCompatibility = "1.8"
}
if (propertyFile.exists()) {
signingConfigs {
diff --git a/ShoppingList/src/main/java/org/openintents/convertcsv/common/ConvertCsvBaseActivity.java b/ShoppingList/src/main/java/org/openintents/convertcsv/common/ConvertCsvBaseActivity.java
index 78aa05c..86739ce 100644
--- a/ShoppingList/src/main/java/org/openintents/convertcsv/common/ConvertCsvBaseActivity.java
+++ b/ShoppingList/src/main/java/org/openintents/convertcsv/common/ConvertCsvBaseActivity.java
@@ -24,7 +24,6 @@
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor;
-import android.content.pm.PackageManager;
import android.database.Cursor;
import android.net.Uri;
import android.os.Bundle;
@@ -33,9 +32,7 @@
import android.os.ParcelFileDescriptor;
import android.preference.PreferenceManager;
import android.provider.OpenableColumns;
-import android.support.v4.content.ContextCompat;
import android.support.v7.app.AppCompatActivity;
-import android.text.TextUtils;
import android.util.Log;
import android.util.Xml.Encoding;
import android.view.LayoutInflater;
@@ -47,7 +44,6 @@
import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.CompoundButton.OnCheckedChangeListener;
-import android.widget.ImageButton;
import android.widget.ProgressBar;
import android.widget.Spinner;
import android.widget.TextView;
@@ -85,6 +81,7 @@ public class ConvertCsvBaseActivity extends AppCompatActivity {
protected static final int DIALOG_ID_PERMISSIONS = 4;
protected static final int DIALOG_DISTRIBUTION_START = 100; // MUST BE LAST
protected static final int REQUEST_CODE_PICK_FILE = 1;
+ protected static final int REQUEST_CODE_NEW_FILE = 2;
private final static String TAG = "ConvertCsvBaseActivity";
// This is the activity's message handler that the worker thread can use to communicate
// with the main thread. This may be null if the activity is paused and could change, so
@@ -94,8 +91,8 @@ public class ConvertCsvBaseActivity extends AppCompatActivity {
static boolean smHasWorkerThread;
// Max value for the progress bar.
static int smProgressMax;
- protected TextView mFilePathView;
- protected TextView mFileNameView;
+ protected String mFilePath;
+ protected String mFileName;
protected TextView mConvertInfo;
protected Spinner mSpinner;
protected String PREFERENCE_FILENAME;
@@ -205,24 +202,7 @@ private void switchToMainLayout() {
setPreferencesUsed();
- mFilePathView = findViewById(R.id.file_path);
- mFileNameView = findViewById(R.id.file_name);
-
SharedPreferences pm = PreferenceManager.getDefaultSharedPreferences(this);
- String filepath = pm.getString(PREFERENCE_FILENAME, "");
-
- if (TextUtils.isEmpty(filepath)) {
- setFileUriUnknown();
- } else {
- setFileUri(Uri.parse(filepath));
- }
-
-
- ImageButton buttonFileManager = findViewById(R.id.new_document);
- buttonFileManager.setOnClickListener(arg0 -> openFileManagerForNewDocument());
-
- buttonFileManager = findViewById(R.id.open_document);
- buttonFileManager.setOnClickListener(arg0 -> openFileManagerForChoosingDocument());
mConvertInfo = findViewById(R.id.convert_info);
@@ -373,7 +353,7 @@ public void startImport() {
if (importPolicy == IMPORT_POLICY_RESTORE) {
showDialog(DIALOG_ID_WARN_RESTORE_POLICY);
} else {
- startImportPostCheck();
+ openFileManagerForChoosingDocument();
}
}
@@ -383,7 +363,6 @@ public void startImportPostCheck() {
//getContentResolver().delete(Shopping.Items.CONTENT_URI, null, null);
//getContentResolver().delete(Shopping.Lists.CONTENT_URI, null, null);
-
String fileName = getFilenameAndSavePreferences();
Log.i(TAG, "Importing..." + fileName);
@@ -422,7 +401,6 @@ public void run() {
reader.close();
dispatchSuccess(R.string.import_finished);
- onImportFinished();
} catch (FileNotFoundException e) {
dispatchError(R.string.error_file_not_found);
@@ -467,19 +445,23 @@ public int getDocumentSize(Uri uri) {
}
public String getDocumentName(Uri uri) {
- Cursor cursor = getContentResolver()
- .query(uri, null, null, null, null, null);
-
- String displayName = uri.getLastPathSegment();
+ String displayName = "";
try {
- if (cursor != null && cursor.moveToFirst()) {
- displayName = cursor.getString(
- cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME));
- }
- } finally {
- if (cursor != null) {
- cursor.close();
+ Cursor cursor = getContentResolver()
+ .query(uri, null, null, null, null, null);
+
+ displayName = uri.getLastPathSegment();
+ try {
+ if (cursor != null && cursor.moveToFirst()) {
+ displayName = cursor.getString(
+ cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME));
+ }
+ } finally {
+ if (cursor != null) {
+ cursor.close();
+ }
}
+ } catch (Exception e) {
}
return displayName;
}
@@ -531,7 +513,7 @@ public void onImportFinished() {
public void startExport() {
Log.i(TAG, "Exporting...");
- doExport();
+ openFileManagerForNewDocument();
}
public void doExport() {
@@ -584,7 +566,7 @@ public void doExport(Writer writer) throws IOException {
*/
public String getFilenameAndSavePreferences() {
- String fileName = mFilePathView.getText().toString();
+ String fileName = mFilePath;
SharedPreferences prefs = PreferenceManager
.getDefaultSharedPreferences(this);
@@ -721,18 +703,16 @@ private void saveBooleanPreference(String preference, boolean value) {
private void openFileManagerForNewDocument() {
- String fileName = mFileNameView.getText().toString();
- String filePath = mFilePathView.getText().toString();
- if (TextUtils.isEmpty(filePath)) {
- fileName = DEFAULT_FILENAME;
- }
+ String fileName = "";
+ String filePath = DEFAULT_FILENAME;
+
Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT);
intent.addCategory(Intent.CATEGORY_OPENABLE);
intent.setType("text/*");
intent.putExtra(Intent.EXTRA_TITLE, fileName);
try {
- startActivityForResult(intent, REQUEST_CODE_PICK_FILE);
+ startActivityForResult(intent, REQUEST_CODE_NEW_FILE);
} catch (ActivityNotFoundException e) {
showDialog(DIALOG_ID_NO_FILE_MANAGER_AVAILABLE);
}
@@ -740,7 +720,7 @@ private void openFileManagerForNewDocument() {
private void openFileManagerForChoosingDocument() {
- String fileName = mFilePathView.getText().toString();
+ String fileName = "";
Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
@@ -781,6 +761,17 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
Log.i(TAG, "onActivityResult");
switch (requestCode) {
+ case REQUEST_CODE_NEW_FILE:
+ if (resultCode == RESULT_OK && data != null) {
+ Uri documentUri = data.getData();
+ if (documentUri != null) {
+ setFileUri(documentUri);
+ } else {
+ setFileUriUnknown();
+ }
+ doExport();
+ }
+ break;
case REQUEST_CODE_PICK_FILE:
if (resultCode == RESULT_OK && data != null) {
Uri documentUri = data.getData();
@@ -789,19 +780,19 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
} else {
setFileUriUnknown();
}
-
+ startImportPostCheck();
}
break;
}
}
private void setFileUriUnknown() {
- mFileNameView.setText(getString(R.string.unknown_document));
- mFilePathView.setText("");
+ mFileName = getString(R.string.unknown_document);
+ mFilePath = "";
}
private void setFileUri(Uri documentUri) {
- mFileNameView.setText(getDocumentName(documentUri));
- mFilePathView.setText(documentUri.toString());
+ mFileName = getDocumentName(documentUri);
+ mFilePath = documentUri.toString();
}
}
diff --git a/ShoppingList/src/main/java/org/openintents/convertcsv/shoppinglist/ConvertCsvActivity.java b/ShoppingList/src/main/java/org/openintents/convertcsv/shoppinglist/ConvertCsvActivity.java
index 5e00dc9..06b55a8 100644
--- a/ShoppingList/src/main/java/org/openintents/convertcsv/shoppinglist/ConvertCsvActivity.java
+++ b/ShoppingList/src/main/java/org/openintents/convertcsv/shoppinglist/ConvertCsvActivity.java
@@ -120,10 +120,6 @@ public void doImport(Reader reader) throws IOException,
@Override
public void onImportFinished() {
- Intent i = new Intent(Intent.ACTION_VIEW);
- Uri uri = ShoppingContract.Lists.CONTENT_URI.buildUpon().appendPath(String.valueOf(getCurrentListId())).build();
- i.setData(uri);
- startActivity(i);
}
@Override
diff --git a/ShoppingList/src/main/java/org/openintents/shopping/ui/ShoppingActivity.java b/ShoppingList/src/main/java/org/openintents/shopping/ui/ShoppingActivity.java
index 8fa2d9d..9577c82 100644
--- a/ShoppingList/src/main/java/org/openintents/shopping/ui/ShoppingActivity.java
+++ b/ShoppingList/src/main/java/org/openintents/shopping/ui/ShoppingActivity.java
@@ -1597,8 +1597,6 @@ public boolean onCreateOptionsMenu(Menu menu) {
menu.add(0, MENU_SYNC_WEAR, 0, R.string.sync_wear);
- menu.add(0, MENU_CONVERT_CSV, 0, R.string.convert_csv);
-
// Add distribution menu items last.
mDistribution.onCreateOptionsMenu(menu);
diff --git a/ShoppingList/src/main/res/layout/convert.xml b/ShoppingList/src/main/res/layout/convert.xml
index aac22b5..c17ead3 100644
--- a/ShoppingList/src/main/res/layout/convert.xml
+++ b/ShoppingList/src/main/res/layout/convert.xml
@@ -37,49 +37,6 @@
android:textAppearance="?android:attr/textAppearanceMedium"
/>
-
-
-
-
-
-
-
-
-
-
-
Convert CSV to Shopping list
Convert all notes
Convert all shopping lists
- Convert list \'%s\'
+ Convert list %s
File path
New file
Choose file
diff --git a/ShoppingListLibrary/build.gradle b/ShoppingListLibrary/build.gradle
index c08a1c3..4f7eaf5 100644
--- a/ShoppingListLibrary/build.gradle
+++ b/ShoppingListLibrary/build.gradle
@@ -14,4 +14,8 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.cfg'
}
}
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_8
+ targetCompatibility JavaVersion.VERSION_1_8
+ }
}
diff --git a/build.gradle b/build.gradle
index eef39f8..70a97f2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.0.0'
+ classpath 'com.android.tools.build:gradle:4.2.2'
}
}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 62d4c05..7454180 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 cc36ca5..ffed3a2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionSha256Sum=c9910513d0eed63cd8f5c7fec4cb4a05731144770104a0871234a4edc3ba3cef
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index fbd7c51..c53aefa 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
#
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
#
##############################################################################
-##
-## 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/master/subprojects/plugins/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 ;;
+ esac
done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
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 "$*"
-}
+} >&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
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
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,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
- JAVACMD="java"
+ JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ 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"
- 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*)
+ MAX_FD=$( ulimit -H -n ) ||
+ warn "Could not query maximum file descriptor limit"
+ esac
+ case $MAX_FD in #(
+ '' | soft) :;; #(
+ *)
+ 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" )
+ 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 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;
+# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# shell script including quotes and variable substitutions, so put them in
+# double quotes to make sure that they get re-expanded; and
+# * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+ "-Dorg.gradle.appname=$APP_BASE_NAME" \
+ -classpath "$CLASSPATH" \
+ org.gradle.wrapper.GradleWrapperMain \
+ "$@"
+
+# 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.
+#
-# 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 -- $(
+ 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 a9f778a..ac1b06f 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ 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%
@@ -64,21 +64,6 @@ echo location of your Java installation.
goto fail
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_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=%*
-
:execute
@rem Setup the command line
@@ -86,7 +71,7 @@ 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