Skip to content

Commit bae701f

Browse files
author
Chris Bobbe
committed
Following the parent, where we introduced Cocoapods, add react-native-unimodules, using the example Podfile provided by that package, at https://gist.github.com/sjchmiela/6c079f2173938a9a61a7c6f053c45000. react-native-unimodules lets us use individual packages that are part of the Expo SDK. The one we want is expo-apple-authentication, for zulip#3964. Note that there is no caret (^) on 0.6.0! The maintainers have assumed that if you're using the latest version of react-native-unimodules, you're also using the latest version of react-native. We encountered the error message posted at https://github.com/unimodules/react-native-unimodules/issues/100, and decided that staying with 0.6.0 is most feasible. Support for react-native v0.59 dropped somewhere between 0.6.0 and 0.7.0-rc.4, so backwards compatibility (not to mention semantic versioning) seems not to be a priority. 0.7.0-rc.4 will be important for us, because that's when AndroidX compatibility is introduced, according to https://github.com/unimodules/react-native-unimodules/issues/100#issuecomment-566436685. This may mean that AndroidX compatibility (open PR zulip#3852) and using RN v0.60.0 (issue zulip#3548) may have to be done simultaneously.
1 parent 4bd4cd5 commit bae701f

File tree

4 files changed

+152
-3
lines changed

4 files changed

+152
-3
lines changed

ios/Podfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ target 'ZulipMobile' do
1616
'RCTNetwork',
1717
'RCTWebSocket', # Needed for debugging
1818
'RCTAnimation', # Needed for FlatList and animations running on native UI thread
19+
'RCTImage', # Included in react-native-unimodules' example Podfile
1920
# Add any other subspecs you want to use in your project
2021
]
2122
# Explicitly include Yoga if you are using RN >= 0.42.0

ios/Podfile.lock

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ PODS:
5050
- React/Core
5151
- React/RCTBlob (0.59.10):
5252
- React/Core
53+
- React/RCTImage (0.59.10):
54+
- React/Core
55+
- React/RCTNetwork
5356
- React/RCTNetwork (0.59.10):
5457
- React/Core
5558
- React/RCTText (0.59.10):
@@ -87,6 +90,7 @@ DEPENDENCIES:
8790
- React/CxxBridge (from `../node_modules/react-native`)
8891
- React/DevSupport (from `../node_modules/react-native`)
8992
- React/RCTAnimation (from `../node_modules/react-native`)
93+
- React/RCTImage (from `../node_modules/react-native`)
9094
- React/RCTNetwork (from `../node_modules/react-native`)
9195
- React/RCTText (from `../node_modules/react-native`)
9296
- React/RCTWebSocket (from `../node_modules/react-native`)
@@ -192,6 +196,6 @@ SPEC CHECKSUMS:
192196
UMTaskManagerInterface: 1e70fe58b872355f0ecb44fb81bb1a16484047f0
193197
yoga: 684513b14b03201579ba3cee20218c9d1298b0cc
194198

195-
PODFILE CHECKSUM: 3194227f6331ef767276e6757e018c5a0e320f60
199+
PODFILE CHECKSUM: 9a7a98d7d182a07846dea24a4e5aa720d71b8909
196200

197201
COCOAPODS: 1.9.1

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
"react-native-screens": "^1.0.0-alpha.23",
6161
"react-native-sound": "^0.10.9",
6262
"react-native-text-input-reset": "^1.0.2",
63+
"react-native-unimodules": "0.6.0",
6364
"react-native-vector-icons": "^6.6.0",
6465
"react-native-webview": "^5.0.0",
6566
"react-navigation": "^2.18.3",

yarn.lock

Lines changed: 145 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1468,6 +1468,22 @@
14681468
lodash.unescape "4.0.1"
14691469
semver "5.5.0"
14701470

