Skip to content
This repository has been archived by the owner on Mar 12, 2020. It is now read-only.

React Native Upgrade for 0.59 #1553

Merged
merged 11 commits into from
Apr 9, 2019
Merged
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
- Include local timezone in each MP request so MP can decide to render datetimes in the user’s local time - alloy
- Fixes overflowing Save button on small screen devices - ashley
- Moves fair open hours display to metaphysics - kieran
- Upgrade to React Native 0.59.2 - orta/alloy

### 1.9.4

Expand Down
3 changes: 0 additions & 3 deletions Example/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,5 @@ gem 'cocoapods-check'
# To manage our secret keys
gem "cocoapods-keys"

# To apply fixes to the React Native code
gem 'cocoapods-fix-react-native'
Copy link
Contributor

Choose a reason for hiding this comment

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

😻


# To avoid ambiguous Podfile.lock contents
gem "psych"
2 changes: 0 additions & 2 deletions Example/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ GEM
nap (~> 1.0)
cocoapods-deintegrate (1.0.2)
cocoapods-downloader (1.2.2)
cocoapods-fix-react-native (2019.03.19.11)
cocoapods-keys (2.0.2)
dotenv
osx_keychain
Expand Down Expand Up @@ -85,7 +84,6 @@ PLATFORMS
DEPENDENCIES
cocoapods
cocoapods-check
cocoapods-fix-react-native
cocoapods-keys
psych

Expand Down
7 changes: 5 additions & 2 deletions Example/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ source 'https://github.com/CocoaPods/Specs.git'

inhibit_all_warnings!
platform :ios, '9.0'

# FIXME: Figure out why we are getting hit by this issue.
install! 'cocoapods', :deterministic_uuids => false

Expand All @@ -31,6 +32,7 @@ double_conversion_spec_path = File.join(react_path, 'third-party-podspecs/Double
sentry_path = File.join(node_modules_path, 'react-native-sentry')
tispi_stripe_spec_path = File.join(node_modules_path, 'tipsi-stripe/tipsi-stripe.podspec')
mapbox_path = File.join(node_modules_path, '@mapbox/react-native-mapbox-gl')
react_native_navigator_ios_path = File.join(node_modules_path, 'react-native-navigator-ios')

target 'Emission' do
pod 'Emission', :path => '../', :inhibit_warnings => false
Expand Down Expand Up @@ -68,6 +70,9 @@ target 'Emission' do
pod 'react-native-mapbox-gl', :path => mapbox_path
pod 'RNSVG', :path => '../node_modules/react-native-svg'

# Deprecated from React Native, but fine until we support Android
pod 'react-native-navigator-ios', :path => react_native_navigator_ios_path

# Bottom Sheet view controller for Map view
pod 'Pulley', :git => 'https://github.com/l2succes/Pulley.git', :branch => 'master'

Expand All @@ -94,8 +99,6 @@ plugin 'cocoapods-keys', {
]
}

plugin 'cocoapods-fix-react-native'

