Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BPK-2295] Upgrade React Native to 0.59.0 #77

Merged
merged 13 commits into from
Mar 18, 2019
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions .flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
[libs]
node_modules/react-native/Libraries/react-native/react-native-interface.js
node_modules/react-native/flow/
node_modules/react-native/flow-github/
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed to fix this notice:

Screen Shot 2019-03-13 at 17 57 04

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we also have a look at the .flowconfig of RN at 0.59.0? That might contain some new configuration that we should also add.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was going to do that, but if the config we have is already working for us, what is there to be gained by changing it?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We used that mentality previously, only to find out that we were missing out on a bunch of flow functionality.

In other words, when we aligned our version of flow to RN's version and subsequently aligned the .flowconfig, we found errors we were otherwise oblivious to.

Who knows, perhaps #77 (comment) goes away when we align the config?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a fair point! Let me investigate 🤓

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've updated it based on RN's latest configs, no changes it seems (including #77 (comment) unfortunately) but as you say, good to be aligned with the latest and greatest.


[untyped]
.*/react-native-linear-gradient/.*
Expand Down Expand Up @@ -73,4 +72,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError

[version]
^0.78.0
^0.92.0
3 changes: 1 addition & 2 deletions .flowconfig.android
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
[libs]
node_modules/react-native/Libraries/react-native/react-native-interface.js
node_modules/react-native/flow/
node_modules/react-native/flow-github/

[untyped]
.*/react-native-linear-gradient/.*
Expand Down Expand Up @@ -73,4 +72,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError

[version]
^0.78.0
^0.92.0
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.0'
classpath 'com.android.tools.build:gradle:3.3.2'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To fix a build issue (see wix/react-native-navigation#4757 (comment))

classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
// NOTE: Do not place your application dependencies here; they belong
Expand Down
4 changes: 2 additions & 2 deletions android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed May 30 16:40:33 BST 2018
#Thu Mar 14 09:13:15 GMT 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
68 changes: 38 additions & 30 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,58 +2,66 @@ PODS:
- Backpack (6.3.0):
- FSCalendar (~> 2.8)
- boost-for-react-native (1.63.0)
- BVLinearGradient (2.4.0):
- BVLinearGradient (2.5.3):
- React
- DoubleConversion (1.1.6)
- Folly (2016.10.31.00):
- Folly (2018.10.22.00):
- boost-for-react-native
- DoubleConversion
- glog
- FSCalendar (2.8.0)
- glog (0.3.5)
- React (0.57.7):
- React/Core (= 0.57.7)
- React (0.59.0):
- React/Core (= 0.59.0)
- react-native-bpk-component-calendar (0.2.6):
- Backpack (~> 6.3.0)
- React
- react-native-maps (0.23.0):
- React
- React/Core (0.57.7):
- yoga (= 0.57.7.React)
- React/CxxBridge (0.57.7):
- Folly (= 2016.10.31.00)
- React/Core (0.59.0):
- yoga (= 0.59.0.React)
- React/CxxBridge (0.59.0):
- Folly (= 2018.10.22.00)
- React/Core
- React/cxxreact
- React/cxxreact (0.57.7):
- React/jsiexecutor
- React/cxxreact (0.59.0):
- boost-for-react-native (= 1.63.0)
- Folly (= 2016.10.31.00)
- React/jschelpers
- DoubleConversion
- Folly (= 2018.10.22.00)
- glog
- React/jsinspector
- React/DevSupport (0.57.7):
- React/DevSupport (0.59.0):
- React/Core
- React/RCTWebSocket
- React/fishhook (0.57.7)
- React/jschelpers (0.57.7):
- Folly (= 2016.10.31.00)
- React/PrivateDatabase
- React/jsinspector (0.57.7)
- React/PrivateDatabase (0.57.7)
- React/RCTAnimation (0.57.7):
- React/fishhook (0.59.0)
- React/jsi (0.59.0):
- DoubleConversion
- Folly (= 2018.10.22.00)
- glog
- React/jsiexecutor (0.59.0):
- DoubleConversion
- Folly (= 2018.10.22.00)
- glog
- React/cxxreact
- React/jsi
- React/jsinspector (0.59.0)
- React/RCTAnimation (0.59.0):
- React/Core
- React/RCTBlob (0.57.7):
- React/RCTBlob (0.59.0):
- React/Core
- React/RCTImage (0.57.7):
- React/RCTImage (0.59.0):
- React/Core
- React/RCTNetwork
- React/RCTNetwork (0.57.7):
- React/RCTNetwork (0.59.0):
- React/Core
- React/RCTText (0.57.7):
- React/RCTText (0.59.0):
- React/Core
- React/RCTWebSocket (0.57.7):
- React/RCTWebSocket (0.59.0):
- React/Core
- React/fishhook
- React/RCTBlob
- yoga (0.57.7.React)
- yoga (0.59.0.React)

DEPENDENCIES:
- Backpack (~> 6.3.0)
Expand Down Expand Up @@ -100,15 +108,15 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
Backpack: 6ec1bbe6b02798550ee219239d8b8d4b2b19b392
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
BVLinearGradient: 6d8909e3fc6b089defa4b89d967441fa6827a2ee
BVLinearGradient: b0b70acf63ee888829b7c2ebbf6b50e227396e55
DoubleConversion: bb338842f62ab1d708ceb63ec3d999f0f3d98ecd
Folly: c89ac2d5c6ab169cd7397ef27485c44f35f742c7
Folly: de497beb10f102453a1afa9edbf8cf8a251890de
FSCalendar: 3a5ed3636e2ba1b83ebebfcf0c2603105a6f5efe
glog: e8acf0ebbf99759d3ff18c86c292a5898282dcde
React: 1fe0eb13d90b625d94c3b117c274dcfd2e760e11
glog: aefd1eb5dda2ab95ba0938556f34b98e2da3a60d
React: 1d605e098d69bdf08960787f3446f0a9dc2e2ccf
react-native-bpk-component-calendar: 9492c4df99ff0d4a22245ea65b25ac0c286929b8
react-native-maps: 066c2afcc89e18726377bcc685315f989ca22449
yoga: b1ce48b6cf950b98deae82838f5173ea7cf89e85
yoga: 128daf064cacaede0c3bb27424b6b4c71052e6cd

PODFILE CHECKSUM: 1169f543a99bd602269c464bc58ab407c1afeaeb

Expand Down
12 changes: 8 additions & 4 deletions ios/native.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,16 @@
13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; };
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
265B6764DCEE4FB88CD4FA49 /* BpkIcon.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EBA91A53EB924F979E7C641D /* BpkIcon.ttf */; };
2D02E4BC1E0B4A80006451C7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
2D02E4BD1E0B4A84006451C7 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
2D02E4BF1E0B4AB3006451C7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
4E936218F43D4459BC11AFDD /* BpkIconIOS.ttf in Resources */ = {isa = PBXBuildFile; fileRef = B1636A374E1F45A88C968BB2 /* BpkIconIOS.ttf */; };
60005AA222382F040076B576 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 60005AA122382F040076B576 /* JavaScriptCore.framework */; };
93A11238766E920180390589 /* libPods-Backpack Native.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ABDC175C9DB0F0B9CBD71B51 /* libPods-Backpack Native.a */; };
D61144CB2200516700F76EAE /* RCTBPKCalendarDateUtilsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D61144CA2200516700F76EAE /* RCTBPKCalendarDateUtilsTests.m */; };
D66FC4882109D8610063B1A6 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D66FC4872109D8610063B1A6 /* Main.storyboard */; };
D66FC4912109DA3C0063B1A6 /* StorybookViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D66FC4902109DA3C0063B1A6 /* StorybookViewController.m */; };
265B6764DCEE4FB88CD4FA49 /* BpkIcon.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EBA91A53EB924F979E7C641D /* BpkIcon.ttf */; };
4E936218F43D4459BC11AFDD /* BpkIconIOS.ttf in Resources */ = {isa = PBXBuildFile; fileRef = B1636A374E1F45A88C968BB2 /* BpkIconIOS.ttf */; };
E120F32FF8B3695B5E878AC8 /* libPods-Backpack Native Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 967DA828F1B29C9BC73AEB4E /* libPods-Backpack Native Tests.a */; };
/* End PBXBuildFile section */