1471+
"@unimodules/core@~4.0.0":
1472+
version "4.0.0"
1473+
resolved "https://registry.yarnpkg.com/@unimodules/core/-/core-4.0.0.tgz#898dafa5a121e7d6d7d4acd9c0c38d12f7da5b19"
1474+
integrity sha512-lHxRmCG9DK3/aA2lnBKPS32K95NpYE10mZQRp5dycSptgN0DIeWWHuE01SndcSUACGyEP+tDO+DnGo8mhLlt4Q==
1475+
dependencies:
1476+
compare-versions "^3.4.0"
1477+
1478+
"@unimodules/react-native-adapter@~4.0.0":
1479+
version "4.0.0"
1480+
resolved "https://registry.yarnpkg.com/@unimodules/react-native-adapter/-/react-native-adapter-4.0.0.tgz#2e02246f6450201d6cb0720f849c7059e8a9bc6d"
1481+
integrity sha512-zGAyDhqAEWvshdSxc523srP6OAZaSr95Cv5EuxLJbFGcJENHhK8o/qxhwS7/LYTF3LqtOlnSlwQta3v3y6kF4A==
1482+
dependencies:
1483+
invariant "^2.2.4"
1484+
lodash "^4.5.0"
1485+
prop-types "^15.6.1"
1486+
14711487
"@yarnpkg/lockfile@^1.0.2", "@yarnpkg/lockfile@^1.1.0":
14721488
version "1.1.0"
14731489
resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
@@ -2571,6 +2587,11 @@ commondir@^1.0.1:
25712587
resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
25722588
integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
25732589

2590+
compare-versions@^3.4.0:
2591+
version "3.6.0"
2592+
resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz#1a5689913685e5a87637b8d3ffca75514ec41d62"
2593+
integrity sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==
2594+
25742595
component-emitter@^1.2.1:
25752596
version "1.3.0"
25762597
resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
@@ -3606,6 +3627,39 @@ expect@^24.1.0, expect@^24.9.0:
36063627
jest-message-util "^24.9.0"
36073628
jest-regex-util "^24.9.0"
36083629

3630+
expo-app-loader-provider@~7.0.0:
3631+
version "7.0.0"
3632+
resolved "https://registry.yarnpkg.com/expo-app-loader-provider/-/expo-app-loader-provider-7.0.0.tgz#9bfff831a204d0a8896e0120bce2209c4304ef03"
3633+
integrity sha512-C+5zpZN2T7PCj7weLs/ZgAC+y9dvu0VdTXD00Jf9Wo7Pxu/lsLh6ljg9JL91c+2tYDzMEODPNmT+JOUIxAr5zQ==
3634+
3635+
expo-asset@~7.0.0:
3636+
version "7.0.0"
3637+
resolved "https://registry.yarnpkg.com/expo-asset/-/expo-asset-7.0.0.tgz#6d2ba460dd43807f40580199c0b76c508eb1ca63"
3638+
integrity sha512-MwWrlpzaZqT0NU0V3Wn8oA1pMb7Al49aYAWMPEUZ2UV5NyVAbzYPuS2duIfwX55ivczjJZHpwrhd0hb/3l9ngQ==
3639+
dependencies:
3640+
blueimp-md5 "^2.10.0"
3641+
path-browserify "^1.0.0"
3642+
url-parse "^1.4.4"
3643+
3644+
expo-constants@~7.0.0:
3645+
version "7.0.1"
3646+
resolved "https://registry.yarnpkg.com/expo-constants/-/expo-constants-7.0.1.tgz#87be02b6dae5c44a3246537452a0d77af15d46bf"
3647+
integrity sha512-n9S6lsEfTAhLY+x/Yrtc1rvVUhuEF+CcSWr/reAIGtk35+PYrAKfV4pbetRtqX9tl947bJv7kBQX6jpwYpeIpQ==
3648+
dependencies:
3649+
ua-parser-js "^0.7.19"
3650+
3651+
expo-file-system@~7.0.0:
3652+
version "7.0.0"
3653+
resolved "https://registry.yarnpkg.com/expo-file-system/-/expo-file-system-7.0.0.tgz#ac98233b18774cce299fffd9451f08f21b116564"
3654+
integrity sha512-ignf5Vf5cPDYO/4HgUkgnL574wMbCNxyazlOvBgV34rLGJzBbFsn++hqC7njr2VTpIIXh2G9vp1+8g6cvsQdqA==
3655+
dependencies:
3656+
uuid-js "^0.7.5"
3657+
3658+
expo-permissions@~7.0.0:
3659+
version "7.0.0"
3660+
resolved "https://registry.yarnpkg.com/expo-permissions/-/expo-permissions-7.0.0.tgz#f4135c3cf8e49c673a9a714459a1eb2b40fe2092"
3661+
integrity sha512-C+qyVz+pdZO4YpVR2HSC3gsBZg0Qb8brCFgzmDmWcAtgrOiHClaLPdhI2XtQuGh8ubXcKPUGZp++UCEGiG0Jxg==
3662+
36093663
extend-shallow@^1.1.2:
36103664
version "1.1.4"
36113665
resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-1.1.4.tgz#19d6bf94dfc09d76ba711f39b872d21ff4dd9071"
@@ -6124,7 +6178,7 @@ lodash.uniqby@^4.4.0:
61246178
resolved "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz#d99c07a669e9e6d24e1362dfe266c67616af1302"
61256179
integrity sha1-2ZwHpmnp5tJOE2Lf4mbGdhavEwI=
61266180