post_install do |installer|
emission = installer.pods_project.targets.find { |target| target.name == 'Emission' }
emission.build_configurations.each do |config|
Expand Down
118 changes: 66 additions & 52 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,26 @@ PODS:
- "Artsy+UIFonts (>= 3.0.0)"
- DoubleConversion (= 1.1.6)
- Extraction (>= 1.2.1)
- Folly (= 2016.10.31.00)
- Folly (= 2018.10.22.00)
- glog (= 0.3.5)
- ISO8601DateFormatter
- Pulley
- react-native-mapbox-gl (= 6.1.4)
- React/Core (= 0.57.7)
- React/CxxBridge (= 0.57.7)
- React/RCTActionSheet (= 0.57.7)
- React/RCTAnimation (= 0.57.7)
- React/RCTCameraRoll (= 0.57.7)
- React/RCTGeolocation (= 0.57.7)
- React/RCTImage (= 0.57.7)
- React/RCTLinkingIOS (= 0.57.7)
- React/RCTNetwork (= 0.57.7)
- React/RCTText (= 0.57.7)
- React/Core (= 0.59.2)
- React/CxxBridge (= 0.59.2)
- React/RCTActionSheet (= 0.59.2)
- React/RCTAnimation (= 0.59.2)
- React/RCTCameraRoll (= 0.59.2)
- React/RCTGeolocation (= 0.59.2)
- React/RCTImage (= 0.59.2)
- React/RCTLinkingIOS (= 0.59.2)
- React/RCTNetwork (= 0.59.2)
- React/RCTText (= 0.59.2)
- RNSVG (= 9.0.4)
- SDWebImage (< 4, >= 3.7.2)
- SentryReactNative (= 0.30.3)
- tipsi-stripe (= 5.2.4)
- yoga (= 0.57.7.React)
- tipsi-stripe (= 7.4.0)
- yoga (= 0.59.2.React)
- Expecta (1.0.6)
- Extraction (1.2.4):
- Extraction/ARAnimationContinuation (= 1.2.4)
Expand Down Expand Up @@ -66,7 +66,7 @@ PODS:
- FBSnapshotTestCase/SwiftSupport (2.1.4):
- FBSnapshotTestCase/Core
- FLKAutoLayout (1.0.0)
- Folly (2016.10.31.00):
- Folly (2018.10.22.00):
- boost-for-react-native
- DoubleConversion
- glog
Expand All @@ -87,51 +87,61 @@ PODS:
- ORStackView (2.0.3):
- FLKAutoLayout
- Pulley (2.6.2)
- React (0.57.7):
- React/Core (= 0.57.7)
- React (0.59.2):
- React/Core (= 0.59.2)
- react-native-mapbox-gl (6.1.4):
- React
- React/Core (0.57.7):
- yoga (= 0.57.7.React)
- React/CxxBridge (0.57.7):
- Folly (= 2016.10.31.00)
- react-native-navigator-ios (1.0.0):
- React
- React/Core (0.59.2):
- yoga (= 0.59.2.React)
- React/CxxBridge (0.59.2):
- Folly (= 2018.10.22.00)
- React/Core
- React/cxxreact
- React/cxxreact (0.57.7):
- React/jsiexecutor
- React/cxxreact (0.59.2):
- 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.2):
- 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/RCTActionSheet (0.57.7):
- React/fishhook (0.59.2)
- React/jsi (0.59.2):
- DoubleConversion
- Folly (= 2018.10.22.00)
- glog
- React/jsiexecutor (0.59.2):
- DoubleConversion
- Folly (= 2018.10.22.00)
- glog
- React/cxxreact
- React/jsi
- React/jsinspector (0.59.2)
- React/RCTActionSheet (0.59.2):
- React/Core
- React/RCTAnimation (0.57.7):
- React/RCTAnimation (0.59.2):
- React/Core
- React/RCTBlob (0.57.7):
- React/RCTBlob (0.59.2):
- React/Core
- React/RCTCameraRoll (0.57.7):
- React/RCTCameraRoll (0.59.2):
- React/Core
- React/RCTImage
- React/RCTGeolocation (0.57.7):
- React/RCTGeolocation (0.59.2):
- React/Core
- React/RCTImage (0.57.7):
- React/RCTImage (0.59.2):
- React/Core
- React/RCTNetwork
- React/RCTLinkingIOS (0.57.7):
- React/RCTLinkingIOS (0.59.2):
- React/Core
- React/RCTNetwork (0.57.7):
- React/RCTNetwork (0.59.2):
- React/Core
- React/RCTText (0.57.7):
- React/RCTText (0.59.2):
- React/Core
- React/RCTWebSocket (0.57.7):
- React/RCTWebSocket (0.59.2):
- React/Core
- React/fishhook
- React/RCTBlob
Expand All @@ -152,12 +162,12 @@ PODS:
- Sentry (~> 3.9.0)
- Sentry/KSCrash (~> 3.9.0)
- Specta (1.0.7)
- Stripe (11.2.0)
- tipsi-stripe (5.2.4):
- Stripe (14.0.0)
- tipsi-stripe (7.4.0):
- React
- Stripe (~> 11.2.0)
- Stripe (~> 14.0.0)
- "UIView+BooleanAnimations (1.0.2)"
- yoga (0.57.7.React)
- yoga (0.59.2.React)

