Skip to content

Commit 678303d

Browse files
Revert "Merge pull request #171 from StoDevX/greenkeeper-react-native-0.32.0"
This reverts commit 2b85dc0, reversing changes made to ac9903c.
1 parent e50b39b commit 678303d

File tree

9 files changed

+13
-21
lines changed

9 files changed

+13
-21
lines changed

.flowconfig

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[ignore]
22

33
# We fork some components by platform.
4-
.*/*[.]android.js
4+
.*/*.android.js
55

66
# Ignore templates with `@flow` in header
77
.*/local-cli/generator.*
@@ -23,6 +23,7 @@
2323
.*/Libraries/react-native/React.js
2424
.*/Libraries/react-native/ReactNative.js
2525
.*/node_modules/jest-runtime/build/__tests__/.*
26+
.*/react/.*/fbjs
2627

2728
[include]
2829

@@ -33,6 +34,7 @@ flow/
3334

3435
[options]
3536
module.system=haste
37+
module.ignore_non_literal_requires=true
3638

3739
esproposal.class_static_fields=enable
3840
esproposal.class_instance_fields=enable
@@ -48,11 +50,11 @@ suppress_type=$FlowIssue
4850
suppress_type=$FlowFixMe
4951
suppress_type=$FixMe
5052

51-
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(30\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
52-
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(30\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
53+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(2[0-9]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
54+
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(2[0-9]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
5355
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
5456

5557
unsafe.enable_getters_and_setters=true
5658

5759
[version]
58-
^0.30.0
60+
^0.29.0
-2.64 KB
Binary file not shown.
-4.24 KB
Binary file not shown.

ios/AllAboutOlaf.xcodeproj/xcshareddata/xcschemes/AllAboutOlaf.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0800"
3+
LastUpgradeVersion = "0730"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

ios/AllAboutOlaf/Images.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
{
22
"images" : [
33
{
4-
"size" : "20x20",
54
"idiom" : "iphone",
6-
"filename" : "[email protected]",
5+
"size" : "20x20",
76
"scale" : "2x"
87
},
98
{
10-
"size" : "20x20",
119
"idiom" : "iphone",
12-
"filename" : "[email protected]",
10+
"size" : "20x20",
1311
"scale" : "3x"
1412
},
1513
{
Binary file not shown.
Binary file not shown.

ios/Pods/Pods.xcodeproj/project.pbxproj

Lines changed: 1 addition & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
"moment": "2.14.1",
3636
"moment-timezone": "0.5.5",
3737
"querystring": "0.2.0",
38-
"react": "15.3.1",
39-
"react-native": "0.32.0",
38+
"react": "15.2.1",
39+
"react-native": "0.31.0",
4040
"react-native-android-tablayout": "0.3.0",
4141
"react-native-animatable": "0.6.1",
4242
"react-native-button": "1.6.0",
@@ -61,6 +61,6 @@
6161
"eslint-plugin-babel": "3.3.0",
6262
"eslint-plugin-flowtype": "2.11.4",
6363
"eslint-plugin-react": "6.1.2",
64-
"flow-bin": "0.30.0"
64+
"flow-bin": "0.29.0"
6565
}
6666
}

0 commit comments

Comments
 (0)