6127-
lodash@^4.0.0, lodash@^4.14.2, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0, lodash@^4.6.1, lodash@^4.7.14:
6181+
lodash@^4.0.0, lodash@^4.14.2, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0, lodash@^4.5.0, lodash@^4.6.1, lodash@^4.7.14:
61286182
version "4.17.15"
61296183
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
61306184
integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
@@ -7466,6 +7520,11 @@ pascalcase@^0.1.1:
74667520
resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
74677521
integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
74687522

7523+
path-browserify@^1.0.0:
7524+
version "1.0.1"
7525+
resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd"
7526+
integrity sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==
7527+
74697528
path-exists@^3.0.0:
74707529
version "3.0.0"
74717530
resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
@@ -8067,6 +8126,30 @@ react-native-text-input-reset@^1.0.2:
80678126
resolved "https://registry.yarnpkg.com/react-native-text-input-reset/-/react-native-text-input-reset-1.0.2.tgz#cfaa6d9b45da934e1725c01b1698f8a05591661c"
80688127
integrity sha512-URM1iHWBhYkdQ6zuBGdbX1hIav9aDTKnlGDnZQk3Ny+lxKmgsMHfFf1QZe8c91Gyj/SnCWgQMVv3um4T0kXqQw==
80698128

8129+
8130+
version "0.6.0"
8131+
resolved "https://registry.yarnpkg.com/react-native-unimodules/-/react-native-unimodules-0.6.0.tgz#f62c753705f4b97ba19e2834d8ad3357e204537c"
8132+
integrity sha512-b563vqelTLtagFLWiI428rUTx4BxWpytlsEC1xcAQdf8chtnVr7QrkRXatiIvJmDAYLL8l+8UxdBW9e0f2rZ9Q==
8133+
dependencies:
8134+
"@unimodules/core" "~4.0.0"
8135+
"@unimodules/react-native-adapter" "~4.0.0"
8136+
chalk "^2.4.2"
8137+
expo-app-loader-provider "~7.0.0"
8138+
expo-asset "~7.0.0"
8139+
expo-constants "~7.0.0"
8140+
expo-file-system "~7.0.0"
8141+
expo-permissions "~7.0.0"
8142+
unimodules-barcode-scanner-interface "~4.0.0"
8143+
unimodules-camera-interface "~4.0.0"
8144+
unimodules-constants-interface "~4.0.0"
8145+
unimodules-face-detector-interface "~4.0.0"
8146+
unimodules-file-system-interface "~4.0.0"
8147+
unimodules-font-interface "~4.0.0"
8148+
unimodules-image-loader-interface "~4.0.0"
8149+
unimodules-permissions-interface "~4.0.0"
8150+
unimodules-sensors-interface "~4.0.0"
8151+
unimodules-task-manager-interface "~4.0.0"
8152+
80708153
react-native-vector-icons@^6.6.0:
80718154
version "6.6.0"
80728155
resolved "https://registry.yarnpkg.com/react-native-vector-icons/-/react-native-vector-icons-6.6.0.tgz#66cf004918eb05d90778d64bd42077c1800d481b"
@@ -9867,6 +9950,11 @@ ua-parser-js@^0.7.18:
98679950
resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.20.tgz#7527178b82f6a62a0f243d1f94fd30e3e3c21098"
98689951
integrity sha512-8OaIKfzL5cpx8eCMAhhvTlft8GYF8b2eQr6JkCyVdrgjcytyOmPCXrqXFcUnhonRpLlh5yxEZVohm6mzaowUOw==
98699952