DEPENDENCIES:
- ARGenericTableViewController
Expand All @@ -173,6 +183,7 @@ DEPENDENCIES:
- Keys (from `Pods/CocoaPodsKeys`)
- Pulley (from `https://github.com/l2succes/Pulley.git`, branch `master`)
- "react-native-mapbox-gl (from `../node_modules/@mapbox/react-native-mapbox-gl`)"
- react-native-navigator-ios (from `../node_modules/react-native-navigator-ios`)
- React/DevSupport (from `../node_modules/react-native`)
- RNSVG (from `../node_modules/react-native-svg`)
- SAMKeychain
Expand Down Expand Up @@ -227,6 +238,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native"
react-native-mapbox-gl:
:path: "../node_modules/@mapbox/react-native-mapbox-gl"
react-native-navigator-ios:
:path: "../node_modules/react-native-navigator-ios"
RNSVG:
:path: "../node_modules/react-native-svg"
SentryReactNative:
Expand Down Expand Up @@ -255,32 +268,33 @@ SPEC CHECKSUMS:
Artsy-UIButtons: 3c396f0fad352a7b0332100e0ffcb0ca577e0082
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
DoubleConversion: bb338842f62ab1d708ceb63ec3d999f0f3d98ecd
Emission: f4f9aeb1c5e7f8d5d3f6f088f046160dcd00080a
Emission: 15cac9f45e91794fb2f603e2b24395d9fefa5094
Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5
Extraction: 642a73b8ccc7806e9a7daf95ebb4c14c374829f1
FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
FLKAutoLayout: 106b14dbae09d32c6730190f4e78a959759ba4a4
Folly: c89ac2d5c6ab169cd7397ef27485c44f35f742c7
glog: e8acf0ebbf99759d3ff18c86c292a5898282dcde
Folly: de497beb10f102453a1afa9edbf8cf8a251890de
glog: aefd1eb5dda2ab95ba0938556f34b98e2da3a60d
ISO8601DateFormatter: 4551b6ce4f83185425f583b0b3feb3c7b59b942c
Keys: 7e91fe066d4f94790fd35b5a9fc63e441cd3b6d2
KSCrash: e4cda5c8612c5f9478defcf43418f24870d313f4
"NSURL+QueryDictionary": bae616404e2adf6409d3d5c02a093cbf44c8a236
ORStackView: b9507271cb41fb9e0b3eecc6414d831201e7cf7c
Pulley: 2679a2b5a9714c5eb760b1fbb535d15c60e50fb4
React: 67899bbb285ceb9b4ee1c88b3991602ba5772ad2
React: 9d063e2f356c8cd2f54dd550d4507740037cbabe
react-native-mapbox-gl: b7309e99290963cc7fe0e34db86c6e16890cfcee
react-native-navigator-ios: 93db84cc26b6f8d776e1f504c56082f593efcd09
RNSVG: 36f6615444ab569023444e09b01a1900d964e967
SAMKeychain: 1fc9ae02f576365395758b12888c84704eebc423
SDWebImage: 098e97e6176540799c27e804c96653ee0833d13c
Sentry: e2707f9a6b498277d9620a48fcb1bd3b655c8473
SentryReactNative: 3dff4e9bd82aa581dc64ff8d2524d7007cea076b
Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66
Stripe: 898f83a95d72180c6eb4acd65b2ae6158fc6a8bd
tipsi-stripe: 25a3f6ba746e9a27f7b21e928c9974d016efcd77
Stripe: db29ad197c74aca6fb981e4e8355cf7ebd0fca5a
tipsi-stripe: a06dc6eaccd598d0c4d3094cd420c71844701c46
"UIView+BooleanAnimations": a760be9a066036e55f298b7b7350a6cb14cfcd97
yoga: 192d724e53380b783e09b7d687a55cd8ed5188be
yoga: 3768a3026ade0fb46a68f3a31a917cf86bc34fc4

PODFILE CHECKSUM: 1ccdde56e14a7d26fbc871fe040f9922f4385473
PODFILE CHECKSUM: 6ce077b9f33ee2c2539754b4d34c29b0fe2abf2b

COCOAPODS: 1.6.0
Loading