Skip to content

Commit 9f1c2d0

Browse files
josectobarjosectobar
authored
Merge pull request #7 from josectobar/feat/gradle
Android: Added build gradle compatibility. - This changes enables compatibility when building your project using commands such as `.gradlew assembleRelease`.
2 parents aeb8cfc + 8df0c79 commit 9f1c2d0

File tree

9 files changed

+296
-13
lines changed

9 files changed

+296
-13
lines changed

‎README.md

+6
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
Wifi configuration.
44
This library was written to config iot devices. With iOS 11 Apple introduced NEHotspotConfiguration class for wifi configuration. Library supports same functionality on ios and android.
55

6+
## 1.0.6
7+
8+
Android: Added build gradle compatibility.
9+
10+
- This changes enables compatibility when building your project using commands such as `.gradlew assembleRelease`.
11+
612
## 1.0.5
713

814
Android: Added `forceWifiUsage` method. to use this method, do the following steps:

‎android/build.gradle

+23-9
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,37 @@
1+
buildscript {
2+
repositories {
3+
google()
4+
jcenter()
5+
}
6+
7+
dependencies {
8+
classpath 'com.android.tools.build:gradle:3.5.2'
9+
}
10+
}
11+
112
apply plugin: 'com.android.library'
213

314
android {
4-
compileSdkVersion 26
15+
compileSdkVersion 28
516
buildToolsVersion '28.0.3'
617

718
defaultConfig {
819
minSdkVersion 21
9-
targetSdkVersion 26
20+
targetSdkVersion 28
1021
versionCode 1
1122
versionName "1.0"
12-
ndk {
13-
abiFilters "armeabi-v7a", "x86"
14-
}
1523
}
16-
lintOptions {
17-
warning 'InvalidPackage'
24+
}
25+
26+
repositories {
27+
maven {
28+
url "$projectDir/../node_modules/react-native/android"
1829
}
30+
google()
31+
jcenter()
1932
}
2033

2134
dependencies {
22-
implementation 'com.facebook.react:react-native:0.20.1+'
23-
}
35+
//noinspection GradleDynamicVersion
36+
implementation 'com.facebook.react:react-native:+'
37+
}

‎android/gradle.properties

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
android.enableJetifier=true
2+
android.useAndroidX=true

‎android/gradlew

+170
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,170 @@
1+
#!/usr/bin/env sh
2+
3+
##############################################################################
4+
##
5+
## Gradle start up script for UN*X
6+
##
7+
##############################################################################
8+
9+
# Attempt to set APP_HOME
10+
# Resolve links: $0 may be a link
11+
PRG="$0"
12+
# Need this for relative symlinks.
13+
while [ -h "$PRG" ] ; do
14+
ls=`ls -ld "$PRG"`
15+
link=`expr "$ls" : '.*-> \(.*\)$'`
16+
if expr "$link" : '/.*' > /dev/null; then
17+
PRG="$link"
18+
else
19+
PRG=`dirname "$PRG"`"/$link"
20+
fi
21+
done
22+
SAVED="`pwd`"
23+
cd "`dirname \"$PRG\"`/" >/dev/null
24+
APP_HOME="`pwd -P`"
25+
cd "$SAVED" >/dev/null
26+
27+
APP_NAME="Gradle"
28+
APP_BASE_NAME=`basename "$0"`
29+
30+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31+
DEFAULT_JVM_OPTS=""
32+
33+
# Use the maximum available, or set MAX_FD != -1 to use that value.
34+
MAX_FD="maximum"
35+
36+
warn () {
37+
echo "$*"
38+
}
39+
40+
die () {
41+
echo
42+
echo "$*"
43+
echo
44+
exit 1
45+
}
46+
47+
# OS specific support (must be 'true' or 'false').
48+
cygwin=false
49+
msys=false
50+
darwin=false
51+
nonstop=false
52+
case "`uname`" in
53+
CYGWIN* )
54+
cygwin=true
55+
;;
56+
Darwin* )
57+
darwin=true
58+
;;
59+
MINGW* )
60+
msys=true
61+
;;
62+
NONSTOP* )
63+
nonstop=true
64+
;;
65+
esac
66+
67+
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
68+
69+
# Determine the Java command to use to start the JVM.
70+
if [ -n "$JAVA_HOME" ] ; then
71+
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
72+
# IBM's JDK on AIX uses strange locations for the executables
73+
JAVACMD="$JAVA_HOME/jre/sh/java"
74+
else
75+
JAVACMD="$JAVA_HOME/bin/java"
76+
fi
77+
if [ ! -x "$JAVACMD" ] ; then
78+
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
79+
Please set the JAVA_HOME variable in your environment to match the
80+
location of your Java installation."
81+
fi
82+
else
83+
JAVACMD="java"
84+
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
85+
Please set the JAVA_HOME variable in your environment to match the
86+
location of your Java installation."
87+
fi
88+
89+
# Increase the maximum file descriptors if we can.
90+
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
91+
MAX_FD_LIMIT=`ulimit -H -n`
92+
if [ $? -eq 0 ] ; then
93+
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
94+
MAX_FD="$MAX_FD_LIMIT"
95+
fi
96+
ulimit -n $MAX_FD
97+
if [ $? -ne 0 ] ; then
98+
warn "Could not set maximum file descriptor limit: $MAX_FD"
99+
fi
100+
else
101+
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
102+
fi
103+
fi
104+
105+
# For Darwin, add options to specify how the application appears in the dock
106+
if $darwin; then
107+
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
108+
fi
109+
110+
# For Cygwin, switch paths to Windows format before running java
111+
if $cygwin ; then
112+
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
113+
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
114+
JAVACMD=`cygpath --unix "$JAVACMD"`
115+
116+
# We build the pattern for arguments to be converted via cygpath
117+
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
118+
SEP=""
119+
for dir in $ROOTDIRSRAW ; do
120+
ROOTDIRS="$ROOTDIRS$SEP$dir"
121+
SEP="|"
122+
done
123+
OURCYGPATTERN="(^($ROOTDIRS))"
124+
# Add a user-defined pattern to the cygpath arguments
125+
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
126+
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
127+
fi
128+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
129+
i=0
130+
for arg in "$@" ; do
131+
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
132+
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
133+
134+
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
135+
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
136+
else
137+
eval `echo args$i`="\"$arg\""
138+
fi
139+
i=$((i+1))
140+
done
141+
case $i in
142+
(0) set -- ;;
143+
(1) set -- "$args0" ;;
144+
(2) set -- "$args0" "$args1" ;;
145+
(3) set -- "$args0" "$args1" "$args2" ;;
146+
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
147+
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
148+
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
149+
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
150+
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
151+
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
152+
esac
153+
fi
154+
155+
# Escape application args
156+
save () {
157+
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
158+
echo " "
159+
}
160+
APP_ARGS=$(save "$@")
161+
162+
# Collect all arguments for the java command, following the shell quoting and substitution rules
163+
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
164+
165+
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
166+
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
167+
cd "$(dirname "$0")"
168+
fi
169+
170+
exec "$JAVACMD" "$@"