9953+
ua-parser-js@^0.7.19:
9954+
version "0.7.21"
9955+
resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.21.tgz#853cf9ce93f642f67174273cc34565ae6f308777"
9956+
integrity sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==
9957+
98709958
uglify-es@^3.1.9:
98719959
version "3.3.9"
98729960
resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677"
@@ -9921,6 +10009,56 @@ unicode-property-aliases-ecmascript@^1.0.4:
992110009
resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz#a9cc6cc7ce63a0a3023fc99e341b94431d405a57"
992210010
integrity sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==
992310011

10012+
unimodules-barcode-scanner-interface@~4.0.0:
10013+
version "4.0.0"
10014+
resolved "https://registry.yarnpkg.com/unimodules-barcode-scanner-interface/-/unimodules-barcode-scanner-interface-4.0.0.tgz#69c54ef0d25448dc380de9ca3b0cba3daa2a94c4"
10015+
integrity sha512-XAW+8s7w/dQ514I/SPfBKHPmbaCOEpYAkdn1aaBoWocVfdvOKf8SqwHSIaP2W/SFUwWNRF4Wqv2HBt1dvuhSSg==
10016+
10017+
unimodules-camera-interface@~4.0.0:
10018+
version "4.0.0"
10019+
resolved "https://registry.yarnpkg.com/unimodules-camera-interface/-/unimodules-camera-interface-4.0.0.tgz#234c28f4d326ef3e30f15572c07e528557485619"
10020+
integrity sha512-rEYD3mKarxzgiWWL8J0mPAxzV4i1WI9DsNMRxyV2T7qC/WWIucroZX72O1BkYjUbIKerGmJWeGYbWHheP4/rsA==
10021+
10022+
unimodules-constants-interface@~4.0.0:
10023+
version "4.0.0"
10024+
resolved "https://registry.yarnpkg.com/unimodules-constants-interface/-/unimodules-constants-interface-4.0.0.tgz#c71be663a442b43eed773451a4f366a1c47821ac"
10025+
integrity sha512-FTM64GP+uawURWhuExrsCMebpcu0DdREUCuUmes5qd3/uTM2gqmhbm/ZwSKviH/ar4h630Fdb6P6v9o4MDInbA==
10026+
10027+
unimodules-face-detector-interface@~4.0.0:
10028+
version "4.0.0"
10029+
resolved "https://registry.yarnpkg.com/unimodules-face-detector-interface/-/unimodules-face-detector-interface-4.0.0.tgz#c68e44d5363d3dfea6f697d983254ac199555074"
10030+
integrity sha512-ZFzqcNnJkBxvfdKCupvtQUj1yVJkzKivPGV6nydKZc9eJRLUgSXCUWtvXd0vaet1NSQqr2R3r6Ilvj0DzuCzUA==
10031+
10032+
unimodules-file-system-interface@~4.0.0:
10033+
version "4.0.0"
10034+
resolved "https://registry.yarnpkg.com/unimodules-file-system-interface/-/unimodules-file-system-interface-4.0.0.tgz#e8514882a81cd350b69c6026fd52b6d99ba289c9"
10035+
integrity sha512-dDcKjArDwY3CXLlCL8tf9/JJG25K2lgtAL+560kqrftLu3pi0x5V7JmSDz52pJ4pLd5xL8s1Rzse+rIr5OpM3g==
10036+
10037+
unimodules-font-interface@~4.0.0:
10038+
version "4.0.0"
10039+
resolved "https://registry.yarnpkg.com/unimodules-font-interface/-/unimodules-font-interface-4.0.0.tgz#a72d7c75d81dface00c48f523730c15ddf10fbce"
10040+
integrity sha512-RFD1H405kZy8oYcg7f9Krr+UTUn6EZTcqAb+wRL6Ex9TJmzmxJT6JZ0FsUMezOUEwrdvXRpArH4P1AadHlzzGA==
10041+
10042+
unimodules-image-loader-interface@~4.0.0:
10043+
version "4.0.0"
10044+
resolved "https://registry.yarnpkg.com/unimodules-image-loader-interface/-/unimodules-image-loader-interface-4.0.0.tgz#92452bfcba5e95b4fc3aba657a5863946d1ccf93"
10045+
integrity sha512-tv7g1YmZq9ZnG/x9l3qSlpEn93ZuMD+FuQpOZj3/oGDkBlc27vtBSEi8lTySWb9U7UK+bNlHGFqf1lGZcFU1Ug==
10046+
10047+
unimodules-permissions-interface@~4.0.0:
10048+
version "4.0.0"
10049+
resolved "https://registry.yarnpkg.com/unimodules-permissions-interface/-/unimodules-permissions-interface-4.0.0.tgz#c5e044921f5d5867552c991100a5824962fd6b72"
10050+
integrity sha512-bVZ6JQMO12WvAv6YqcHaPV5KekV7WH606eRiMJq5Qwm2z9yGSM+KaOxOH/n2LVcYckForphsCLf58OGVUtM65Q==
10051+
10052+
unimodules-sensors-interface@~4.0.0:
10053+
version "4.0.0"
10054+
resolved "https://registry.yarnpkg.com/unimodules-sensors-interface/-/unimodules-sensors-interface-4.0.0.tgz#7f8250b732f7aa0560e04537bea547f304f45c0b"
10055+
integrity sha512-O7l+N2DLwviTc6gz/ptV7a930Sdo30AvzQLEJPHfqj4e9fCdbrHNrcPqiq0CLqHYYIsdpSDpC6wCWmepLaAgJQ==
10056+
10057+
unimodules-task-manager-interface@~4.0.0:
10058+
version "4.0.0"
10059+
resolved "https://registry.yarnpkg.com/unimodules-task-manager-interface/-/unimodules-task-manager-interface-4.0.0.tgz#2cf1949ef041ebbd6d9a32d799d1640e1d8f03d7"
10060+
integrity sha512-c7x5hgEtT+oIVd37TBn2jxlTw2+Bgb55XZ2Md0AV5NCjeRlKw2bIBPwUvSdI1iAziSQOIGOImNaaIUo3L3zW3w==
10061+
992410062
union-value@^1.0.0:
992510063
version "1.0.1"
992610064
resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
@@ -10030,7 +10168,7 @@ url-parse-lax@^3.0.0:
1003010168
dependencies:
1003110169
prepend-http "^2.0.0"
1003210170

10033-
url-parse@^1.4.0:
10171+
url-parse@^1.4.0, url-parse@^1.4.4:
1003410172
version "1.4.7"
1003510173
resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278"
1003610174
integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==
@@ -10091,6 +10229,11 @@ [email protected]:
1009110229
resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
1009210230
integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
1009310231

10232+
uuid-js@^0.7.5:
10233+
version "0.7.5"
10234+
resolved "https://registry.yarnpkg.com/uuid-js/-/uuid-js-0.7.5.tgz#6c886d02a53d2d40dcf25d91a170b4a7b25b94d0"
10235+
integrity sha1-bIhtAqU9LUDc8l2RoXC0p7JblNA=
10236+
1009410237
uuid@^2.0.3:
1009510238
version "2.0.3"
1009610239
resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"

0 commit comments

Comments
 (0)