diff --git a/.idea/gradle.xml b/.idea/gradle.xml old mode 100644 new mode 100755 index 15dda04..0b0534c --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,17 +1,18 @@ + diff --git a/.idea/misc.xml b/.idea/misc.xml old mode 100644 new mode 100755 index 8cb4894..bc78716 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,14 +1,14 @@ - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 9b770a6..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/README.md b/README.md index 7c14c81..ffec965 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,6 @@ To connect other devices with your app you need to open the app on your phone an Please report any bugs you may have on your devices. If anyone is willing to contribute....they are welcome. - -Get it on Google Play - Procedure to use the app: 1) Remove previous pairings with the host device in bluetooth settings(This has to be done once) 2) Open the app @@ -20,5 +17,3 @@ Procedure to use the app: 5) Use as Mouse/keyboard for your host device Many device manufacturers have disabled the Bluetooth HID device profile on their devices. You would have to ask your device manufacturers to enable it. You can check with this app {[Bluetooth HID Device Profile Compatibility Checker](https://play.google.com/store/apps/details?id=com.rkaneapplabs.bluetooth_hid.bluetoothproxy)} if the Bluetooth HID device profile is disabled for you or not. - -For OnePlus users- you can upvote this [Idea](https://forums.oneplus.com/threads/converting-one-plus-devices-into-a-bluetooth-controller-mouse-keyboard-etc.1192272/) in the community forums after login(This may help in bringing the issue into notice to One Plus). (If any One Plus 8/8Pro or 8T or One Plus Nord) user see's the repo, I need to do some testing on these one plus devices to check if the feature is enabled on them or not. If you have one of these devices and are cool and fine with letting me do some testing on your device.Feel free to create an issue. diff --git a/app/build.gradle b/app/build.gradle index 7830adc..aa3af24 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,20 +1,46 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' +apply plugin: 'kotlin-parcelize'// 'kotlin-android-extensions' + +//plugins { +// id 'com.android.application' +// id 'kotlin-android' +// id 'kotlin-parcelize' +//} + +java { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 +} +//tasks.withType().configureEach { +// kotlinOptions { +// jvmTarget = "11" +// } +//} android { - compileSdkVersion 28 + buildFeatures { + viewBinding = true + } + namespace 'com.github.roarappstudio.btkontroller' + compileSdkVersion 30 defaultConfig { applicationId "com.github.roarappstudio.btkontroller" minSdkVersion 28 - targetSdkVersion 28 + //noinspection ExpiredTargetSdkVersion + targetSdkVersion 30 versionCode 2 versionName "0.0.2" } + compileOptions { - targetCompatibility 1.8 - sourceCompatibility 1.8 + targetCompatibility 1.8//JavaVersion.VERSION_17 // 1.8// 1.8 + sourceCompatibility 1.8//JavaVersion.VERSION_17 // 1.8//1.8 + } + kotlinOptions { + jvmTarget = "1.8" } + buildTypes { release { minifyEnabled true diff --git a/app/release/app-release.apk b/app/release/app-release.apk new file mode 100755 index 0000000..f6479b0 Binary files /dev/null and b/app/release/app-release.apk differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json new file mode 100755 index 0000000..8e6c705 --- /dev/null +++ b/app/release/output-metadata.json @@ -0,0 +1,20 @@ +{ + "version": 3, + "artifactType": { + "type": "APK", + "kind": "Directory" + }, + "applicationId": "com.github.roarappstudio.btkontroller", + "variantName": "release", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "attributes": [], + "versionCode": 2, + "versionName": "0.0.2", + "outputFile": "app-release.apk" + } + ], + "elementType": "File" +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3d9233f..5b35b92 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + xmlns:tools="http://schemas.android.com/tools"> diff --git a/app/src/main/java/com/github/roarappstudio/btkontroller/BluetoothController.kt b/app/src/main/java/com/github/roarappstudio/btkontroller/BluetoothController.kt index 72710be..4b4f4cb 100644 --- a/app/src/main/java/com/github/roarappstudio/btkontroller/BluetoothController.kt +++ b/app/src/main/java/com/github/roarappstudio/btkontroller/BluetoothController.kt @@ -14,26 +14,26 @@ object BluetoothController: BluetoothHidDevice.Callback(), BluetoothProfile.Serv override fun onSetReport(device: BluetoothDevice?, type: Byte, id: Byte, data: ByteArray?) { - Log.i("setfirst","setfirst") + Log.i(TAG,"setfirst") super.onSetReport(device, type, id, data) - Log.i("setreport","this $device and $type and $id and $data") + Log.i(TAG,"this $device and $type and $id and $data") } override fun onGetReport(device: BluetoothDevice?, type: Byte, id: Byte, bufferSize: Int) { - Log.i("getbefore", "first") + Log.i(TAG, "first") super.onGetReport(device, type, id, bufferSize) - Log.i("get", "second") + Log.i(TAG, "second") if (type == BluetoothHidDevice.REPORT_TYPE_FEATURE) { featureReport.wheelResolutionMultiplier = true featureReport.acPanResolutionMultiplier = true - Log.i("getbthid","$btHid") + Log.i(TAG,"$btHid") var wasrs=btHid?.replyReport(device, type, FeatureReport.ID, featureReport.bytes) - Log.i("replysuccess flag ",wasrs.toString()) + Log.i(TAG,"replysuccess flag "+wasrs.toString()) } @@ -149,24 +149,23 @@ object BluetoothController: BluetoothHidDevice.Callback(), BluetoothProfile.Serv if(registered) { var pairedDevices = btHid?.getDevicesMatchingConnectionStates(intArrayOf(BluetoothProfile.STATE_CONNECTING,BluetoothProfile.STATE_CONNECTED,BluetoothProfile.STATE_DISCONNECTED,BluetoothProfile.STATE_DISCONNECTING)) - Log.d("paired d", "paired devices are : $pairedDevices") - Log.d("paired d","${btHid?.getConnectionState(pairedDevices?.get(0))}") + Log.d(TAG, "paired devices are : $pairedDevices") + //Log.d("paired d","${btHid?.getConnectionState(pairedDevices?.get(0))}") mpluggedDevice = pluggedDevice - if(btHid?.getConnectionState(pluggedDevice)==0 && pluggedDevice!= null && autoPairFlag ==true) + if(btHid?.getConnectionState(pluggedDevice)==0 && pluggedDevice!= null && autoPairFlag ==true) { btHid?.connect(pluggedDevice) //hostDevice.toString() - - } - - - else if(btHid?.getConnectionState(pairedDevices?.get(0))==0 && autoPairFlag==true) - { - Log.i("ddaaqq","sssS" - ) - btHid?.connect(pairedDevices?.get(0)) - } + else if(pairedDevices != null && pairedDevices.size > 0 && btHid?.getConnectionState(pairedDevices?.get(0))==0 && autoPairFlag) + { + Log.i(TAG,"sssS" + ) + btHid?.connect(pairedDevices?.get(0)) + } + else { + Log.i(TAG, "none") + } // val intent = Intent("CUSTOM_ACTION") // intent.putExtra("DATE", Date().toString()) diff --git a/app/src/main/java/com/github/roarappstudio/btkontroller/SelectDeviceActivity.kt b/app/src/main/java/com/github/roarappstudio/btkontroller/SelectDeviceActivity.kt index 87fc77f..d34afe6 100644 --- a/app/src/main/java/com/github/roarappstudio/btkontroller/SelectDeviceActivity.kt +++ b/app/src/main/java/com/github/roarappstudio/btkontroller/SelectDeviceActivity.kt @@ -417,9 +417,9 @@ class SelectDeviceActivity: Activity(),KeyEvent.Callback { getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) - with(sharedPref.edit()) + with(sharedPref?.edit()) { - putBoolean(getString(R.string.screen_on_flag), false) + this!!.putBoolean(getString(R.string.screen_on_flag), false) commit() } @@ -429,7 +429,7 @@ class SelectDeviceActivity: Activity(),KeyEvent.Callback { item.isChecked=true window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) - with(sharedPref.edit()) + with(sharedPref!!.edit()) { putBoolean(getString(R.string.screen_on_flag), true) commit() @@ -446,7 +446,7 @@ class SelectDeviceActivity: Activity(),KeyEvent.Callback { item.isChecked = false BluetoothController.autoPairFlag=false - with(sharedPref.edit()) + with(sharedPref!!.edit()) { putBoolean(getString(R.string.auto_pair_flag), BluetoothController.autoPairFlag) commit() @@ -462,7 +462,7 @@ class SelectDeviceActivity: Activity(),KeyEvent.Callback { BluetoothController.btHid?.connect(BluetoothController.mpluggedDevice) //hostDevice.toString() } - with(sharedPref.edit()) + with(sharedPref!!.edit()) { putBoolean(getString(R.string.auto_pair_flag), BluetoothController.autoPairFlag) commit() diff --git a/app/src/main/java/com/github/roarappstudio/btkontroller/Unhide.kt b/app/src/main/java/com/github/roarappstudio/btkontroller/Unhide.kt index 6824e22..d130d30 100644 --- a/app/src/main/java/com/github/roarappstudio/btkontroller/Unhide.kt +++ b/app/src/main/java/com/github/roarappstudio/btkontroller/Unhide.kt @@ -6,10 +6,23 @@ import android.bluetooth.BluetoothDevice /** Extensions which expose hidden API **/ fun BluetoothAdapter.setScanMode(mode: Int, duration: Int): Boolean = - this::class.java.getMethod("setScanMode", Int::class.java, Int::class.java).invoke(this, mode, duration) as Boolean + try { + this::class.java.getMethod("setScanMode", Int::class.java, Int::class.java) + .invoke(this, mode, duration) as Boolean + } catch (e : NoSuchMethodException) { + false + } fun BluetoothDevice.cancelBondProcess(): Boolean = - this::class.java.getMethod("cancelBondProcess").invoke(this) as Boolean + try { + this::class.java.getMethod("cancelBondProcess").invoke(this) as Boolean + } catch (e : NoSuchMethodException) { + false + } fun BluetoothDevice.removeBond(): Boolean = - this::class.java.getMethod("removeBond").invoke(this) as Boolean \ No newline at end of file + try { + this::class.java.getMethod("removeBond").invoke(this) as Boolean + } catch (e : NoSuchMethodException) { + false + } \ No newline at end of file diff --git a/app/src/main/java/com/github/roarappstudio/btkontroller/reports/FeatureReport.kt b/app/src/main/java/com/github/roarappstudio/btkontroller/reports/FeatureReport.kt index 616fec1..51fb614 100644 --- a/app/src/main/java/com/github/roarappstudio/btkontroller/reports/FeatureReport.kt +++ b/app/src/main/java/com/github/roarappstudio/btkontroller/reports/FeatureReport.kt @@ -4,7 +4,7 @@ import kotlin.experimental.and import kotlin.experimental.or @Suppress("EXPERIMENTAL_FEATURE_WARNING") -inline class FeatureReport ( +class FeatureReport ( val bytes: ByteArray = ByteArray(1) {0} ) { @@ -35,4 +35,4 @@ inline class FeatureReport ( companion object { const val ID = 6.toByte() } -} \ No newline at end of file +} diff --git a/build.gradle b/build.gradle index 9fc0963..291ecd7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,15 +1,19 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.21' + ext.kotlin_version = '2.0.20' // '1.7.20' ext.anko_version='0.10.8' repositories { google() + maven { + allowInsecureProtocol = true + url = uri("http://maven.xdja.com:8081/nexus3/repository/aliyun/") + } jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.1' + classpath 'com.android.tools.build:gradle:8.2.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong @@ -18,13 +22,28 @@ buildscript { } allprojects { - repositories { + repositories {// google() + maven { + allowInsecureProtocol = true + url = uri("http://maven.xdja.com:8081/nexus3/repository/aliyun/") //org/jetbrains/anko/") + } jcenter() - } } task clean(type: Delete) { delete rootProject.buildDir } + +subprojects { + afterEvaluate { project -> + if (project.hasProperty('android')) { + project.android { + if (namespace == null) { + namespace project.group + } + } + } + } +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f6b961f..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 1fcbe8e..15de902 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Fri May 24 14:30:21 IST 2019 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index cccdd3d..c53aefa 100755 --- a/gradlew +++ b/gradlew @@ -1,78 +1,129 @@ -#!/usr/bin/env sh +#!/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/. +# ############################################################################## # 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="" +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 + # 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 @@ -81,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 @@ -89,84 +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" || "$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 -# 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" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi +# 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 f955316..ac1b06f 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,84 +1,89 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@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= - -@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 - -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. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -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. - -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 - -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% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="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 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@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 +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +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 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. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +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. + +goto fail + +: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 %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="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 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega