Skip to content

Commit 1c6ae93

Browse files
ethanneffethanneff
committed
feat: update dependencies to the latest stable versions
1 parent 5ae0f6e commit 1c6ae93

23 files changed

+6462
-4589
lines changed

‎android/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,9 @@ android {
137137
}
138138

139139
dependencies {
140-
compile fileTree(dir: "libs", include: ["*.jar"])
141-
compile "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
142-
compile "com.facebook.react:react-native:+" // From node_modules
140+
implementation fileTree(dir: "libs", include: ["*.jar"])
141+
implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
142+
implementation "com.facebook.react:react-native:+" // From node_modules
143143
}
144144

145145
// Run this once to be able to run the application with BUCK

‎android/build.gradle

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4+
ext {
5+
buildToolsVersion = "27.0.3"
6+
minSdkVersion = 16
7+
compileSdkVersion = 27
8+
targetSdkVersion = 26
9+
supportLibVersion = "27.1.1"
10+
}
411
repositories {
12+
google()
513
jcenter()
6-
maven {
7-
url 'https://maven.google.com/'
8-
name 'Google'
9-
}
1014
}
1115
dependencies {
12-
classpath 'com.android.tools.build:gradle:2.3.3'
16+
classpath 'com.android.tools.build:gradle:3.1.4'
1317

1418
// NOTE: Do not place your application dependencies here; they belong
1519
// in the individual module build.gradle files
@@ -19,22 +23,17 @@ buildscript {
1923
allprojects {
2024
repositories {
2125
mavenLocal()
26+
google()
2227
jcenter()
2328
maven {
2429
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
2530
url "$rootDir/../node_modules/react-native/android"
2631
}
27-
maven {
28-
url 'https://maven.google.com/'
29-
name 'Google'
30-
}
3132
}
3233
}
3334

34-
ext {
35-
buildToolsVersion = "26.0.3"
36-
minSdkVersion = 16
37-
compileSdkVersion = 26
38-
targetSdkVersion = 26
39-
supportLibVersion = "26.1.0"
35+
36+
task wrapper(type: Wrapper) {
37+
gradleVersion = '4.4'
38+
distributionUrl = distributionUrl.replace("bin", "all")
4039
}

‎android/gradle.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,3 @@
1616
# This option should only be used with decoupled projects. More details, visit
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1818
# org.gradle.parallel=true
19-
20-
android.useDeprecatedNdk=true

‎android/gradle/wrapper/gradle-wrapper.jar

2.01 KB
Binary file not shown.

‎android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5.1-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

‎android/gradlew

Lines changed: 43 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,43 @@
1-
#!/usr/bin/env bash
1+
#!/usr/bin/env sh
22

33
##############################################################################
44
##
55
## Gradle start up script for UN*X
66
##
77
##############################################################################
88

9-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
10-
DEFAULT_JVM_OPTS=""
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
1126

1227
APP_NAME="Gradle"
1328
APP_BASE_NAME=`basename "$0"`
1429

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+
1533
# Use the maximum available, or set MAX_FD != -1 to use that value.
1634
MAX_FD="maximum"
1735

18-
warn ( ) {
36+
warn () {
1937
echo "$*"
2038
}
2139

22-
die ( ) {
40+
die () {
2341
echo
2442
echo "$*"
2543
echo
@@ -30,6 +48,7 @@ die ( ) {
3048
cygwin=false
3149
msys=false
3250
darwin=false
51+
nonstop=false
3352
case "`uname`" in
3453
CYGWIN* )
3554
cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
4059
MINGW* )
4160
msys=true
4261
;;
62+
NONSTOP* )
63+
nonstop=true
64+
;;
4365
esac
4466

45-
# For Cygwin, ensure paths are in UNIX format before anything is touched.
46-
if $cygwin ; then
47-
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
48-
fi
49-
50-
# Attempt to set APP_HOME
51-
# Resolve links: $0 may be a link
52-
PRG="$0"
53-
# Need this for relative symlinks.
54-
while [ -h "$PRG" ] ; do
55-
ls=`ls -ld "$PRG"`
56-
link=`expr "$ls" : '.*-> \(.*\)$'`
57-
if expr "$link" : '/.*' > /dev/null; then
58-
PRG="$link"
59-
else
60-
PRG=`dirname "$PRG"`"/$link"
61-
fi
62-
done
63-
SAVED="`pwd`"
64-
cd "`dirname \"$PRG\"`/" >&-
65-
APP_HOME="`pwd -P`"
66-
cd "$SAVED" >&-
67-
6867
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6968

7069
# Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@ location of your Java installation."
9089
fi
9190

9291
# Increase the maximum file descriptors if we can.
93-
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
92+
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
9493
MAX_FD_LIMIT=`ulimit -H -n`
9594
if [ $? -eq 0 ] ; then
9695
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
114113
if $cygwin ; then
115114
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
116115
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
116+
JAVACMD=`cygpath --unix "$JAVACMD"`
117117

118118
# We build the pattern for arguments to be converted via cygpath
119119
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +154,19 @@ if $cygwin ; then
154154
esac
155155
fi
156156

157-
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
158-
function splitJvmOpts() {
159-
JVM_OPTS=("$@")
157+
# Escape application args
158+
save () {
159+
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160+
echo " "
160161
}
161-
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
162-
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
162+
APP_ARGS=$(save "$@")
163+
164+
# Collect all arguments for the java command, following the shell quoting and substitution rules
165+
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
166+
167+
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
168+
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
169+
cd "$(dirname "$0")"
170+
fi
163171

164-
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
172+
exec "$JAVACMD" "$@"

‎android/gradlew.bat

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
@rem Set local scope for the variables with windows NT shell
99
if "%OS%"=="Windows_NT" setlocal
1010

11-
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
12-
set DEFAULT_JVM_OPTS=
13-
1411
set DIRNAME=%~dp0
1512
if "%DIRNAME%" == "" set DIRNAME=.
1613
set APP_BASE_NAME=%~n0
1714
set APP_HOME=%DIRNAME%
1815

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+
1919
@rem Find java.exe
2020
if defined JAVA_HOME goto findJavaFromJavaHome
2121

@@ -46,10 +46,9 @@ echo location of your Java installation.
4646
goto fail
4747

4848
:init
49-
@rem Get command-line arguments, handling Windowz variants
49+
@rem Get command-line arguments, handling Windows variants
5050

5151
if not "%OS%" == "Windows_NT" goto win9xME_args
52-
if "%@eval[2+2]" == "4" goto 4NT_args
5352

5453
:win9xME_args
5554
@rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
6059
if "x%~1" == "x" goto execute
6160

6261
set CMD_LINE_ARGS=%*
63-
goto execute
64-
65-
:4NT_args
66-
@rem Get arguments from the 4NT Shell from JP Software
67-
set CMD_LINE_ARGS=%$
6862

6963
:execute
7064
@rem Setup the command line

‎app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"name": "example",
33
"displayName": "example"
4-
}
4+
}

‎ios/example.xcodeproj/project.pbxproj

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */; };
1414
00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302E41ABCB9EE00DB3ED1 /* libRCTVibration.a */; };
1515
00E356F31AD99517003FC87E /* exampleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* exampleTests.m */; };
16+
11D1A2F320CAFA9E000508D9 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
1617
133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 78C398B91ACF4ADC00677621 /* libRCTLinking.a */; };
1718
139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139105C11AF99BAD00B5F7CC /* libRCTSettings.a */; };
1819
139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */; };
@@ -35,7 +36,6 @@
3536
2D16E6881FA4F8E400B85C8A /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D16E6891FA4F8E400B85C8A /* libReact.a */; };
3637
2DCD954D1E0B4F2C00145EB5 /* exampleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* exampleTests.m */; };
3738
2DF0FFEE2056DD460020B375 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3EA31DF850E9000B6D8A /* libReact.a */; };
38-
5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
3939
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
4040
ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; };
4141
/* End PBXBuildFile section */
@@ -359,9 +359,8 @@
359359
buildActionMask = 2147483647;
360360
files = (
361361
ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */,
362-
5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */,
362+
11D1A2F320CAFA9E000508D9 /* libRCTAnimation.a in Frameworks */,
363363
146834051AC3E58100842450 /* libReact.a in Frameworks */,
364-
5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */,
365364
00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */,
366365
00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */,
367366
00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */,
@@ -685,7 +684,7 @@
685684
83CBB9F71A601CBA00E9B192 /* Project object */ = {
686685
isa = PBXProject;
687686
attributes = {
688-
LastUpgradeCheck = 0610;
687+
LastUpgradeCheck = 0940;
689688
ORGANIZATIONNAME = Facebook;
690689
TargetAttributes = {
691690
00E356ED1AD99517003FC87E = {
@@ -1179,6 +1178,7 @@
11791178
"-ObjC",
11801179
"-lc++",
11811180
);
1181+
PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
11821182
PRODUCT_NAME = "$(TARGET_NAME)";
11831183
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/example.app/example";
11841184
};
@@ -1196,6 +1196,7 @@
11961196
"-ObjC",
11971197
"-lc++",
11981198
);
1199+
PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
11991200
PRODUCT_NAME = "$(TARGET_NAME)";
12001201
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/example.app/example";
12011202
};
@@ -1214,6 +1215,7 @@
12141215
"-ObjC",
12151216
"-lc++",
12161217
);
1218+
PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
12171219
PRODUCT_NAME = example;
12181220
VERSIONING_SYSTEM = "apple-generic";
12191221
};
@@ -1231,6 +1233,7 @@
12311233
"-ObjC",
12321234
"-lc++",
12331235
);
1236+
PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
12341237
PRODUCT_NAME = example;
12351238
VERSIONING_SYSTEM = "apple-generic";
12361239
};
@@ -1346,20 +1349,32 @@
13461349
CLANG_CXX_LIBRARY = "libc++";
13471350
CLANG_ENABLE_MODULES = YES;
13481351
CLANG_ENABLE_OBJC_ARC = YES;
1352+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
13491353
CLANG_WARN_BOOL_CONVERSION = YES;
1354+
CLANG_WARN_COMMA = YES;
13501355
CLANG_WARN_CONSTANT_CONVERSION = YES;
1356+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
13511357
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
13521358
CLANG_WARN_EMPTY_BODY = YES;
13531359
CLANG_WARN_ENUM_CONVERSION = YES;
1360+
CLANG_WARN_INFINITE_RECURSION = YES;
13541361
CLANG_WARN_INT_CONVERSION = YES;
1362+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1363+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
1364+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
13551365
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1366+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
1367+
CLANG_WARN_STRICT_PROTOTYPES = YES;
1368+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
13561369
CLANG_WARN_UNREACHABLE_CODE = YES;
13571370
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
13581371
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
13591372
COPY_PHASE_STRIP = NO;
13601373
ENABLE_STRICT_OBJC_MSGSEND = YES;
1374+
ENABLE_TESTABILITY = YES;
13611375
GCC_C_LANGUAGE_STANDARD = gnu99;
13621376
GCC_DYNAMIC_NO_PIC = NO;
1377+
GCC_NO_COMMON_BLOCKS = YES;
13631378
GCC_OPTIMIZATION_LEVEL = 0;
13641379
GCC_PREPROCESSOR_DEFINITIONS = (
13651380
"DEBUG=1",
@@ -1387,20 +1402,31 @@
13871402
CLANG_CXX_LIBRARY = "libc++";
13881403
CLANG_ENABLE_MODULES = YES;
13891404
CLANG_ENABLE_OBJC_ARC = YES;
1405+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
13901406
CLANG_WARN_BOOL_CONVERSION = YES;
1407+
CLANG_WARN_COMMA = YES;
13911408
CLANG_WARN_CONSTANT_CONVERSION = YES;
1409+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
13921410
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
13931411
CLANG_WARN_EMPTY_BODY = YES;
13941412
CLANG_WARN_ENUM_CONVERSION = YES;
1413+
CLANG_WARN_INFINITE_RECURSION = YES;
13951414
CLANG_WARN_INT_CONVERSION = YES;
1415+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1416+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
1417+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
13961418
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1419+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
1420+
CLANG_WARN_STRICT_PROTOTYPES = YES;
1421+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
13971422
CLANG_WARN_UNREACHABLE_CODE = YES;
13981423
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
13991424
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
14001425
COPY_PHASE_STRIP = YES;
14011426
ENABLE_NS_ASSERTIONS = NO;
14021427
ENABLE_STRICT_OBJC_MSGSEND = YES;
14031428
GCC_C_LANGUAGE_STANDARD = gnu99;
1429+
GCC_NO_COMMON_BLOCKS = YES;
14041430
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
14051431
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
14061432
GCC_WARN_UNDECLARED_SELECTOR = YES;

0 commit comments

Comments
 (0)