diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 61a9130c..b589d56e 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml new file mode 100644 index 00000000..0c0c3383 --- /dev/null +++ b/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/migrations.xml b/.idea/migrations.xml new file mode 100644 index 00000000..f8051a6f --- /dev/null +++ b/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index d5d35ec4..0ad17cbd 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,7 @@ - + + diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460d..00000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 9b2e330b..278ec154 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,15 +1,16 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 30 - buildToolsVersion '30.0.3' + namespace "com.gazlaws.codeboard" + compileSdkVersion 34 + buildToolsVersion '34.0.0' defaultConfig { applicationId "com.gazlaws.codeboard" minSdkVersion 23 - targetSdkVersion 30 - versionCode 20 - versionName "6.0.0" + targetSdkVersion 34 + versionCode 21 + versionName "6.0.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -41,32 +42,32 @@ repositories { dependencies { - api 'androidx.appcompat:appcompat:1.2.0' + api 'androidx.appcompat:appcompat:1.6.1' api 'androidx.legacy:legacy-support-v13:1.0.0' - api 'androidx.preference:preference:1.1.1' + api 'androidx.preference:preference:1.2.1' - implementation 'com.google.android.material:material:1.4.0-alpha02' + implementation 'com.google.android.material:material:1.11.0' //https://github.com/AppIntro/AppIntro - implementation 'com.github.AppIntro:AppIntro:6.1.0' + implementation 'com.github.AppIntro:AppIntro:6.3.1' //Colour picker implementation 'com.pes.materialcolorpicker:library:1.2.5' // Required for local unit tests (JUnit 4 framework) - testImplementation 'junit:junit:4.12' + testImplementation 'junit:junit:4.13.2' // Required for instrumented tests - implementation 'androidx.annotation:annotation:1.2.0' - androidTestImplementation 'androidx.annotation:annotation:1.2.0' + implementation 'androidx.annotation:annotation:1.7.1' + androidTestImplementation 'androidx.annotation:annotation:1.7.1' // Core library - androidTestImplementation 'androidx.test:core:1.3.0' + androidTestImplementation 'androidx.test:core:1.5.0' // AndroidJUnitRunner and JUnit Rules - androidTestImplementation 'androidx.test:runner:1.3.0' + androidTestImplementation 'androidx.test:runner:1.5.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.5' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b558908e..26c37854 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,9 @@ + + + android:permission="android.permission.BIND_INPUT_METHOD" + android:exported="true"> @@ -27,7 +30,7 @@ + android:exported="true"> diff --git a/app/src/main/java/com/gazlaws/codeboard/CodeBoardIME.java b/app/src/main/java/com/gazlaws/codeboard/CodeBoardIME.java index 96192c56..6fbba24f 100644 --- a/app/src/main/java/com/gazlaws/codeboard/CodeBoardIME.java +++ b/app/src/main/java/com/gazlaws/codeboard/CodeBoardIME.java @@ -1,5 +1,7 @@ package com.gazlaws.codeboard; +import android.Manifest; +import android.annotation.SuppressLint; import android.app.NotificationChannel; import android.app.NotificationManager; import android.app.PendingIntent; @@ -8,6 +10,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; +import android.content.pm.PackageManager; import android.content.res.Configuration; import android.graphics.Color; import android.inputmethodservice.InputMethodService; @@ -16,6 +19,7 @@ import android.os.Handler; import android.os.IBinder; import android.os.Looper; +import android.os.ResultReceiver; import android.os.Vibrator; import android.util.Log; import android.view.KeyEvent; @@ -26,8 +30,10 @@ import android.view.inputmethod.InputMethodManager; import android.media.MediaPlayer; // for keypress sound +import androidx.core.app.ActivityCompat; import androidx.core.app.NotificationCompat; import androidx.core.app.NotificationManagerCompat; +import androidx.core.app.RemoteInput; import androidx.core.graphics.ColorUtils; import com.gazlaws.codeboard.layout.Box; @@ -46,6 +52,8 @@ import java.util.TimerTask; import static android.content.ClipDescription.MIMETYPE_TEXT_PLAIN; +import static android.view.inputmethod.InputMethodManager.HIDE_IMPLICIT_ONLY; +import static android.view.inputmethod.InputMethodManager.HIDE_NOT_ALWAYS; /*Created by Ruby(aka gazlaws) on 13/02/2016. */ @@ -73,7 +81,7 @@ public void onKey(int primaryCode, int[] KeyCodes) { //NOTE: Long press goes second, this is onDown InputConnection ic = getCurrentInputConnection(); char code = (char) primaryCode; - Log.i(getClass().getSimpleName(), "onKey: " + primaryCode); + Log.d(getClass().getSimpleName(), "onKey: " + primaryCode); switch (primaryCode) { //First handle cases that don't use shift/ctrl meta modifiers @@ -274,7 +282,7 @@ public void onKey(int primaryCode, int[] KeyCodes) { } if (ke != 0) { - Log.i(getClass().getSimpleName(), "onKey: keyEvent " + ke); + Log.d(getClass().getSimpleName(), "onKey: keyEvent " + ke); /* * The if statement was added in order to prevent the space button @@ -284,7 +292,9 @@ public void onKey(int primaryCode, int[] KeyCodes) { * and afterwards produce the right output to the screen. * TODO: Investigate whether KeyEvent.ACTION_UP is still required. */ - if (primaryCode != 32) { ic.sendKeyEvent (new KeyEvent (0, 0, KeyEvent.ACTION_DOWN, ke, 0, meta)); } + if (primaryCode != 32) { + ic.sendKeyEvent(new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, ke, 0, meta)); + } ic.sendKeyEvent(new KeyEvent(0, 0, KeyEvent.ACTION_UP, ke, 0, meta)); } else { @@ -341,6 +351,19 @@ public void run() { }, ViewConfiguration.getLongPressTimeout()); } + @Override + public void onExtractingInputChanged(EditorInfo ei){ + Log.d(getClass().getSimpleName(), "onExtractingInputChanged: "); + } + @Override + public void requestHideSelf(int flags){ + int new_flag = HIDE_IMPLICIT_ONLY; + new_flag = flags; + Log.d(getClass().getSimpleName(), "requestHideSelf: "+new_flag + ","+ flags); + // do nothing + super.requestHideSelf(new_flag); + } + @Override public void onWindowHidden() { super.onWindowHidden(); @@ -361,10 +384,10 @@ public void onRelease(int primaryCode) { * If it was, we don't do anything, * but If it wasn't, we print a "space" to the screen. */ - if ((primaryCode == 32) && (! longPressedSpaceButton)) { + if ((primaryCode == 32) && (!longPressedSpaceButton)) { - InputConnection ic = getCurrentInputConnection (); - ic.commitText (String.valueOf ((char) primaryCode), 1); + InputConnection ic = getCurrentInputConnection(); + ic.commitText(String.valueOf((char) primaryCode), 1); } longPressedSpaceButton = false; @@ -671,6 +694,7 @@ private void createNotificationChannel() { private static final int NOTIFICATION_ONGOING_ID = 1001; //Code from Hacker keyboard's source + @SuppressLint("MissingPermission") private void setNotification(boolean visible) { NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); @@ -682,19 +706,55 @@ private void setNotification(boolean visible) { createNotificationChannel(); mNotificationReceiver = new NotificationReceiver(this); final IntentFilter pFilter = new IntentFilter(NotificationReceiver.ACTION_SHOW); - pFilter.addAction(NotificationReceiver.ACTION_SETTINGS); - registerReceiver(mNotificationReceiver, pFilter); - Intent notificationIntent = new Intent(NotificationReceiver.ACTION_SHOW); - PendingIntent contentIntent = - PendingIntent.getBroadcast(getApplicationContext(), 1, notificationIntent, 0); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + registerReceiver(mNotificationReceiver, pFilter, Context.RECEIVER_NOT_EXPORTED); + } else { + registerReceiver(mNotificationReceiver, pFilter); + } + + + Intent imeIntent = new Intent(NotificationReceiver.ACTION_SHOW); + PendingIntent imePendingIntent = + PendingIntent.getBroadcast(getApplicationContext(), + 1, imeIntent, PendingIntent.FLAG_IMMUTABLE); - Intent configIntent = new Intent(NotificationReceiver.ACTION_SETTINGS); - PendingIntent configPendingIntent = - PendingIntent.getBroadcast(getApplicationContext(), 2, configIntent, 0); + // BUG: IM closes when notification drawer is closed + // try making a input field here? + // Key for the string that's delivered in the action's intent. + String KEY_TEXT_REPLY = "key_text_reply"; + RemoteInput remoteInput = new RemoteInput.Builder(KEY_TEXT_REPLY) + .setLabel("Now click first icon") + .build(); + + + // Build a PendingIntent for the keyboard action to trigger first + int flags = PendingIntent.FLAG_MUTABLE; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { + flags = PendingIntent.FLAG_MUTABLE | PendingIntent.FLAG_ALLOW_UNSAFE_IMPLICIT_INTENT; + } + PendingIntent replyPendingIntent = + PendingIntent.getBroadcast(getApplicationContext(), + 2, + imeIntent, + flags); + + + // Create the reply action and add the remote input. + NotificationCompat.Action action = + new NotificationCompat.Action.Builder(R.drawable.icon_large, + getString(R.string.notification_action_open_keyboard_workaround), replyPendingIntent) + .addRemoteInput(remoteInput) + .build(); + + Intent settingsIntent = new Intent(this, MainActivity.class); + settingsIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); + PendingIntent settingsPendingIntent = + PendingIntent.getActivity(this,0 + , settingsIntent, PendingIntent.FLAG_IMMUTABLE); String title = "Show Codeboard Keyboard"; - String body = "Select this to open the keyboard. Disable in settings."; + String body = "Select this to open the keyboard. Disable in settings. You may have to fix open the fix as a workaround for newer Android versions"; NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(this, NOTIFICATION_CHANNEL_ID) @@ -704,17 +764,17 @@ private void setNotification(boolean visible) { .setTicker(text) .setContentTitle(title) .setContentText(body) - .setContentIntent(contentIntent) + .setContentIntent(imePendingIntent) .setOngoing(true) .addAction(R.drawable.icon_large, getString(R.string.notification_action_open_keyboard), - contentIntent) + imePendingIntent) .addAction(R.drawable.icon_large, getString(R.string.notification_action_settings), - configPendingIntent) + settingsPendingIntent) + .addAction(action) .setPriority(NotificationCompat.PRIORITY_DEFAULT); NotificationManagerCompat notificationManager = NotificationManagerCompat.from(this); - // notificationId is a unique int for each notification that you must define notificationManager.notify(NOTIFICATION_ONGOING_ID, mBuilder.build()); } else if (!visible && mNotificationReceiver != null) { diff --git a/app/src/main/java/com/gazlaws/codeboard/NotificationReceiver.java b/app/src/main/java/com/gazlaws/codeboard/NotificationReceiver.java index 5d116d21..b01778c8 100644 --- a/app/src/main/java/com/gazlaws/codeboard/NotificationReceiver.java +++ b/app/src/main/java/com/gazlaws/codeboard/NotificationReceiver.java @@ -3,13 +3,13 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; +import android.os.Build; import android.util.Log; import android.view.inputmethod.InputMethodManager; public class NotificationReceiver extends BroadcastReceiver { private CodeBoardIME mIME; static public final String ACTION_SHOW = "com.gazlaws.codeboard.SHOW"; - static public final String ACTION_SETTINGS = "com.gazlaws.codeboard.SETTINGS"; NotificationReceiver(CodeBoardIME ime) { super(); @@ -22,20 +22,25 @@ public void onReceive(Context context, Intent intent) { String action = intent.getAction(); Log.i(getClass().getSimpleName(), "NotificationReceiver.onReceive called, action=" + action); + if (action != null){ if (action.equals(ACTION_SHOW)) { InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE); + if (imm != null) { - imm.showSoftInputFromInputMethod(mIME.mToken, InputMethodManager.SHOW_FORCED); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { + Log.i(getClass().getSimpleName(), "Version >= P" + Build.VERSION.SDK_INT); + mIME.requestShowSelf(InputMethodManager.SHOW_FORCED); + } else { + Log.i(getClass().getSimpleName(), "Version < P" + Build.VERSION.SDK_INT); + imm.showSoftInputFromInputMethod(mIME.mToken, InputMethodManager.SHOW_FORCED); + } } - } else if (action.equals(ACTION_SETTINGS)) { + //Seems to be disabled for android 12 // Intent it = new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS); // context.sendBroadcast(it); - context.startActivity(new Intent(mIME, MainActivity.class) - .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK) - .putExtra("notification", 1)); - } - } + + }} } \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 75751ccf..d24f641b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -17,6 +17,7 @@ CodeboardNotification Allow keyboard to be force opened Open Codeboard keyboard + Fix popup Settings - This app is free, open-source and does not read your data! You can view, modify and compile the code your self on GitHub. + This app is free, open-source and does not read your data! You can view, modify and compile the code yourself on GitHub. diff --git a/build.gradle b/build.gradle index 1f4f6747..652ac03b 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.3' + classpath 'com.android.tools.build:gradle:8.3.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 05ef575b..7454180f 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 c83a7af5..d6a70263 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Apr 28 23:54:27 IST 2021 +#Thu Apr 11 22:56:38 GST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 index 9d82f789..1b6c7873 --- a/gradlew +++ b/gradlew @@ -1,74 +1,129 @@ -#!/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. +# ############################################################################## -## -## 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/. +# ############################################################################## -# 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_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 ( ) { +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 -# 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\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - 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 @@ -77,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 @@ -85,76 +140,95 @@ location of your Java installation." 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*) + 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" || "$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"` - 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 # 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 "$@" +# 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. +# + +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 aec99730..ac1b06f9 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@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 + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -8,20 +24,23 @@ @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=. 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%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,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% @@ -45,34 +64,14 @@ echo location of your Java installation. 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