From 38b32a169f9515a12d78bcc5a99ec74a7f43e769 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Goi=C3=A2nia?= Date: Tue, 27 Dec 2022 15:43:41 -0300 Subject: [PATCH] feat(maskedview): added community library version --- .../project.pbxproj | 4 +++- example/ios/Podfile.lock | 22 +++++++++---------- example/package.json | 2 +- package.json | 4 ++-- src/presets/flashy/item/FlashyTabBarItem.tsx | 2 +- 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/example/ios/AnimatedTabbarExample.xcodeproj/project.pbxproj b/example/ios/AnimatedTabbarExample.xcodeproj/project.pbxproj index 8f28651..1576a44 100644 --- a/example/ios/AnimatedTabbarExample.xcodeproj/project.pbxproj +++ b/example/ios/AnimatedTabbarExample.xcodeproj/project.pbxproj @@ -212,7 +212,7 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-AnimatedTabbarExample/Pods-AnimatedTabbarExample-frameworks.sh", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( @@ -286,6 +286,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CURRENT_PROJECT_VERSION = 1; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64"; INFOPLIST_FILE = AnimatedTabbarExample/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_LDFLAGS = ( @@ -308,6 +309,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CURRENT_PROJECT_VERSION = 1; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64"; INFOPLIST_FILE = AnimatedTabbarExample/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_LDFLAGS = ( diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index a35beac..4b69c37 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -234,7 +234,7 @@ PODS: - React-cxxreact (= 0.63.3) - React-jsi (= 0.63.3) - React-jsinspector (0.63.3) - - react-native-safe-area-context (3.2.0): + - react-native-safe-area-context (3.4.1): - React-Core - React-RCTActionSheet (0.63.3): - React-Core/RCTActionSheetHeaders (= 0.63.3) @@ -296,16 +296,16 @@ PODS: - React-Core (= 0.63.3) - React-cxxreact (= 0.63.3) - React-jsi (= 0.63.3) - - RNCMaskedView (0.1.11): - - React + - RNCMaskedView (0.2.8): + - React-Core - RNGestureHandler (1.10.3): - React-Core - RNReanimated (1.13.1): - React - RNScreens (2.18.1): - React-Core - - RNSVG (12.1.1): - - React + - RNSVG (12.5.0): + - React-Core - Yoga (1.14.0) - YogaKit (1.18.1): - Yoga (~> 1.14) @@ -358,7 +358,7 @@ DEPENDENCIES: - React-RCTText (from `../node_modules/react-native/Libraries/Text`) - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`) - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`) - - "RNCMaskedView (from `../node_modules/@react-native-community/masked-view`)" + - "RNCMaskedView (from `../node_modules/@react-native-masked-view/masked-view`)" - RNGestureHandler (from `../node_modules/react-native-gesture-handler`) - RNReanimated (from `../node_modules/react-native-reanimated`) - RNScreens (from `../node_modules/react-native-screens`) @@ -434,7 +434,7 @@ EXTERNAL SOURCES: ReactCommon: :path: "../node_modules/react-native/ReactCommon" RNCMaskedView: - :path: "../node_modules/@react-native-community/masked-view" + :path: "../node_modules/@react-native-masked-view/masked-view" RNGestureHandler: :path: "../node_modules/react-native-gesture-handler" RNReanimated: @@ -473,7 +473,7 @@ SPEC CHECKSUMS: React-jsi: df07aa95b39c5be3e41199921509bfa929ed2b9d React-jsiexecutor: b56c03e61c0dd5f5801255f2160a815f4a53d451 React-jsinspector: 8e68ffbfe23880d3ee9bafa8be2777f60b25cbe2 - react-native-safe-area-context: f0906bf8bc9835ac9a9d3f97e8bde2a997d8da79 + react-native-safe-area-context: 9e40fb181dac02619414ba1294d6c2a807056ab9 React-RCTActionSheet: 53ea72699698b0b47a6421cb1c8b4ab215a774aa React-RCTAnimation: 1befece0b5183c22ae01b966f5583f42e69a83c2 React-RCTBlob: 0b284339cbe4b15705a05e2313a51c6d8b51fa40 @@ -484,14 +484,14 @@ SPEC CHECKSUMS: React-RCTText: 65a6de06a7389098ce24340d1d3556015c38f746 React-RCTVibration: 8e9fb25724a0805107fc1acc9075e26f814df454 ReactCommon: 4167844018c9ed375cc01a843e9ee564399e53c3 - RNCMaskedView: 0e1bc4bfa8365eba5fbbb71e07fbdc0555249489 + RNCMaskedView: bc0170f389056201c82a55e242e5d90070e18e5a RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211 RNReanimated: dd8c286ab5dd4ba36d3a7fef8bff7e08711b5476 RNScreens: f7ad633b2e0190b77b6a7aab7f914fad6f198d8d - RNSVG: 551acb6562324b1d52a4e0758f7ca0ec234e278f + RNSVG: 6adc5c52d2488a476248413064b7f2832e639057 Yoga: 7d13633d129fd179e01b8953d38d47be90db185a YogaKit: f782866e155069a2cca2517aafea43200b01fd5a PODFILE CHECKSUM: 123adc0ddd7550383a810db19f0376e4a7659c8f -COCOAPODS: 1.10.1 +COCOAPODS: 1.11.3 diff --git a/example/package.json b/example/package.json index 3f78dfa..d1e8559 100644 --- a/example/package.json +++ b/example/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@gorhom/showcase-template": "^1.0.2", - "@react-native-community/masked-view": "^0.1.10", + "@react-native-masked-view/masked-view": "^0.2.8", "@react-navigation/bottom-tabs": "^5.9.2", "@react-navigation/native": "^5.7.6", "@react-navigation/stack": "^5.9.3", diff --git a/package.json b/package.json index 4374e33..d69f2e8 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "@commitlint/config-conventional": "^9.1.1", "@react-native-community/bob": "^0.16.2", "@react-native-community/eslint-config": "^2.0.0", - "@react-native-community/masked-view": "^0.1.10", + "@react-native-masked-view/masked-view": "^0.2.8", "@release-it/conventional-changelog": "^1.1.4", "@types/react": "^16.9.19", "@types/react-native": "0.61.10", @@ -66,7 +66,7 @@ }, "peerDependencies": { "@react-navigation/native": ">=5.0.0", - "@react-native-community/masked-view": ">=0.1.10", + "@react-native-masked-view/masked-view": "^0.2.8", "react": "*", "react-native": "*", "react-native-gesture-handler": ">=1.6.1", diff --git a/src/presets/flashy/item/FlashyTabBarItem.tsx b/src/presets/flashy/item/FlashyTabBarItem.tsx index 3fc3a65..e36d08a 100644 --- a/src/presets/flashy/item/FlashyTabBarItem.tsx +++ b/src/presets/flashy/item/FlashyTabBarItem.tsx @@ -2,7 +2,7 @@ import React, { useMemo, memo } from 'react'; import { View, Text, ViewStyle, LayoutChangeEvent } from 'react-native'; import Animated from 'react-native-reanimated'; // @ts-ignore 😞 -import MaskedView from '@react-native-community/masked-view'; +import MaskedView from '@react-native-masked-view/masked-view'; import { Svg, Circle, SvgProps, CircleProps } from 'react-native-svg'; import { useValues, transformOrigin, toRad } from 'react-native-redash'; // @ts-ignore 😞