Przeglądaj źródła

clean android setup (#17)

Dulmandakh 5 lat temu
rodzic
commit
f1244988de

+ 6
- 29
android/build.gradle Wyświetl plik

@@ -1,45 +1,22 @@
1
-buildscript {
2
-  repositories {
3
-    google()
4
-    jcenter()
5
-  }
6
-
7
-  dependencies {
8
-    //noinspection GradleDependency
9
-    classpath 'com.android.tools.build:gradle:3.2.1'
10
-  }
11
-}
12
-
13
-def getExtOrDefault(name) {
14
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['ReactNativeSafeAreaView_' + name]
15
-}
16
-
17
-def getExtOrIntegerDefault(name) {
18
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties['ReactNativeSafeAreaView_' + name]).toInteger()
1
+def getExtOrDefault(name, defaultVaue) {
2
+  return rootProject.ext.get(name) ?: defaultVaue
19 3
 }
20 4
 
21 5
 apply plugin: 'com.android.library'
22 6
 
23 7
 android {
24
-  compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
25
-  buildToolsVersion getExtOrDefault('buildToolsVersion')
8
+  compileSdkVersion getExtOrDefault('compileSdkVersion', 28)
26 9
 
27 10
   defaultConfig {
28
-    minSdkVersion getExtOrIntegerDefault('minSdkVersion')
29
-    targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
11
+    minSdkVersion getExtOrDefault('minSdkVersion', 16)
12
+    targetSdkVersion getExtOrDefault('targetSdkVersion', 28)
30 13
   }
31 14
   lintOptions{
32 15
     abortOnError false
33 16
   }
34 17
 }
35 18
 
36
-repositories {
37
-  google()
38
-  jcenter()
39
-  mavenCentral()
40
-}
41
-
42 19
 dependencies {
43 20
   //noinspection GradleDynamicVersion
44
-  api 'com.facebook.react:react-native:+'
21
+  implementation 'com.facebook.react:react-native:+'
45 22
 }

+ 0
- 6
android/gradle.properties Wyświetl plik

@@ -1,6 +0,0 @@
1
-ReactNativeSafeAreaView_compileSdkVersion=28
2
-ReactNativeSafeAreaView_buildToolsVersion=28.0.3
3
-ReactNativeSafeAreaView_targetSdkVersion=27
4
-ReactNativeSafeAreaView_minSdkVersion=16
5
-android.useAndroidX=true
6
-android.enableJetifier=true

BIN
android/gradle/wrapper/gradle-wrapper.jar Wyświetl plik


+ 0
- 5
android/gradle/wrapper/gradle-wrapper.properties Wyświetl plik

@@ -1,5 +0,0 @@
1
-distributionBase=GRADLE_USER_HOME
2
-distributionPath=wrapper/dists
3
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
4
-zipStoreBase=GRADLE_USER_HOME
5
-zipStorePath=wrapper/dists

+ 0
- 188
android/gradlew Wyświetl plik

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

+ 0
- 100
android/gradlew.bat Wyświetl plik

@@ -1,100 +0,0 @@
1
-@rem
2
-@rem Copyright 2015 the original author or authors.
3
-@rem
4
-@rem Licensed under the Apache License, Version 2.0 (the "License");
5
-@rem you may not use this file except in compliance with the License.
6
-@rem You may obtain a copy of the License at
7
-@rem
8
-@rem      http://www.apache.org/licenses/LICENSE-2.0
9
-@rem
10
-@rem Unless required by applicable law or agreed to in writing, software
11
-@rem distributed under the License is distributed on an "AS IS" BASIS,
12
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
-@rem See the License for the specific language governing permissions and
14
-@rem limitations under the License.
15
-@rem
16
-
17
-@if "%DEBUG%" == "" @echo off
18
-@rem ##########################################################################
19
-@rem
20
-@rem  Gradle startup script for Windows
21
-@rem
22
-@rem ##########################################################################
23
-
24
-@rem Set local scope for the variables with windows NT shell
25
-if "%OS%"=="Windows_NT" setlocal
26
-
27
-set DIRNAME=%~dp0
28
-if "%DIRNAME%" == "" set DIRNAME=.
29
-set APP_BASE_NAME=%~n0
30
-set APP_HOME=%DIRNAME%
31
-
32
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
33
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
34
-
35
-@rem Find java.exe
36
-if defined JAVA_HOME goto findJavaFromJavaHome
37
-
38
-set JAVA_EXE=java.exe
39
-%JAVA_EXE% -version >NUL 2>&1
40
-if "%ERRORLEVEL%" == "0" goto init
41
-
42
-echo.
43
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
44
-echo.
45
-echo Please set the JAVA_HOME variable in your environment to match the
46
-echo location of your Java installation.
47
-
48
-goto fail
49
-
50
-:findJavaFromJavaHome
51
-set JAVA_HOME=%JAVA_HOME:"=%
52
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
53
-
54
-if exist "%JAVA_EXE%" goto init
55
-
56
-echo.
57
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
58
-echo.
59
-echo Please set the JAVA_HOME variable in your environment to match the
60
-echo location of your Java installation.
61
-
62
-goto fail
63
-
64
-:init
65
-@rem Get command-line arguments, handling Windows variants
66
-
67
-if not "%OS%" == "Windows_NT" goto win9xME_args
68
-
69
-:win9xME_args
70
-@rem Slurp the command line arguments.
71
-set CMD_LINE_ARGS=
72
-set _SKIP=2
73
-
74
-:win9xME_args_slurp
75
-if "x%~1" == "x" goto execute
76
-
77
-set CMD_LINE_ARGS=%*
78
-
79
-:execute
80
-@rem Setup the command line
81
-
82
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
83
-
84
-@rem Execute Gradle
85
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
86
-
87
-:end
88
-@rem End local scope for the variables with windows NT shell
89
-if "%ERRORLEVEL%"=="0" goto mainEnd
90
-
91
-:fail
92
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
93
-rem the _cmd.exe /c_ return code!
94
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
95
-exit /b 1
96
-
97
-:mainEnd
98
-if "%OS%"=="Windows_NT" endlocal
99
-
100
-:omega