Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/release/0.2.2' into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	package.json
  • Loading branch information
nklomp committed Jun 13, 2024
2 parents b6fcac9 + 5a67f4b commit 18d2830
Show file tree
Hide file tree
Showing 5 changed files with 74 additions and 109 deletions.
Binary file removed a.zip
Binary file not shown.
39 changes: 8 additions & 31 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ PODS:
- ExpoModulesCore
- EXFont (11.10.3):
- ExpoModulesCore
- EXImageLoader (4.6.0):
- ExpoModulesCore
- React-Core
- Expo (50.0.14):
- ExpoModulesCore
- ExpoCamera (14.1.1):
Expand All @@ -27,8 +24,6 @@ PODS:
- ExpoModulesCore
- ExpoFileSystem (16.0.8):
- ExpoModulesCore
- ExpoImagePicker (14.7.1):
- ExpoModulesCore
- ExpoKeepAwake (12.8.2):
- ExpoModulesCore
- ExpoLinearGradient (12.7.2):
Expand All @@ -44,11 +39,6 @@ PODS:
- ReactCommon/turbomodule/core
- ExpoRandom (13.6.0):
- ExpoModulesCore
- ExpoSQLite (13.4.0):
- ExpoModulesCore
- sqlite3 (~> 3.42.0)
- sqlite3/fts (~> 3.42.0)
- sqlite3/fts5 (~> 3.42.0)
- EXSplashScreen (0.26.4):
- ExpoModulesCore
- glog
Expand Down Expand Up @@ -981,6 +971,10 @@ PODS:
- react-native-pure-jwt (3.0.2):
- JWT (= 3.0.0-beta.12)
- React
- react-native-quick-sqlite (8.0.6):
- React
- React-callinvoker
- React-Core
- react-native-randombytes (3.6.1):
- React-Core
- react-native-safe-area-context (4.8.2):
Expand Down Expand Up @@ -1193,13 +1187,6 @@ PODS:
- libwebp (~> 1.0)
- SDWebImage/Core (~> 5.10)
- SocketRocket (0.6.1)
- sqlite3 (3.42.0):
- sqlite3/common (= 3.42.0)
- sqlite3/common (3.42.0)
- sqlite3/fts (3.42.0):
- sqlite3/common
- sqlite3/fts5 (3.42.0):
- sqlite3/common
- Yoga (1.14.0)
- ZXingObjC/Core (3.6.9)
- ZXingObjC/OneD (3.6.9):
Expand All @@ -1213,18 +1200,15 @@ DEPENDENCIES:
- DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
- EXConstants (from `../node_modules/expo-constants/ios`)
- EXFont (from `../node_modules/expo-font/ios`)
- EXImageLoader (from `../node_modules/expo-image-loader/ios`)
- Expo (from `../node_modules/expo`)
- ExpoCamera (from `../node_modules/expo-camera/ios`)
- ExpoCrypto (from `../node_modules/expo-crypto/ios`)
- ExpoFileSystem (from `../node_modules/expo-file-system/ios`)
- ExpoImagePicker (from `../node_modules/expo-image-picker/ios`)
- ExpoKeepAwake (from `../node_modules/expo-keep-awake/ios`)
- ExpoLinearGradient (from `../node_modules/expo-linear-gradient/ios`)
- ExpoLocalization (from `../node_modules/expo-localization/ios`)
- ExpoModulesCore (from `../node_modules/expo-modules-core`)
- ExpoRandom (from `../node_modules/expo-random/ios`)
- ExpoSQLite (from `../node_modules/expo-sqlite/ios`)
- EXSplashScreen (from `../node_modules/expo-splash-screen/ios`)
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
- FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
Expand Down Expand Up @@ -1262,6 +1246,7 @@ DEPENDENCIES:
- react-native-mmkv-storage (from `../node_modules/react-native-mmkv-storage`)
- react-native-pager-view (from `../node_modules/react-native-pager-view`)
- react-native-pure-jwt (from `../node_modules/react-native-pure-jwt`)
- react-native-quick-sqlite (from `../node_modules/react-native-quick-sqlite`)
- react-native-randombytes (from `../node_modules/react-native-randombytes`)
- react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
- React-nativeconfig (from `../node_modules/react-native/ReactCommon`)
Expand Down Expand Up @@ -1312,7 +1297,6 @@ SPEC REPOS:
- SDWebImage
- SDWebImageWebPCoder
- SocketRocket
- sqlite3
- ZXingObjC