‎android/gradlew.bat

+84
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
@if "%DEBUG%" == "" @echo off
2+
@rem ##########################################################################
3+
@rem
4+
@rem Gradle startup script for Windows
5+
@rem
6+
@rem ##########################################################################
7+
8+
@rem Set local scope for the variables with windows NT shell
9+
if "%OS%"=="Windows_NT" setlocal
10+
11+
set DIRNAME=%~dp0
12+
if "%DIRNAME%" == "" set DIRNAME=.
13+
set APP_BASE_NAME=%~n0
14+
set APP_HOME=%DIRNAME%
15+
16+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17+
set DEFAULT_JVM_OPTS=
18+
19+
@rem Find java.exe
20+
if defined JAVA_HOME goto findJavaFromJavaHome
21+
22+
set JAVA_EXE=java.exe
23+
%JAVA_EXE% -version >NUL 2>&1
24+
if "%ERRORLEVEL%" == "0" goto init
25+
26+
echo.
27+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
28+
echo.
29+
echo Please set the JAVA_HOME variable in your environment to match the
30+
echo location of your Java installation.
31+
32+
goto fail
33+
34+
:findJavaFromJavaHome
35+
set JAVA_HOME=%JAVA_HOME:"=%
36+
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
37+
38+
if exist "%JAVA_EXE%" goto init
39+
40+
echo.
41+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
42+
echo.
43+
echo Please set the JAVA_HOME variable in your environment to match the
44+
echo location of your Java installation.
45+
46+
goto fail
47+
48+
:init
49+
@rem Get command-line arguments, handling Windows variants
50+
51+
if not "%OS%" == "Windows_NT" goto win9xME_args
52+
53+
:win9xME_args
54+
@rem Slurp the command line arguments.
55+
set CMD_LINE_ARGS=
56+
set _SKIP=2
57+
58+
:win9xME_args_slurp
59+
if "x%~1" == "x" goto execute
60+
61+
set CMD_LINE_ARGS=%*
62+
63+
:execute
64+
@rem Setup the command line
65+
66+
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
67+
68+
@rem Execute Gradle
69+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
70+
71+
:end
72+
@rem End local scope for the variables with windows NT shell
73+
if "%ERRORLEVEL%"=="0" goto mainEnd
74+
75+
:fail
76+
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
77+
rem the _cmd.exe /c_ return code!
78+
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
79+
exit /b 1
80+
81+
:mainEnd
82+
if "%OS%"=="Windows_NT" endlocal
83+
84+
:omega

‎android/src/main/java/com/tadasr/IOTWifi/IOTWifiPackage.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public List<NativeModule> createNativeModules(ReactApplicationContext reactConte
1919
modules.add(new IOTWifiModule(reactContext));
2020
return modules;
2121
}
22-
@Override
22+
2323
public List<Class<? extends JavaScriptModule>> createJSModules() {
2424
return Collections.emptyList();
2525
}

‎android/wrapper/gradle-wrapper.jar

53.1 KB
Binary file not shown.

‎android/wrapper/gradle-wrapper.properties

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#Wed Oct 30 14:01:06 CET 2019
2+
distributionBase=GRADLE_USER_HOME
3+
distributionPath=wrapper/dists
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

‎package.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@josectobar/react-native-iot-wifi",
3-
"version": "1.0.5",
3+
"version": "1.0.6",
44
"description": "Connect to WiFi with React Native on Android and iOS.",
55
"main": "index.js",
66
"types": "index.d.ts",
@@ -25,7 +25,8 @@
2525
"iot"
2626
],
2727
"authors": [
28-
"tadasr", "josectobar"
28+
"tadasr",
29+
"josectobar"
2930
],
3031
"license": "MIT",
3132
"bugs": {
@@ -40,4 +41,4 @@
4041
"test": "echo \"Error: no test specified\" && exit 1"
4142
},
4243
"author": "josectobar"
43-
}
44+
}

0 commit comments

Comments
 (0)