Skip to content

Commit 5c1b363

Browse files
authored
Merge pull request #3 from pedrogoiania/master
Update Masked View library reference gorhom#138
2 parents 5ba6ec5 + c467554 commit 5c1b363

File tree

5 files changed

+18
-16
lines changed

5 files changed

+18
-16
lines changed

example/ios/AnimatedTabbarExample.xcodeproj/project.pbxproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@
212212
);
213213
inputPaths = (
214214
"${PODS_ROOT}/Target Support Files/Pods-AnimatedTabbarExample/Pods-AnimatedTabbarExample-frameworks.sh",
215-
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL",
215+
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
216216
);
217217
name = "[CP] Embed Pods Frameworks";
218218
outputPaths = (
@@ -286,6 +286,7 @@
286286
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
287287
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
288288
CURRENT_PROJECT_VERSION = 1;
289+
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64";
289290
INFOPLIST_FILE = AnimatedTabbarExample/Info.plist;
290291
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
291292
OTHER_LDFLAGS = (
@@ -308,6 +309,7 @@
308309
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
309310
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
310311
CURRENT_PROJECT_VERSION = 1;
312+
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64";
311313
INFOPLIST_FILE = AnimatedTabbarExample/Info.plist;
312314
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
313315
OTHER_LDFLAGS = (

example/ios/Podfile.lock

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ PODS:
234234
- React-cxxreact (= 0.63.3)
235235
- React-jsi (= 0.63.3)
236236
- React-jsinspector (0.63.3)
237-
- react-native-safe-area-context (3.2.0):
237+
- react-native-safe-area-context (3.4.1):
238238
- React-Core
239239
- React-RCTActionSheet (0.63.3):
240240
- React-Core/RCTActionSheetHeaders (= 0.63.3)
@@ -296,16 +296,16 @@ PODS:
296296
- React-Core (= 0.63.3)
297297
- React-cxxreact (= 0.63.3)
298298
- React-jsi (= 0.63.3)
299-
- RNCMaskedView (0.1.11):
300-
- React
299+
- RNCMaskedView (0.2.8):
300+
- React-Core
301301
- RNGestureHandler (1.10.3):
302302
- React-Core
303303
- RNReanimated (1.13.1):
304304
- React
305305
- RNScreens (2.18.1):
306306
- React-Core
307-
- RNSVG (12.1.1):
308-
- React
307+
- RNSVG (12.5.0):
308+
- React-Core
309309
- Yoga (1.14.0)
310310
- YogaKit (1.18.1):
311311
- Yoga (~> 1.14)
@@ -358,7 +358,7 @@ DEPENDENCIES:
358358
- React-RCTText (from `../node_modules/react-native/Libraries/Text`)
359359
- React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`)
360360
- ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
361-
- "RNCMaskedView (from `../node_modules/@react-native-community/masked-view`)"
361+
- "RNCMaskedView (from `../node_modules/@react-native-masked-view/masked-view`)"
362362
- RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
363363
- RNReanimated (from `../node_modules/react-native-reanimated`)
364364
- RNScreens (from `../node_modules/react-native-screens`)
@@ -434,7 +434,7 @@ EXTERNAL SOURCES:
434434
ReactCommon:
435435
:path: "../node_modules/react-native/ReactCommon"
436436
RNCMaskedView:
437-
:path: "../node_modules/@react-native-community/masked-view"
437+
:path: "../node_modules/@react-native-masked-view/masked-view"
438438
RNGestureHandler:
439439
:path: "../node_modules/react-native-gesture-handler"
440440
RNReanimated:
@@ -473,7 +473,7 @@ SPEC CHECKSUMS:
473473
React-jsi: df07aa95b39c5be3e41199921509bfa929ed2b9d
474474
React-jsiexecutor: b56c03e61c0dd5f5801255f2160a815f4a53d451
475475
React-jsinspector: 8e68ffbfe23880d3ee9bafa8be2777f60b25cbe2
476-
react-native-safe-area-context: f0906bf8bc9835ac9a9d3f97e8bde2a997d8da79
476+
react-native-safe-area-context: 9e40fb181dac02619414ba1294d6c2a807056ab9
477477
React-RCTActionSheet: 53ea72699698b0b47a6421cb1c8b4ab215a774aa
478478
React-RCTAnimation: 1befece0b5183c22ae01b966f5583f42e69a83c2
479479
React-RCTBlob: 0b284339cbe4b15705a05e2313a51c6d8b51fa40
@@ -484,14 +484,14 @@ SPEC CHECKSUMS:
484484
React-RCTText: 65a6de06a7389098ce24340d1d3556015c38f746
485485
React-RCTVibration: 8e9fb25724a0805107fc1acc9075e26f814df454
486486
ReactCommon: 4167844018c9ed375cc01a843e9ee564399e53c3
487-
RNCMaskedView: 0e1bc4bfa8365eba5fbbb71e07fbdc0555249489
487+
RNCMaskedView: bc0170f389056201c82a55e242e5d90070e18e5a
488488
RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211
489489
RNReanimated: dd8c286ab5dd4ba36d3a7fef8bff7e08711b5476
490490
RNScreens: f7ad633b2e0190b77b6a7aab7f914fad6f198d8d
491-
RNSVG: 551acb6562324b1d52a4e0758f7ca0ec234e278f
491+
RNSVG: 6adc5c52d2488a476248413064b7f2832e639057
492492
Yoga: 7d13633d129fd179e01b8953d38d47be90db185a
493493
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
494494

495495
PODFILE CHECKSUM: 123adc0ddd7550383a810db19f0376e4a7659c8f
496496

497-
COCOAPODS: 1.10.1
497+
COCOAPODS: 1.11.3

example/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"dependencies": {
1212
"@gorhom/showcase-template": "^1.0.2",
13-
"@react-native-community/masked-view": "^0.1.10",
13+
"@react-native-masked-view/masked-view": "^0.2.8",
1414
"@react-navigation/bottom-tabs": "^5.9.2",
1515
"@react-navigation/native": "^5.7.6",
1616
"@react-navigation/stack": "^5.9.3",

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"@commitlint/config-conventional": "^9.1.1",
4646
"@react-native-community/bob": "^0.16.2",
4747
"@react-native-community/eslint-config": "^2.0.0",
48-
"@react-native-community/masked-view": "^0.1.10",
48+
"@react-native-masked-view/masked-view": "^0.2.8",
4949
"@release-it/conventional-changelog": "^1.1.4",
5050
"@types/react": "^16.9.19",
5151
"@types/react-native": "0.61.10",
@@ -66,7 +66,7 @@
6666
},
6767
"peerDependencies": {
6868
"@react-navigation/native": ">=5.0.0",
69-
"@react-native-community/masked-view": ">=0.1.10",
69+
"@react-native-masked-view/masked-view": "^0.2.8",
7070
"react": "*",
7171
"react-native": "*",
7272
"react-native-gesture-handler": ">=1.6.1",

src/presets/flashy/item/FlashyTabBarItem.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React, { useMemo, memo } from 'react';
22
import { View, Text, ViewStyle, LayoutChangeEvent } from 'react-native';
33
import Animated from 'react-native-reanimated';
44
// @ts-ignore 😞
5-
import MaskedView from '@react-native-community/masked-view';
5+
import MaskedView from '@react-native-masked-view/masked-view';
66
import { Svg, Circle, SvgProps, CircleProps } from 'react-native-svg';
77
import { useValues, transformOrigin, toRad } from 'react-native-redash';
88
// @ts-ignore 😞

0 commit comments

Comments
 (0)