Skip to content

Commit 68d5bb9

Browse files
committed
updated RN to 0.56 🎉
1 parent e186845 commit 68d5bb9

File tree

19 files changed

+903
-957
lines changed

19 files changed

+903
-957
lines changed

.flowconfig

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,19 @@ node_modules/react-native/flow-github/
3030
emoji=true
3131

3232
module.system=haste
33+
module.system.haste.use_name_reducers=true
34+
# get basename
35+
module.system.haste.name_reducers='^.*/\([a-zA-Z0-9$_.-]+\.js\(\.flow\)?\)$' -> '\1'
36+
# strip .js or .js.flow suffix
37+
module.system.haste.name_reducers='^\(.*\)\.js\(\.flow\)?$' -> '\1'
38+
# strip .ios suffix
39+
module.system.haste.name_reducers='^\(.*\)\.ios$' -> '\1'
40+
module.system.haste.name_reducers='^\(.*\)\.android$' -> '\1'
41+
module.system.haste.name_reducers='^\(.*\)\.native$' -> '\1'
42+
module.system.haste.paths.blacklist=.*/__tests__/.*
43+
module.system.haste.paths.blacklist=.*/__mocks__/.*
44+
module.system.haste.paths.blacklist=<PROJECT_ROOT>/node_modules/react-native/Libraries/Animated/src/polyfills/.*
45+
module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/Libraries/.*
3346

3447
munge_underscores=true
3548

@@ -51,4 +64,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
5164
suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
5265

5366
[version]
54-
^0.67.0
67+
^0.75.0

android/app/build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,13 @@ def enableSeparateBuildPerCPUArchitecture = false
9494
def enableProguardInReleaseBuilds = false
9595

