diff --git a/app/build.gradle b/app/build.gradle index 78d2fac..dce0baf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,18 +2,18 @@ plugins { id 'com.android.application' id 'org.jetbrains.kotlin.android' id 'kotlin-android' - id 'kotlin-android-extensions' + id 'com.google.gms.google-services' id 'com.google.firebase.crashlytics' } android { - compileSdk 33 + compileSdk 36 defaultConfig { applicationId 'app.screenreader' minSdk 24 - targetSdk 33 + targetSdk 36 versionCode 9 versionName '1.1.0' } @@ -29,11 +29,11 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '17' } namespace 'app.screenreader' } diff --git a/app/src/main/java/app/screenreader/extensions/_Context.kt b/app/src/main/java/app/screenreader/extensions/_Context.kt index 317d6a1..956dd7a 100644 --- a/app/src/main/java/app/screenreader/extensions/_Context.kt +++ b/app/src/main/java/app/screenreader/extensions/_Context.kt @@ -1,8 +1,13 @@ package app.screenreader.extensions +import android.annotation.SuppressLint import android.app.Activity +import android.content.BroadcastReceiver import android.content.Context +import android.content.IntentFilter import android.net.Uri +import android.os.Build +import android.os.Build.VERSION.SDK_INT import android.os.LocaleList import android.text.SpannableString import android.text.Spanned @@ -164,4 +169,23 @@ fun Context.openWebsite(uri: Uri) { .build() intent.launchUrl(this, uri) +} + +@SuppressLint("UnspecifiedRegisterReceiverFlag") +fun Context.registerBroadcastReceiver( + broadcastReceiver: BroadcastReceiver, + intentFilter: IntentFilter?, + exported: Boolean = true, +) { + + when { + SDK_INT >= Build.VERSION_CODES.TIRAMISU -> { + val exportedFlag = + if (exported) Context.RECEIVER_EXPORTED else Context.RECEIVER_NOT_EXPORTED + + registerReceiver(broadcastReceiver, intentFilter, exportedFlag) + } + + else -> registerReceiver(broadcastReceiver, intentFilter) + } } \ No newline at end of file diff --git a/app/src/main/java/app/screenreader/tabs/actions/ActionActivity.kt b/app/src/main/java/app/screenreader/tabs/actions/ActionActivity.kt index bd0995a..56bb5f7 100644 --- a/app/src/main/java/app/screenreader/tabs/actions/ActionActivity.kt +++ b/app/src/main/java/app/screenreader/tabs/actions/ActionActivity.kt @@ -3,16 +3,15 @@ package app.screenreader.tabs.actions import android.accessibilityservice.AccessibilityServiceInfo import android.content.Intent import android.text.SpannableString +import android.widget.ScrollView import app.screenreader.R import app.screenreader.extensions.doGetAction -import app.screenreader.extensions.identifier import app.screenreader.extensions.showDialog import app.screenreader.helpers.Accessibility import app.screenreader.helpers.Events import app.screenreader.model.Action import app.screenreader.views.actions.ActionViewCallback import app.screenreader.widgets.ToolbarActivity -import kotlinx.android.synthetic.main.activity_action.* /** * Created by Jan Jaap de Groot on 16/11/2020 @@ -22,6 +21,7 @@ class ActionActivity: ToolbarActivity(), ActionViewCallback { private val startTime = System.currentTimeMillis() + private val scrollView get() = findViewById(R.id.scrollView) private val action: Action by lazy { intent.doGetAction() ?: Action.SELECT } diff --git a/app/src/main/java/app/screenreader/tabs/gestures/GestureActivity.kt b/app/src/main/java/app/screenreader/tabs/gestures/GestureActivity.kt index 5bd6e8b..7467269 100644 --- a/app/src/main/java/app/screenreader/tabs/gestures/GestureActivity.kt +++ b/app/src/main/java/app/screenreader/tabs/gestures/GestureActivity.kt @@ -9,6 +9,7 @@ import android.util.Log import android.view.Menu import android.view.MenuItem import android.view.View +import android.widget.FrameLayout import androidx.appcompat.app.AlertDialog import app.screenreader.R import app.screenreader.extensions.* @@ -20,7 +21,6 @@ import app.screenreader.services.ScreenReaderService import app.screenreader.views.gestures.GestureView import app.screenreader.views.gestures.GestureViewCallback import app.screenreader.widgets.ToolbarActivity -import kotlinx.android.synthetic.main.activity_gesture.* import java.util.* import kotlin.concurrent.schedule @@ -51,6 +51,12 @@ class GestureActivity: ToolbarActivity(), GestureViewCallback { private var errorCount = 0 private var finished = false + private val container get() = findViewById(R.id.container) + private val titleTextView get() = findViewById(R.id.titleTextView) + private val descriptionTextView get() = findViewById(R.id.descriptionTextView) + private val gestureImageView get() = findViewById(R.id.gestureImageView) + private val feedbackTextView get() = findViewById(R.id.feedbackTextView) + private val isPracticing: Boolean get() = gestures.isNotEmpty() @@ -102,7 +108,7 @@ class GestureActivity: ToolbarActivity(), GestureViewCallback { // Listen to events from ScreenReaderService val filter = IntentFilter() filter.addAction(Constants.SERVICE_ACTION) - registerReceiver(receiver, filter) + registerBroadcastReceiver(receiver, filter) } override fun onCreateOptionsMenu(menu: Menu?): Boolean { diff --git a/app/src/main/java/app/screenreader/views/actions/CopyActionView.kt b/app/src/main/java/app/screenreader/views/actions/CopyActionView.kt index 6c68475..768fba4 100644 --- a/app/src/main/java/app/screenreader/views/actions/CopyActionView.kt +++ b/app/src/main/java/app/screenreader/views/actions/CopyActionView.kt @@ -4,7 +4,7 @@ import android.content.ClipboardManager import android.content.Context import app.screenreader.R import app.screenreader.model.Action -import kotlinx.android.synthetic.main.action_copy.view.* +import app.screenreader.views.TrainingField /** * Created by Jan Jaap de Groot on 23/11/2020 @@ -24,7 +24,7 @@ class CopyActionView(context: Context): ActionView( if (clip.itemCount > 0) { val text = clip.getItemAt(0).text - if (trainingField.text.toString().contains(text, false)) { + if (findViewById(R.id.trainingField).text.toString().contains(text, false)) { correct() } else { incorrect(R.string.action_copy_incorrect) diff --git a/app/src/main/java/app/screenreader/views/actions/PasteActionView.kt b/app/src/main/java/app/screenreader/views/actions/PasteActionView.kt index 3f585fa..abd2b82 100644 --- a/app/src/main/java/app/screenreader/views/actions/PasteActionView.kt +++ b/app/src/main/java/app/screenreader/views/actions/PasteActionView.kt @@ -2,9 +2,9 @@ package app.screenreader.views.actions import android.content.Context import androidx.core.widget.addTextChangedListener -import kotlinx.android.synthetic.main.action_paste.view.* import app.screenreader.R import app.screenreader.model.Action +import app.screenreader.views.TrainingField /** * Created by Jan Jaap de Groot on 23/11/2020 @@ -17,7 +17,7 @@ class PasteActionView(context: Context) : ActionView( ) { init { - trainingField.addTextChangedListener(beforeTextChanged = { _, _, _, after -> + findViewById(R.id.trainingField).addTextChangedListener(beforeTextChanged = { _, _, _, after -> if (after > 1) { correct() } diff --git a/app/src/main/java/app/screenreader/views/actions/SelectionActionView.kt b/app/src/main/java/app/screenreader/views/actions/SelectionActionView.kt index 63ba8a3..3fe1978 100644 --- a/app/src/main/java/app/screenreader/views/actions/SelectionActionView.kt +++ b/app/src/main/java/app/screenreader/views/actions/SelectionActionView.kt @@ -1,7 +1,6 @@ package app.screenreader.views.actions import android.content.Context -import kotlinx.android.synthetic.main.action_selection.view.* import app.screenreader.R import app.screenreader.model.Action import app.screenreader.views.TrainingField @@ -17,7 +16,7 @@ class SelectionActionView(context: Context) : ActionView( ), TrainingField.OnSelectionChangedListener { init { - trainingField.callback = this + findViewById(R.id.trainingField).callback = this } override fun onSelectionChanged(start: Int, end: Int) { diff --git a/app/src/main/java/app/screenreader/views/gestures/SwipeGestureView.kt b/app/src/main/java/app/screenreader/views/gestures/SwipeGestureView.kt index ad94b6c..d9025d7 100644 --- a/app/src/main/java/app/screenreader/views/gestures/SwipeGestureView.kt +++ b/app/src/main/java/app/screenreader/views/gestures/SwipeGestureView.kt @@ -82,7 +82,7 @@ open class SwipeGestureView( private val THRESHOLD = 15 private var path = arrayListOf() - override fun onScroll(e1: MotionEvent, e2: MotionEvent, distanceX: Float, distanceY: Float): Boolean { + override fun onScroll(e1: MotionEvent?, e2: MotionEvent, distanceX: Float, distanceY: Float): Boolean { Log.d(TAG, "onScroll, distanceX: $distanceX, distanceY: $distanceY") // Determine direction @@ -127,7 +127,7 @@ open class SwipeGestureView( return super.onScroll(e1, e2, distanceX, distanceY) } - override fun onFling(e1: MotionEvent, e2: MotionEvent, velocityX: Float, velocityY: Float): Boolean { + override fun onFling(e1: MotionEvent?, e2: MotionEvent, velocityX: Float, velocityY: Float): Boolean { Log.d(TAG, "onFling, velocityX: $velocityX, velocityY: $velocityY") if (path.isNotEmpty()) { diff --git a/app/src/main/java/app/screenreader/widgets/ListFragment.kt b/app/src/main/java/app/screenreader/widgets/ListFragment.kt index 49cebe6..463acb6 100644 --- a/app/src/main/java/app/screenreader/widgets/ListFragment.kt +++ b/app/src/main/java/app/screenreader/widgets/ListFragment.kt @@ -3,12 +3,13 @@ package app.screenreader.widgets import android.os.Bundle import android.view.View import androidx.recyclerview.widget.DividerItemDecoration +import androidx.recyclerview.widget.RecyclerView import app.screenreader.R import com.hannesdorfmann.adapterdelegates4.ListDelegationAdapter -import kotlinx.android.synthetic.main.view_list.* abstract class ListFragment: BaseFragment() { + private val recyclerView get() = view?.findViewById(R.id.recyclerView) override fun getLayoutId(): Int { return R.layout.view_list } @@ -22,10 +23,10 @@ abstract class ListFragment: BaseFragment() { super.onViewCreated(view, savedInstanceState) adapter.items = items - recyclerView.adapter = adapter + recyclerView?.adapter = adapter if (decoration) { - recyclerView.addItemDecoration(DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)) + recyclerView?.addItemDecoration(DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)) } } } \ No newline at end of file diff --git a/build.gradle b/build.gradle index 02eec65..174d152 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '8.1.1' apply false - id 'com.android.library' version '8.1.1' apply false + id 'com.android.application' version '8.13.0' apply false + id 'com.android.library' version '8.13.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.10' apply false id 'com.google.gms.google-services' version '4.3.15' apply false id 'com.google.firebase.crashlytics' version '2.9.9' apply false diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c..d64cd49 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 218a1a0..37f853b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Wed Feb 16 13:49:22 CET 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0..1aa94a4 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,99 @@ # ############################################################################## -## -## 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/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_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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +119,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,88 +130,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" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + 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, 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, 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 107acd3..93e3f59 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal 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% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set 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. @@ -75,13 +76,15 @@ set CLASSPATH=%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 :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