Expand Down Expand Up @@ -52,9 +53,11 @@
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = native/main.m; sourceTree = "<group>"; };
2D02E47B1E0B4A5D006451C7 /* Backpack Native-tvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Backpack Native-tvOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
2D02E4901E0B4A5D006451C7 /* Backpack Native-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Backpack Native-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
60005AA122382F040076B576 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
6B59545B47D6FA3C28AB6F8B /* Pods-Backpack Native.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Backpack Native.release.xcconfig"; path = "Pods/Target Support Files/Pods-Backpack Native/Pods-Backpack Native.release.xcconfig"; sourceTree = "<group>"; };
967DA828F1B29C9BC73AEB4E /* libPods-Backpack Native Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Backpack Native Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
ABDC175C9DB0F0B9CBD71B51 /* libPods-Backpack Native.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Backpack Native.a"; sourceTree = BUILT_PRODUCTS_DIR; };
B1636A374E1F45A88C968BB2 /* BpkIconIOS.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = BpkIconIOS.ttf; path = "../packages/react-native-bpk-component-icon/node_modules/bpk-svgs/dist/font/BpkIconIOS.ttf"; sourceTree = "<group>"; };
B3896E08C3804FF089E1E50B /* libRCTRestart.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRCTRestart.a; sourceTree = "<group>"; };
C63703994133B719A6838A67 /* Pods-Backpack Native Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Backpack Native Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-Backpack Native Tests/Pods-Backpack Native Tests.release.xcconfig"; sourceTree = "<group>"; };
C97A3DDE34691C31B4D830BA /* Pods-Backpack Native Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Backpack Native Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Backpack Native Tests/Pods-Backpack Native Tests.debug.xcconfig"; sourceTree = "<group>"; };
Expand All @@ -63,9 +66,8 @@
D66FC4872109D8610063B1A6 /* Main.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
D66FC48F2109DA3C0063B1A6 /* StorybookViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorybookViewController.h; sourceTree = "<group>"; };
D66FC4902109DA3C0063B1A6 /* StorybookViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = StorybookViewController.m; sourceTree = "<group>"; tabWidth = 4; };
EBA91A53EB924F979E7C641D /* BpkIcon.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = BpkIcon.ttf; path = "../packages/react-native-bpk-component-icon/node_modules/bpk-svgs/dist/font/BpkIcon.ttf"; sourceTree = "<group>"; };
FBB4289347D8862ADA374625 /* Pods-Backpack Native.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Backpack Native.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Backpack Native/Pods-Backpack Native.debug.xcconfig"; sourceTree = "<group>"; };
EBA91A53EB924F979E7C641D /* BpkIcon.ttf */ = {isa = PBXFileReference; name = "BpkIcon.ttf"; path = "../packages/react-native-bpk-component-icon/node_modules/bpk-svgs/dist/font/BpkIcon.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
B1636A374E1F45A88C968BB2 /* BpkIconIOS.ttf */ = {isa = PBXFileReference; name = "BpkIconIOS.ttf"; path = "../packages/react-native-bpk-component-icon/node_modules/bpk-svgs/dist/font/BpkIconIOS.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -81,6 +83,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
60005AA222382F040076B576 /* JavaScriptCore.framework in Frameworks */,
93A11238766E920180390589 /* libPods-Backpack Native.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -202,6 +205,7 @@
D674D18120BEDBCA008F2E97 /* Frameworks */ = {
isa = PBXGroup;
children = (
60005AA122382F040076B576 /* JavaScriptCore.framework */,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had to manually link JavaScriptCore as mentioned in the 0.58.0 release notes:

if you are an iOS developer, you'll need to manually link JavaScriptCore.framework when upgrading;

ABDC175C9DB0F0B9CBD71B51 /* libPods-Backpack Native.a */,
967DA828F1B29C9BC73AEB4E /* libPods-Backpack Native Tests.a */,
);
Expand Down