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

fix: point to Pulley fork with iOS 14 fixes #4224

Merged
merged 1 commit into from
Dec 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ upcoming:
- Avoid shrinking the background on non-fullscreen fancy modals - david
- removed x from inquiry sent notification - lily
- Minor copy changes for My Collection - pepopowitz
- Fix city guide hang on iOS 14 - brian
releases:
- version: 6.7.2
date: November 30, 2020
Expand Down
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ target 'Artsy' do
pod 'Emission', path: './emission'

# For Stripe integration with Emission. Using Ash's fork for this issue: https://github.com/tipsi/tipsi-stripe/issues/408
pod 'Pulley', git: 'https://github.com/l2succes/Pulley.git', branch: 'master'
pod 'Pulley', git: 'https://github.com/brainbicycle/Pulley.git', branch: 'master'

# Facebook
pod 'FBSDKCoreKit', '~> 8.0.0'
Expand Down
14 changes: 7 additions & 7 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ DEPENDENCIES:
- OHHTTPStubs
- ORKeyboardReactingApplication
- ORStackView (= 2.0.3)
- Pulley (from `https://github.com/l2succes/Pulley.git`, branch `master`)
- Pulley (from `https://github.com/brainbicycle/Pulley.git`, branch `master`)
- Quick (= 2.0.0)
- RCTRequired (from `./node_modules/react-native/Libraries/RCTRequired`)
- RCTTypeSafety (from `./node_modules/react-native/Libraries/TypeSafety`)
Expand Down Expand Up @@ -749,7 +749,7 @@ EXTERNAL SOURCES:
:git: https://github.com/orta/JLRoutes.git
Pulley:
:branch: master
:git: https://github.com/l2succes/Pulley.git
:git: https://github.com/brainbicycle/Pulley.git
RCTRequired:
:path: "./node_modules/react-native/Libraries/RCTRequired"
RCTTypeSafety:
Expand Down Expand Up @@ -857,8 +857,8 @@ CHECKOUT OPTIONS:
:commit: 5a6df1a795766a4d3e586508e86ec9271d3ef3d9
:git: https://github.com/orta/JLRoutes.git
Pulley:
:commit: 23f1c0e8cad5a72d03176fe33535c14726e7a160
:git: https://github.com/l2succes/Pulley.git
:commit: f677b18b332ea3798dc379879dbc0d038efd3ccc
:git: https://github.com/brainbicycle/Pulley.git
SSFadingScrollView:
:commit: 3920e3582e46c9fe23b0d1200e28614ebd66d801
:git: https://github.com/alloy/SSFadingScrollView.git
Expand All @@ -882,7 +882,7 @@ SPEC CHECKSUMS:
CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f
CocoaLumberjack: aa9dcab71bdf9eaf2a63bbd9ddc87863efe45457
DHCShakeNotifier: 64048427ecaa763f2472d0032f58bf7a10074eee
DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
DoubleConversion: cde416483dac037923206447da6e1454df403714
EDColor: c83f9a61f9f9b3c23d541f1feb561558e29cb088
Emission: 5c5fb14e43f9ddc811185e8f17e11ab03a98dc09
Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5
Expand All @@ -904,7 +904,7 @@ SPEC CHECKSUMS:
Folly: b73c3869541e86821df3c387eb0af5f65addfab4
Forgeries: 64ced144ea8341d89a7eec9d1d7986f0f1366250
FXBlurView: 5121730176fd52bcf7bffd0bd8c1485e8aabc3cb
glog: 1f3da668190260b06b429bb211bfbee5cd790c28
glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
Interstellar: ab67502af03105f92100a043e178d188a1a437c9
INTUAnimationEngine: 3a7d63738cd51af573d16848a771feedea7cc9f2
ISO8601DateFormatter: 8311a2d4e265b269b2fed7ab4db685dcb0a7ccb2
Expand Down Expand Up @@ -982,6 +982,6 @@ SPEC CHECKSUMS:
Yoga: 7d13633d129fd179e01b8953d38d47be90db185a
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a

PODFILE CHECKSUM: 2b3d60f7af7fb9abd9e1ca7d370704ed8cc149ac
PODFILE CHECKSUM: 872157d0f969a68e0fe9d70e1ce0095b013a9ba7

COCOAPODS: 1.7.5