EXTERNAL SOURCES:
Expand All @@ -1326,8 +1310,6 @@ EXTERNAL SOURCES:
:path: "../node_modules/expo-constants/ios"
EXFont:
:path: "../node_modules/expo-font/ios"
EXImageLoader:
:path: "../node_modules/expo-image-loader/ios"
Expo:
:path: "../node_modules/expo"
ExpoCamera:
Expand All @@ -1336,8 +1318,6 @@ EXTERNAL SOURCES:
:path: "../node_modules/expo-crypto/ios"
ExpoFileSystem:
:path: "../node_modules/expo-file-system/ios"
ExpoImagePicker:
:path: "../node_modules/expo-image-picker/ios"
ExpoKeepAwake:
:path: "../node_modules/expo-keep-awake/ios"
ExpoLinearGradient:
Expand All @@ -1348,8 +1328,6 @@ EXTERNAL SOURCES:
:path: "../node_modules/expo-modules-core"
ExpoRandom:
:path: "../node_modules/expo-random/ios"
ExpoSQLite:
:path: "../node_modules/expo-sqlite/ios"
EXSplashScreen:
:path: "../node_modules/expo-splash-screen/ios"
FBLazyVector:
Expand Down Expand Up @@ -1419,6 +1397,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native-pager-view"
react-native-pure-jwt:
:path: "../node_modules/react-native-pure-jwt"
react-native-quick-sqlite:
:path: "../node_modules/react-native-quick-sqlite"
react-native-randombytes:
:path: "../node_modules/react-native-randombytes"
react-native-safe-area-context:
Expand Down Expand Up @@ -1499,18 +1479,15 @@ SPEC CHECKSUMS:
DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953
EXConstants: 988aa430ca0f76b43cd46b66e7fae3287f9cc2fc
EXFont: f20669cb266ef48b004f1eb1f2b20db96cd1df9f
EXImageLoader: 55080616b2fe9da19ef8c7f706afd9814e279b6b
Expo: e01a77c6fa4bc80a6d1bb949cda1d12d21044abd
ExpoCamera: 53f5ef81bab088b2edcf94d05e4da3bc84f46383
ExpoCrypto: b6428f48599c007676dc81a9b5f72c07e62fdccc
ExpoFileSystem: eecaf6796aed0f4dd20042dc2ca2cac6c4bc1185
ExpoImagePicker: 66970181d1c838f444e5e1f81b804ab2d5ff49bd
ExpoKeepAwake: 0f5cad99603a3268e50af9a6eb8b76d0d9ac956c
ExpoLinearGradient: 4ad1449a2408e0435ac959076562b3921f2e32a1
ExpoLocalization: f5f5d71dc0c9514d3d77b2771144f6fed6398d04
ExpoModulesCore: 61dc57c6e2a35f2f84baf488146db624e03af4cd
ExpoRandom: f0cd58e154e463d913462f3b445870b12d1c2f12
ExpoSQLite: 2c0f6267f9d7f41be9f40d59efc4ced3bfbec93b
EXSplashScreen: 5538a51beec451bf1fcf5198e3062790e2534df3
FBLazyVector: f64d1e2ea739b4d8f7e4740cde18089cd97fe864
FBReactNativeSpec: 9f2b8b243131565335437dba74923a8d3015e780
Expand Down Expand Up @@ -1551,6 +1528,7 @@ SPEC CHECKSUMS:
react-native-mmkv-storage: cfb6854594cfdc5f7383a9e464bb025417d1721c
react-native-pager-view: d5f3adb58a4e6e0d200055e9a4afdcda9b9022ce
react-native-pure-jwt: c7aabf3e38f688922741774c5b37d1288fc64311
react-native-quick-sqlite: e0e23b749382a85e4b57146f753de737a6c3a9e1
react-native-randombytes: 421f1c7d48c0af8dbcd471b0324393ebf8fe7846
react-native-safe-area-context: 0ee144a6170530ccc37a0fd9388e28d06f516a89
React-nativeconfig: b4d4e9901d4cabb57be63053fd2aa6086eb3c85f
Expand Down Expand Up @@ -1588,7 +1566,6 @@ SPEC CHECKSUMS:
SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
sqlite3: f163dbbb7aa3339ad8fc622782c2d9d7b72f7e9c
Yoga: d17d2cc8105eed528474683b42e2ea310e1daf61
ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5

Expand Down
Loading

0 comments on commit 18d2830

Please sign in to comment.