diff --git a/android/build.gradle b/android/build.gradle index 2a7a12e..ecbf4be 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,21 +1,58 @@ +buildscript { + if (project == rootProject) { + repositories { + google() + mavenCentral() + } + + dependencies { + classpath 'com.android.tools.build:gradle:3.5.3' + } + } +} + apply plugin: 'com.android.library' -android { - compileSdkVersion 28 - buildToolsVersion "28.0.3" +def safeExtGet(prop, fallback) { + rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback +} +android { + compileSdkVersion safeExtGet('JailMonkey_compileSdkVersion', 29) defaultConfig { - minSdkVersion 21 - targetSdkVersion 28 + minSdkVersion safeExtGet('JailMonkey_minSdkVersion', 21) + targetSdkVersion safeExtGet('JailMonkey_targetSdkVersion', 29) versionCode 1 versionName "1.0" + + } + + buildTypes { + release { + minifyEnabled false + } } lintOptions { - warning 'InvalidPackage' + disable 'GradleCompatible' + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +repositories { + mavenLocal() + maven { + // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm + url("$rootDir/../node_modules/react-native/android") } + google() + mavenCentral() } dependencies { - implementation 'com.facebook.react:react-native:+' - implementation 'com.scottyab:rootbeer-lib:0.0.9' + //noinspection GradleDynamicVersion + implementation "com.facebook.react:react-native:+" // From node_modules + implementation 'com.scottyab:rootbeer-lib:0.1.0' } diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..7454180 Binary files /dev/null and b/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..69a9715 --- /dev/null +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/android/gradlew b/android/gradlew new file mode 100755 index 0000000..744e882 --- /dev/null +++ b/android/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or 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 +## +############################################################################## + +# 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 + +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"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# 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 + ;; + 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" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +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. + +Please set the JAVA_HOME variable in your environment to match the +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 +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 + +# 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 + # 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\"" + fi + i=`expr $i + 1` + 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" + +exec "$JAVACMD" "$@" diff --git a/android/gradlew.bat b/android/gradlew.bat new file mode 100644 index 0000000..ac1b06f --- /dev/null +++ b/android/gradlew.bat @@ -0,0 +1,89 @@ +@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 diff --git a/android/src/main/java/com/gantix/JailMonkey/AdbEnabled/AdbEnabled.java b/android/src/main/java/com/gantix/JailMonkey/AdbEnabled/AdbEnabled.java index 1dcbefe..dd408e7 100644 --- a/android/src/main/java/com/gantix/JailMonkey/AdbEnabled/AdbEnabled.java +++ b/android/src/main/java/com/gantix/JailMonkey/AdbEnabled/AdbEnabled.java @@ -4,12 +4,9 @@ import android.provider.Settings; import android.util.Log; - public class AdbEnabled { - //returns true if mock location enabled, false if not enabled. public static boolean AdbEnabled(Context context) { - Log.i("AdbEnabled", "AdbEnabled: " + (Settings.Secure.getInt(context.getContentResolver(), Settings.Secure.ADB_ENABLED, 0) == 1)); if (Settings.Global.getInt(context.getContentResolver(), Settings.Global.ADB_ENABLED, 0) == 1) { diff --git a/android/src/main/java/com/gantix/JailMonkey/JailMonkeyModule.java b/android/src/main/java/com/gantix/JailMonkey/JailMonkeyModule.java index 540fcc7..a8c2a17 100644 --- a/android/src/main/java/com/gantix/JailMonkey/JailMonkeyModule.java +++ b/android/src/main/java/com/gantix/JailMonkey/JailMonkeyModule.java @@ -1,7 +1,6 @@ package com.gantix.JailMonkey; import android.content.pm.ApplicationInfo; -import android.os.AsyncTask; import android.os.Build; import android.os.Debug; import android.provider.Settings; @@ -14,7 +13,6 @@ import java.util.HashMap; import java.util.Map; - import javax.annotation.Nullable; import static com.gantix.JailMonkey.AdbEnabled.AdbEnabled.AdbEnabled; @@ -25,15 +23,11 @@ public class JailMonkeyModule extends ReactContextBaseJavaModule { - ReactApplicationContext reactContext; - public JailMonkeyModule(ReactApplicationContext reactContext, boolean loadConstantsAsynchronously) { super(reactContext); - this.reactContext = reactContext; - } @Override @@ -41,7 +35,6 @@ public String getName() { return "JailMonkey"; } - @ReactMethod public void isDevelopmentSettingsMode(Promise p) { boolean isDevelopmentSettingsMode; @@ -53,7 +46,6 @@ public void isDevelopmentSettingsMode(Promise p) { p.resolve(isDevelopmentSettingsMode); } - @ReactMethod public void isDebuggedMode(Promise p) { boolean isDebuggedMode; @@ -65,7 +57,6 @@ public void isDebuggedMode(Promise p) { p.resolve(isDebuggedMode); } - @Override public @Nullable Map getConstants() { diff --git a/android/src/main/java/com/gantix/JailMonkey/JailMonkeyPackage.java b/android/src/main/java/com/gantix/JailMonkey/JailMonkeyPackage.java index 48a1695..4378d9f 100644 --- a/android/src/main/java/com/gantix/JailMonkey/JailMonkeyPackage.java +++ b/android/src/main/java/com/gantix/JailMonkey/JailMonkeyPackage.java @@ -1,7 +1,6 @@ package com.gantix.JailMonkey; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -40,5 +39,4 @@ public List createViewManagers( ReactApplicationContext reactContext) { return Collections.emptyList(); } - } diff --git a/android/src/main/java/com/gantix/JailMonkey/MockLocation/MockLocationCheck.java b/android/src/main/java/com/gantix/JailMonkey/MockLocation/MockLocationCheck.java index 0d38295..f82cadb 100644 --- a/android/src/main/java/com/gantix/JailMonkey/MockLocation/MockLocationCheck.java +++ b/android/src/main/java/com/gantix/JailMonkey/MockLocation/MockLocationCheck.java @@ -4,7 +4,6 @@ import android.provider.Settings; import android.os.Build; import android.util.Log; -import com.facebook.react.bridge.ReactContext; import android.content.pm.PackageManager; import java.util.List; @@ -12,9 +11,6 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageInfo; -import android.location.LocationManager; - -import java.lang.IllegalArgumentException; public class MockLocationCheck { public static boolean isMockLocationOn(Context context) { diff --git a/android/src/main/java/com/gantix/JailMonkey/Rooted/CheckApiVersion.java b/android/src/main/java/com/gantix/JailMonkey/Rooted/CheckApiVersion.java index 03b41af..9822028 100644 --- a/android/src/main/java/com/gantix/JailMonkey/Rooted/CheckApiVersion.java +++ b/android/src/main/java/com/gantix/JailMonkey/Rooted/CheckApiVersion.java @@ -1,6 +1,5 @@ package com.gantix.JailMonkey.Rooted; public interface CheckApiVersion { - boolean checkRooted(); } diff --git a/android/src/main/java/com/gantix/JailMonkey/Rooted/RootedCheck.java b/android/src/main/java/com/gantix/JailMonkey/Rooted/RootedCheck.java index ebdb710..ee52d76 100644 --- a/android/src/main/java/com/gantix/JailMonkey/Rooted/RootedCheck.java +++ b/android/src/main/java/com/gantix/JailMonkey/Rooted/RootedCheck.java @@ -1,9 +1,7 @@ package com.gantix.JailMonkey.Rooted; import android.content.Context; - import com.scottyab.rootbeer.RootBeer; -import android.os.Build; public class RootedCheck { @@ -25,7 +23,7 @@ public static boolean isJailBroken(Context context) { private static boolean rootBeerCheck(Context context) { RootBeer rootBeer = new RootBeer(context); - + return rootBeer.isRootedWithoutBusyBoxCheck(); } } diff --git a/jail-monkey.podspec b/jail-monkey.podspec index 3eadf78..612ac93 100644 --- a/jail-monkey.podspec +++ b/jail-monkey.podspec @@ -11,8 +11,7 @@ Pod::Spec.new do |s| s.author = package['author'] s.source = { :git => 'https://github.com/GantMan/jail-monkey.git' } - s.platform = :ios, '7.0' - s.ios.deployment_target = '7.0' + s.platform = :ios, '10.0' s.source_files = "JailMonkey/*.{h,m}" diff --git a/package.json b/package.json index 41722e3..c025faf 100644 --- a/package.json +++ b/package.json @@ -61,5 +61,6 @@ "ts-check": "npx tsc jailmonkey.d.ts --noEmit" }, "typings": "./jailmonkey.d.ts", + "types": "./jailmonkey.d.ts", "version": "2.6.0" }