9696
android {
97-
compileSdkVersion 25
98-
buildToolsVersion "26.0.2"
97+
compileSdkVersion rootProject.ext.compileSdkVersion
98+
buildToolsVersion rootProject.ext.buildToolsVersion
9999

100100
defaultConfig {
101101
applicationId "com.reduxtemplate"
102-
minSdkVersion 16
103-
targetSdkVersion 25
102+
minSdkVersion rootProject.ext.minSdkVersion
103+
targetSdkVersion rootProject.ext.targetSdkVersion
104104
versionCode 1
105105
versionName "1.0"
106106
ndk {
@@ -137,10 +137,10 @@ android {
137137
}
138138

139139
dependencies {
140-
compile fileTree(dir: "libs", include: ["*.jar"])
141-
compile "com.android.support:appcompat-v7:25.0.1"
142-
compile "com.facebook.react:react-native:+" // From node_modules
143-
compile project(':react-native-navigation')
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
143+
implementation project(':react-native-navigation')
144144
}
145145

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

android/app/proguard-rules.pro

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -15,56 +15,3 @@
1515
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
1616
# public *;
1717
#}
18-
19-
# Disabling obfuscation is useful if you collect stack traces from production crashes
20-
# (unless you are using a system that supports de-obfuscate the stack traces).
21-
-dontobfuscate
22-
23-
# React Native
24-
25-
# Keep our interfaces so they can be used by other ProGuard rules.
26-
# See http://sourceforge.net/p/proguard/bugs/466/
27-
-keep,allowobfuscation @interface com.facebook.proguard.annotations.DoNotStrip
28-
-keep,allowobfuscation @interface com.facebook.proguard.annotations.KeepGettersAndSetters
29-
-keep,allowobfuscation @interface com.facebook.common.internal.DoNotStrip
30-
31-
# Do not strip any method/class that is annotated with @DoNotStrip
32-
-keep @com.facebook.proguard.annotations.DoNotStrip class *
33-
-keep @com.facebook.common.internal.DoNotStrip class *
34-
-keepclassmembers class * {
35-
@com.facebook.proguard.annotations.DoNotStrip *;
36-
@com.facebook.common.internal.DoNotStrip *;
37-
}
38-
39-
-keepclassmembers @com.facebook.proguard.annotations.KeepGettersAndSetters class * {
40-
void set*(***);
41-
*** get*();
42-
}
43-
44-
-keep class * extends com.facebook.react.bridge.JavaScriptModule { *; }
45-
-keep class * extends com.facebook.react.bridge.NativeModule { *; }
46-
-keepclassmembers,includedescriptorclasses class * { native <methods>; }
47-
-keepclassmembers class * { @com.facebook.react.uimanager.UIProp <fields>; }
48-
-keepclassmembers class * { @com.facebook.react.uimanager.annotations.ReactProp <methods>; }
49-
-keepclassmembers class * { @com.facebook.react.uimanager.annotations.ReactPropGroup <methods>; }
50-
51-
-dontwarn com.facebook.react.**
52-
53-
# TextLayoutBuilder uses a non-public Android constructor within StaticLayout.
54-
# See libs/proxy/src/main/java/com/facebook/fbui/textlayoutbuilder/proxy for details.
55-
-dontwarn android.text.StaticLayout
56-
57-
# okhttp
58-
59-
-keepattributes Signature
60-
-keepattributes *Annotation*
61-
-keep class okhttp3.** { *; }
62-
-keep interface okhttp3.** { *; }
63-
-dontwarn okhttp3.**
64-
65-
# okio
66-
67-
-keep class sun.misc.Unsafe { *; }
68-
-dontwarn java.nio.file.*
69-
-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
70-
-dontwarn okio.**
-362 Bytes
Loading
Loading
-110 Bytes
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading

android/build.gradle

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ buildscript {
77
}
88
dependencies {
99
classpath 'com.android.tools.build:gradle:3.0.1'
10-
11-
// NOTE: Do not place your application dependencies here; they belong
12-
// in the individual module build.gradle files
1310
}
1411
}
1512

@@ -21,5 +18,17 @@ allprojects {
2118
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
2219
url "$rootDir/../node_modules/react-native/android"
2320
}
21+
maven {
22+
url 'https://maven.google.com/'
23+
name 'Google'
24+
}
2425
}
2526
}
27+
28+
ext {
29+
buildToolsVersion = "26.0.3"
30+
minSdkVersion = 16
31+
compileSdkVersion = 26
32+
targetSdkVersion = 26
33+
supportLibVersion = "26.1.0"
34+
}

android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6+
67
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

ios/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
PODFILE CHECKSUM: 663d5ff167ac80bd02aadf4d04365858461c716c
22

3-
COCOAPODS: 1.4.0
3+
COCOAPODS: 1.5.3

ios/reduxTemplate.xcodeproj/project.pbxproj

