Skip to content

Commit d122f33

Browse files
authored
Merge pull request #213 from BranchMetrics/react-native-version-bump
Update to RN 0.43.1, React 16.0.0-alpha to fix unit test issues
2 parents e58f446 + d8de216 commit d122f33

File tree

530 files changed

+2497
-2166
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

530 files changed

+2497
-2166
lines changed

native-tests/ios/Podfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ platform :ios, "8.0"
22

33
target "NativeTests" do
44
pod "React", path: "../../node_modules/react-native"
5+
pod "Yoga", path: "../../node_modules/react-native/ReactCommon/yoga"
56
pod "react-native-branch", path: "../.."
67
pod "Branch-SDK", path: "../../ios"
78
end

native-tests/ios/Podfile.lock

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,25 @@ PODS:
55
- Branch-SDK/Core (0.14.12)
66
- Branch-SDK/without-IDFA (0.14.12)
77
- OCMock (3.4)
8-
- React (0.41.2):
9-
- React/Core (= 0.41.2)
10-
- react-native-branch (2.0.0-beta.3):
8+
- React (0.43.1):
9+
- React/Core (= 0.43.1)
10+
- react-native-branch (2.0.0-beta.6):
1111
- Branch-SDK
1212
- React
13-
- React/Core (0.41.2):
13+
- React/Core (0.43.1):
1414
- React/cxxreact
15-
- React/yoga
16-
- React/cxxreact (0.41.2):
15+
- Yoga (= 0.43.1.React)
16+
- React/cxxreact (0.43.1):
1717
- React/jschelpers
18-
- React/jschelpers (0.41.2)
19-
- React/yoga (0.41.2)
18+
- React/jschelpers (0.43.1)
19+
- Yoga (0.43.1.React)
2020

2121
DEPENDENCIES:
2222
- Branch-SDK (from `../../ios`)
2323
- OCMock
2424
- React (from `../../node_modules/react-native`)
2525
- react-native-branch (from `../..`)
26+
- Yoga (from `../../node_modules/react-native/ReactCommon/yoga`)
2627

2728
EXTERNAL SOURCES:
2829
Branch-SDK:
@@ -31,13 +32,16 @@ EXTERNAL SOURCES:
3132
:path: "../../node_modules/react-native"
3233
react-native-branch:
3334
:path: "../.."
35+
Yoga:
36+
:path: "../../node_modules/react-native/ReactCommon/yoga"
3437

3538
SPEC CHECKSUMS:
3639
Branch-SDK: 8a59b08daa0b283cd1bf0fd4842a521885e35ae6
3740
OCMock: 35ae71d6a8fcc1b59434d561d1520b9dd4f15765
38-
React: 2b10c07d947dea71c144a33764e9162ed81e3825
39-
react-native-branch: 55612ff46bcddee14cd40eb654f8fdb81ebc69b8
41+
React: c28b1a7b7510eda68c58ed1bd22e85a76ef4f819
42+
react-native-branch: 986b869e807976b340d7e799b32d09c82afc5cde
43+
Yoga: f3e6a7a683f55875a5bf521e4dc2a8511ebc7f0d
4044

41-
PODFILE CHECKSUM: 8b9dbe40d9d801b8aa636187bd99fc854cb446b0
45+
PODFILE CHECKSUM: 965caaeb92ef244aba06c04762387dce51799eca
4246

4347
COCOAPODS: 1.2.1

native-tests/ios/Pods/Headers/Private/React/JSBundleType.h

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

native-tests/ios/Pods/Headers/Private/React/JSCSamplingProfiler.h

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

native-tests/ios/Pods/Headers/Private/React/JSCWrapper.h

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

native-tests/ios/Pods/Headers/Private/React/JavaScriptCore.h

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

native-tests/ios/Pods/Headers/Private/React/RCTAccessibilityManager.h

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

native-tests/ios/Pods/Headers/Private/React/RCTActivityIndicatorView.h

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

native-tests/ios/Pods/Headers/Private/React/RCTActivityIndicatorViewManager.h

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

native-tests/ios/Pods/Headers/Private/React/RCTAlertManager.h

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

0 commit comments

Comments
 (0)