Lines changed: 4 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -667,8 +667,6 @@
667667
13B07F8C1A680F5B00A75B9A /* Frameworks */,
668668
13B07F8E1A680F5B00A75B9A /* Resources */,
669669
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
670-
2788C245E77F47C400A0A9EA /* [CP] Embed Pods Frameworks */,
671-
200C6F23D59B20AB7903E52C /* [CP] Copy Pods Resources */,
672670
);
673671
buildRules = (
674672
);
@@ -1132,36 +1130,6 @@
11321130
shellPath = /bin/sh;
11331131
shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
11341132
};
1135-
200C6F23D59B20AB7903E52C /* [CP] Copy Pods Resources */ = {
1136-
isa = PBXShellScriptBuildPhase;
1137-
buildActionMask = 2147483647;
1138-
files = (
1139-
);
1140-
inputPaths = (
1141-
);
1142-
name = "[CP] Copy Pods Resources";
1143-
outputPaths = (
1144-
);
1145-
runOnlyForDeploymentPostprocessing = 0;
1146-
shellPath = /bin/sh;
1147-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-reduxTemplate/Pods-reduxTemplate-resources.sh\"\n";
1148-
showEnvVarsInLog = 0;
1149-
};
1150-
2788C245E77F47C400A0A9EA /* [CP] Embed Pods Frameworks */ = {
1151-
isa = PBXShellScriptBuildPhase;
1152-
buildActionMask = 2147483647;
1153-
files = (
1154-
);
1155-
inputPaths = (
1156-
);
1157-
name = "[CP] Embed Pods Frameworks";
1158-
outputPaths = (
1159-
);
1160-
runOnlyForDeploymentPostprocessing = 0;
1161-
shellPath = /bin/sh;
1162-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-reduxTemplate/Pods-reduxTemplate-frameworks.sh\"\n";
1163-
showEnvVarsInLog = 0;
1164-
};
11651133
2D02E4CB1E0B4B27006451C7 /* Bundle React Native Code And Images */ = {
11661134
isa = PBXShellScriptBuildPhase;
11671135
buildActionMask = 2147483647;
@@ -1268,7 +1236,7 @@
12681236
"$(inherited)",
12691237
);
12701238
INFOPLIST_FILE = reduxTemplateTests/Info.plist;
1271-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1239+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
12721240
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
12731241
OTHER_LDFLAGS = (
12741242
"-ObjC",
@@ -1285,7 +1253,7 @@
12851253
BUNDLE_LOADER = "$(TEST_HOST)";
12861254
COPY_PHASE_STRIP = NO;
12871255
INFOPLIST_FILE = reduxTemplateTests/Info.plist;
1288-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1256+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
12891257
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
12901258
OTHER_LDFLAGS = (
12911259
"-ObjC",
@@ -1471,7 +1439,7 @@
14711439
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
14721440
GCC_WARN_UNUSED_FUNCTION = YES;
14731441
GCC_WARN_UNUSED_VARIABLE = YES;
1474-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1442+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
14751443
MTL_ENABLE_DEBUG_INFO = YES;
14761444
ONLY_ACTIVE_ARCH = YES;
14771445
SDKROOT = iphoneos;
@@ -1506,7 +1474,7 @@
15061474
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
15071475
GCC_WARN_UNUSED_FUNCTION = YES;
15081476
GCC_WARN_UNUSED_VARIABLE = YES;
1509-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1477+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
15101478
MTL_ENABLE_DEBUG_INFO = NO;
15111479
SDKROOT = iphoneos;
15121480
VALIDATE_PRODUCT = YES;

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,25 @@
77
"test": "jest"
88
},
99
"dependencies": {
10-
"@redux-offline/redux-offline": "^2.3.3",
10+
"@redux-offline/redux-offline": "^2.4.0",
1111
"react": "^16.4.1",
12-
"react-native": "^0.55.4",
13-
"react-native-navigation": "^1.1.471",
12+
"react-native": "0.56.0",
13+
"react-native-navigation": "^1.1.476",
1414
"react-redux": "^5.0.7",
1515
"redux": "^4.0.0",
1616
"redux-saga": "^0.16.0"
1717
},
1818
"devDependencies": {
19-
"babel-eslint": "^8.2.3",
20-
"babel-jest": "^23.0.1",
21-
"babel-preset-react-native": "^4.0.0",
22-
"eslint": "^5.0.0",
19+
"babel-eslint": "^8.2.6",
20+
"babel-jest": "^23.4.0",
21+
"babel-preset-react-native": "^5.0.2",
22+
"eslint": "^4.19.1",
2323
"eslint-config-airbnb": "^17.0.0",
2424
"eslint-plugin-import": "^2.12.0",
2525
"eslint-plugin-jest": "^21.17.0",
2626
"eslint-plugin-jsx-a11y": "^6.0.3",
2727
"eslint-plugin-react": "^7.9.1",
28-
"jest": "^23.1.0",
28+
"jest": "^23.4.0",
2929
"react-test-renderer": "^16.4.1",
3030
"redux-logger": "^3.0.6"
3131
},

0 commit comments

Comments
 (0)