diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 1339e7261..b33a12a58 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -170,7 +170,7 @@ android { def abi = output.getFilter(OutputFile.ABI) if (abi != null) { // null for the universal-debug, universal-release variants output.versionCodeOverride = - versionCodes.get(abi) * 1048576 + defaultConfig.versionCode + defaultConfig.versionCode * 1000 + versionCodes.get(abi) } } diff --git a/example/android/app/src/debug/AndroidManifest.xml b/example/android/app/src/debug/AndroidManifest.xml index fa26aa56e..b2f3ad9fc 100644 --- a/example/android/app/src/debug/AndroidManifest.xml +++ b/example/android/app/src/debug/AndroidManifest.xml @@ -4,5 +4,10 @@ - + + + diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml index 0c38fbde0..a21b74e2c 100644 --- a/example/android/app/src/main/AndroidManifest.xml +++ b/example/android/app/src/main/AndroidManifest.xml @@ -21,8 +21,6 @@ - - diff --git a/example/android/app/src/main/res/values/styles.xml b/example/android/app/src/main/res/values/styles.xml index 62fe59fa4..9fab0be74 100644 --- a/example/android/app/src/main/res/values/styles.xml +++ b/example/android/app/src/main/res/values/styles.xml @@ -1,7 +1,7 @@ - diff --git a/example/android/build.gradle b/example/android/build.gradle index b9065bd49..7cd392ba9 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -2,17 +2,18 @@ buildscript { ext { - buildToolsVersion = "29.0.2" - minSdkVersion = 16 + buildToolsVersion = "29.0.3" + minSdkVersion = 21 compileSdkVersion = 29 targetSdkVersion = 29 + ndkVersion = "20.1.5948944" } repositories { google() jcenter() } dependencies { - classpath("com.android.tools.build:gradle:3.5.3") + classpath("com.android.tools.build:gradle:4.1.0") // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/example/android/gradle.properties b/example/android/gradle.properties index 369dd639c..9a8bdd49a 100644 --- a/example/android/gradle.properties +++ b/example/android/gradle.properties @@ -19,4 +19,4 @@ android.useAndroidX=true android.enableJetifier=true -FLIPPER_VERSION=0.54.0 +FLIPPER_VERSION=0.75.1 diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index 842267020..14e30f741 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/example/ios/BottomSheetExample.xcodeproj/project.pbxproj b/example/ios/BottomSheetExample.xcodeproj/project.pbxproj index ac6b141ae..a6b197f64 100644 --- a/example/ios/BottomSheetExample.xcodeproj/project.pbxproj +++ b/example/ios/BottomSheetExample.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -121,6 +121,7 @@ 13B07F8E1A680F5B00A75B9A /* Resources */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, E4EE1BC00881AC99341D4CF3 /* [CP] Copy Pods Resources */, + 8B4135FD57168B6119E4AC70 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -137,7 +138,7 @@ 83CBB9F71A601CBA00E9B192 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0940; + LastUpgradeCheck = 1240; ORGANIZATIONNAME = "Mo Gorhom"; TargetAttributes = { 13B07F861A680F5B00A75B9A = { @@ -147,11 +148,12 @@ }; }; buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "BottomSheetExample" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + compatibilityVersion = "Xcode 12.0"; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( - English, + Base, + en, ); mainGroup = 83CBB9F61A601CBA00E9B192; productRefGroup = 83CBBA001A601CBA00E9B192 /* Products */; @@ -190,6 +192,23 @@ shellPath = /bin/sh; shellScript = "cd $PROJECT_DIR/..\nexport NODE_BINARY=node\nexport ENTRY_FILE=\"index.ts\"\n./node_modules/react-native/scripts/react-native-xcode.sh\n"; }; + 8B4135FD57168B6119E4AC70 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-BottomSheetExample/Pods-BottomSheetExample-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-BottomSheetExample/Pods-BottomSheetExample-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-BottomSheetExample/Pods-BottomSheetExample-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; CCCC07BCAFDEF1FCADC0D0C9 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -217,13 +236,12 @@ buildActionMask = 2147483647; files = ( ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-BottomSheetExample/Pods-BottomSheetExample-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle", + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-BottomSheetExample/Pods-BottomSheetExample-resources-${CONFIGURATION}-input-files.xcfilelist", ); name = "[CP] Copy Pods Resources"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle", + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-BottomSheetExample/Pods-BottomSheetExample-resources-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -274,8 +292,12 @@ CURRENT_PROJECT_VERSION = 1; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = 4P8A237MEX; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; INFOPLIST_FILE = BottomSheetExample/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); OTHER_CFLAGS = ( "$(inherited)", "-DFB_SONARKIT_ENABLED=1", @@ -303,8 +325,12 @@ CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 4P8A237MEX; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; INFOPLIST_FILE = BottomSheetExample/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "$(inherited)", @@ -346,6 +372,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -356,6 +383,7 @@ ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -371,7 +399,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -400,6 +428,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -410,6 +439,7 @@ ENABLE_BITCODE = NO; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -418,10 +448,11 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; VALIDATE_PRODUCT = YES; }; name = Release; diff --git a/example/ios/BottomSheetExample.xcodeproj/xcshareddata/xcschemes/BottomSheetExample.xcscheme b/example/ios/BottomSheetExample.xcodeproj/xcshareddata/xcschemes/BottomSheetExample.xcscheme index b9b5ae61d..1de406396 100644 --- a/example/ios/BottomSheetExample.xcodeproj/xcshareddata/xcschemes/BottomSheetExample.xcscheme +++ b/example/ios/BottomSheetExample.xcodeproj/xcshareddata/xcschemes/BottomSheetExample.xcscheme @@ -1,6 +1,6 @@ + + - + - + + @@ -19,14 +20,22 @@ + - + + + @@ -37,4 +46,9 @@ + + + + + diff --git a/example/ios/Podfile b/example/ios/Podfile index 749f4742f..75c90525d 100644 --- a/example/ios/Podfile +++ b/example/ios/Podfile @@ -5,15 +5,22 @@ platform :ios, '10.0' target 'BottomSheetExample' do config = use_native_modules! - - use_react_native!(:path => config["reactNativePath"]) + + use_react_native!( + :path => config[:reactNativePath], + # to enable hermes on iOS, change `false` to `true` and then install pods + :hermes_enabled => false + ) # Enables Flipper. # # Note that if you have use_frameworks! enabled, Flipper will not work and - # you should disable these next few lines. - use_flipper! + # you should disable the next line. + use_flipper!() post_install do |installer| - flipper_post_install(installer) + react_native_post_install(installer) + installer.pods_project.build_configurations.each do |config| + config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64" + end end end diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 3d80c1c67..2538ea4f8 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1,312 +1,332 @@ PODS: - boost-for-react-native (1.63.0) - - CocoaAsyncSocket (7.6.4) - - CocoaLibEvent (1.0.0) + - CocoaAsyncSocket (7.6.5) - DoubleConversion (1.1.6) - - FBLazyVector (0.63.4) - - FBReactNativeSpec (0.63.4): - - Folly (= 2020.01.13.00) - - RCTRequired (= 0.63.4) - - RCTTypeSafety (= 0.63.4) - - React-Core (= 0.63.4) - - React-jsi (= 0.63.4) - - ReactCommon/turbomodule/core (= 0.63.4) - - Flipper (0.54.0): - - Flipper-Folly (~> 2.2) - - Flipper-RSocket (~> 1.1) + - FBLazyVector (0.64.0) + - FBReactNativeSpec (0.64.0): + - RCT-Folly (= 2020.01.13.00) + - RCTRequired (= 0.64.0) + - RCTTypeSafety (= 0.64.0) + - React-Core (= 0.64.0) + - React-jsi (= 0.64.0) + - ReactCommon/turbomodule/core (= 0.64.0) + - Flipper (0.75.1): + - Flipper-Folly (~> 2.5) + - Flipper-RSocket (~> 1.3) - Flipper-DoubleConversion (1.1.7) - - Flipper-Folly (2.3.0): + - Flipper-Folly (2.5.1): - boost-for-react-native - - CocoaLibEvent (~> 1.0) - Flipper-DoubleConversion - Flipper-Glog - - OpenSSL-Universal (= 1.0.2.20) + - libevent (~> 2.1.12) + - OpenSSL-Universal (= 1.1.180) - Flipper-Glog (0.3.6) - Flipper-PeerTalk (0.0.4) - - Flipper-RSocket (1.1.0): - - Flipper-Folly (~> 2.2) - - FlipperKit (0.54.0): - - FlipperKit/Core (= 0.54.0) - - FlipperKit/Core (0.54.0): - - Flipper (~> 0.54.0) + - Flipper-RSocket (1.3.0): + - Flipper-Folly (~> 2.5) + - FlipperKit (0.75.1): + - FlipperKit/Core (= 0.75.1) + - FlipperKit/Core (0.75.1): + - Flipper (~> 0.75.1) - FlipperKit/CppBridge - FlipperKit/FBCxxFollyDynamicConvert - FlipperKit/FBDefines - FlipperKit/FKPortForwarding - - FlipperKit/CppBridge (0.54.0): - - Flipper (~> 0.54.0) - - FlipperKit/FBCxxFollyDynamicConvert (0.54.0): - - Flipper-Folly (~> 2.2) - - FlipperKit/FBDefines (0.54.0) - - FlipperKit/FKPortForwarding (0.54.0): + - FlipperKit/CppBridge (0.75.1): + - Flipper (~> 0.75.1) + - FlipperKit/FBCxxFollyDynamicConvert (0.75.1): + - Flipper-Folly (~> 2.5) + - FlipperKit/FBDefines (0.75.1) + - FlipperKit/FKPortForwarding (0.75.1): - CocoaAsyncSocket (~> 7.6) - Flipper-PeerTalk (~> 0.0.4) - - FlipperKit/FlipperKitHighlightOverlay (0.54.0) - - FlipperKit/FlipperKitLayoutPlugin (0.54.0): + - FlipperKit/FlipperKitHighlightOverlay (0.75.1) + - FlipperKit/FlipperKitLayoutPlugin (0.75.1): - FlipperKit/Core - FlipperKit/FlipperKitHighlightOverlay - FlipperKit/FlipperKitLayoutTextSearchable - YogaKit (~> 1.18) - - FlipperKit/FlipperKitLayoutTextSearchable (0.54.0) - - FlipperKit/FlipperKitNetworkPlugin (0.54.0): + - FlipperKit/FlipperKitLayoutTextSearchable (0.75.1) + - FlipperKit/FlipperKitNetworkPlugin (0.75.1): - FlipperKit/Core - - FlipperKit/FlipperKitReactPlugin (0.54.0): + - FlipperKit/FlipperKitReactPlugin (0.75.1): - FlipperKit/Core - - FlipperKit/FlipperKitUserDefaultsPlugin (0.54.0): + - FlipperKit/FlipperKitUserDefaultsPlugin (0.75.1): - FlipperKit/Core - - FlipperKit/SKIOSNetworkPlugin (0.54.0): + - FlipperKit/SKIOSNetworkPlugin (0.75.1): - FlipperKit/Core - FlipperKit/FlipperKitNetworkPlugin - - Folly (2020.01.13.00): + - glog (0.3.5) + - libevent (2.1.12) + - OpenSSL-Universal (1.1.180) + - RCT-Folly (2020.01.13.00): - boost-for-react-native - DoubleConversion - - Folly/Default (= 2020.01.13.00) - glog - - Folly/Default (2020.01.13.00): + - RCT-Folly/Default (= 2020.01.13.00) + - RCT-Folly/Default (2020.01.13.00): - boost-for-react-native - DoubleConversion - glog - - glog (0.3.5) - - OpenSSL-Universal (1.0.2.20): - - OpenSSL-Universal/Static (= 1.0.2.20) - - OpenSSL-Universal/Static (1.0.2.20) - - RCTRequired (0.63.4) - - RCTTypeSafety (0.63.4): - - FBLazyVector (= 0.63.4) - - Folly (= 2020.01.13.00) - - RCTRequired (= 0.63.4) - - React-Core (= 0.63.4) - - React (0.63.4): - - React-Core (= 0.63.4) - - React-Core/DevSupport (= 0.63.4) - - React-Core/RCTWebSocket (= 0.63.4) - - React-RCTActionSheet (= 0.63.4) - - React-RCTAnimation (= 0.63.4) - - React-RCTBlob (= 0.63.4) - - React-RCTImage (= 0.63.4) - - React-RCTLinking (= 0.63.4) - - React-RCTNetwork (= 0.63.4) - - React-RCTSettings (= 0.63.4) - - React-RCTText (= 0.63.4) - - React-RCTVibration (= 0.63.4) - - React-callinvoker (0.63.4) - - React-Core (0.63.4): - - Folly (= 2020.01.13.00) + - RCTRequired (0.64.0) + - RCTTypeSafety (0.64.0): + - FBLazyVector (= 0.64.0) + - RCT-Folly (= 2020.01.13.00) + - RCTRequired (= 0.64.0) + - React-Core (= 0.64.0) + - React (0.64.0): + - React-Core (= 0.64.0) + - React-Core/DevSupport (= 0.64.0) + - React-Core/RCTWebSocket (= 0.64.0) + - React-RCTActionSheet (= 0.64.0) + - React-RCTAnimation (= 0.64.0) + - React-RCTBlob (= 0.64.0) + - React-RCTImage (= 0.64.0) + - React-RCTLinking (= 0.64.0) + - React-RCTNetwork (= 0.64.0) + - React-RCTSettings (= 0.64.0) + - React-RCTText (= 0.64.0) + - React-RCTVibration (= 0.64.0) + - React-callinvoker (0.64.0) + - React-Core (0.64.0): - glog - - React-Core/Default (= 0.63.4) - - React-cxxreact (= 0.63.4) - - React-jsi (= 0.63.4) - - React-jsiexecutor (= 0.63.4) + - RCT-Folly (= 2020.01.13.00) + - React-Core/Default (= 0.64.0) + - React-cxxreact (= 0.64.0) + - React-jsi (= 0.64.0) + - React-jsiexecutor (= 0.64.0) + - React-perflogger (= 0.64.0) - Yoga - - React-Core/CoreModulesHeaders (0.63.4): - - Folly (= 2020.01.13.00) + - React-Core/CoreModulesHeaders (0.64.0): - glog + - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.4) - - React-jsi (= 0.63.4) - - React-jsiexecutor (= 0.63.4) + - React-cxxreact (= 0.64.0) + - React-jsi (= 0.64.0) + - React-jsiexecutor (= 0.64.0) + - React-perflogger (= 0.64.0) - Yoga - - React-Core/Default (0.63.4): - - Folly (= 2020.01.13.00) + - React-Core/Default (0.64.0): - glog - - React-cxxreact (= 0.63.4) - - React-jsi (= 0.63.4) - - React-jsiexecutor (= 0.63.4) + - RCT-Folly (= 2020.01.13.00) + - React-cxxreact (= 0.64.0) + - React-jsi (= 0.64.0) + - React-jsiexecutor (= 0.64.0) + - React-perflogger (= 0.64.0) - Yoga - - React-Core/DevSupport (0.63.4): - - Folly (= 2020.01.13.00) + - React-Core/DevSupport (0.64.0): - glog - - React-Core/Default (= 0.63.4) - - React-Core/RCTWebSocket (= 0.63.4) - - React-cxxreact (= 0.63.4) - - React-jsi (= 0.63.4) - - React-jsiexecutor (= 0.63.4) - - React-jsinspector (= 0.63.4) + - RCT-Folly (= 2020.01.13.00) + - React-Core/Default (= 0.64.0) + - React-Core/RCTWebSocket (= 0.64.0) + - React-cxxreact (= 0.64.0) + - React-jsi (= 0.64.0) + - React-jsiexecutor (= 0.64.0) + - React-jsinspector (= 0.64.0) + - React-perflogger (= 0.64.0) - Yoga - - React-Core/RCTActionSheetHeaders (0.63.4): - - Folly (= 2020.01.13.00) + - React-Core/RCTActionSheetHeaders (0.64.0): - glog + - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.4) - - React-jsi (= 0.63.4) - - React-jsiexecutor (= 0.63.4) + - React-cxxreact (= 0.64.0) + - React-jsi (= 0.64.0) + - React-jsiexecutor (= 0.64.0) + - React-perflogger (= 0.64.0) - Yoga - - React-Core/RCTAnimationHeaders (0.63.4): - - Folly (= 2020.01.13.00) + - React-Core/RCTAnimationHeaders (0.64.0): - glog + - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.4) - - React-jsi (= 0.63.4) - - React-jsiexecutor (= 0.63.4) + - React-cxxreact (= 0.64.0) + - React-jsi (= 0.64.0) + - React-jsiexecutor (= 0.64.0) + - React-perflogger (= 0.64.0) - Yoga - - React-Core/RCTBlobHeaders (0.63.4): - - Folly (= 2020.01.13.00) + - React-Core/RCTBlobHeaders (0.64.0): - glog + - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.4) - - React-jsi (= 0.63.4) - - React-jsiexecutor (= 0.63.4) + - React-cxxreact (= 0.64.0) + - React-jsi (= 0.64.0) + - React-jsiexecutor (= 0.64.0) + - React-perflogger (= 0.64.0) - Yoga - - React-Core/RCTImageHeaders (0.63.4): - - Folly (= 2020.01.13.00) + - React-Core/RCTImageHeaders (0.64.0): - glog + - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.4) - - React-jsi (= 0.63.4) - - React-jsiexecutor (= 0.63.4) + - React-cxxreact (= 0.64.0) + - React-jsi (= 0.64.0) + - React-jsiexecutor (= 0.64.0) + - React-perflogger (= 0.64.0) - Yoga - - React-Core/RCTLinkingHeaders (0.63.4): - - Folly (= 2020.01.13.00) + - React-Core/RCTLinkingHeaders (0.64.0): - glog + - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.4) - - React-jsi (= 0.63.4) - - React-jsiexecutor (= 0.63.4) + - React-cxxreact (= 0.64.0) + - React-jsi (= 0.64.0) + - React-jsiexecutor (= 0.64.0) + - React-perflogger (= 0.64.0) - Yoga - - React-Core/RCTNetworkHeaders (0.63.4): - - Folly (= 2020.01.13.00) + - React-Core/RCTNetworkHeaders (0.64.0): - glog + - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.4) - - React-jsi (= 0.63.4) - - React-jsiexecutor (= 0.63.4) + - React-cxxreact (= 0.64.0) + - React-jsi (= 0.64.0) + - React-jsiexecutor (= 0.64.0) + - React-perflogger (= 0.64.0) - Yoga - - React-Core/RCTSettingsHeaders (0.63.4): - - Folly (= 2020.01.13.00) + - React-Core/RCTSettingsHeaders (0.64.0): - glog + - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.4) - - React-jsi (= 0.63.4) - - React-jsiexecutor (= 0.63.4) + - React-cxxreact (= 0.64.0) + - React-jsi (= 0.64.0) + - React-jsiexecutor (= 0.64.0) + - React-perflogger (= 0.64.0) - Yoga - - React-Core/RCTTextHeaders (0.63.4): - - Folly (= 2020.01.13.00) + - React-Core/RCTTextHeaders (0.64.0): - glog + - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.4) - - React-jsi (= 0.63.4) - - React-jsiexecutor (= 0.63.4) + - React-cxxreact (= 0.64.0) + - React-jsi (= 0.64.0) + - React-jsiexecutor (= 0.64.0) + - React-perflogger (= 0.64.0) - Yoga - - React-Core/RCTVibrationHeaders (0.63.4): - - Folly (= 2020.01.13.00) + - React-Core/RCTVibrationHeaders (0.64.0): - glog + - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.4) - - React-jsi (= 0.63.4) - - React-jsiexecutor (= 0.63.4) + - React-cxxreact (= 0.64.0) + - React-jsi (= 0.64.0) + - React-jsiexecutor (= 0.64.0) + - React-perflogger (= 0.64.0) - Yoga - - React-Core/RCTWebSocket (0.63.4): - - Folly (= 2020.01.13.00) + - React-Core/RCTWebSocket (0.64.0): - glog - - React-Core/Default (= 0.63.4) - - React-cxxreact (= 0.63.4) - - React-jsi (= 0.63.4) - - React-jsiexecutor (= 0.63.4) + - RCT-Folly (= 2020.01.13.00) + - React-Core/Default (= 0.64.0) + - React-cxxreact (= 0.64.0) + - React-jsi (= 0.64.0) + - React-jsiexecutor (= 0.64.0) + - React-perflogger (= 0.64.0) - Yoga - - React-CoreModules (0.63.4): - - FBReactNativeSpec (= 0.63.4) - - Folly (= 2020.01.13.00) - - RCTTypeSafety (= 0.63.4) - - React-Core/CoreModulesHeaders (= 0.63.4) - - React-jsi (= 0.63.4) - - React-RCTImage (= 0.63.4) - - ReactCommon/turbomodule/core (= 0.63.4) - - React-cxxreact (0.63.4): + - React-CoreModules (0.64.0): + - FBReactNativeSpec (= 0.64.0) + - RCT-Folly (= 2020.01.13.00) + - RCTTypeSafety (= 0.64.0) + - React-Core/CoreModulesHeaders (= 0.64.0) + - React-jsi (= 0.64.0) + - React-RCTImage (= 0.64.0) + - ReactCommon/turbomodule/core (= 0.64.0) + - React-cxxreact (0.64.0): - boost-for-react-native (= 1.63.0) - DoubleConversion - - Folly (= 2020.01.13.00) - glog - - React-callinvoker (= 0.63.4) - - React-jsinspector (= 0.63.4) - - React-jsi (0.63.4): + - RCT-Folly (= 2020.01.13.00) + - React-callinvoker (= 0.64.0) + - React-jsi (= 0.64.0) + - React-jsinspector (= 0.64.0) + - React-perflogger (= 0.64.0) + - React-runtimeexecutor (= 0.64.0) + - React-jsi (0.64.0): - boost-for-react-native (= 1.63.0) - DoubleConversion - - Folly (= 2020.01.13.00) - glog - - React-jsi/Default (= 0.63.4) - - React-jsi/Default (0.63.4): + - RCT-Folly (= 2020.01.13.00) + - React-jsi/Default (= 0.64.0) + - React-jsi/Default (0.64.0): - boost-for-react-native (= 1.63.0) - DoubleConversion - - Folly (= 2020.01.13.00) - glog - - React-jsiexecutor (0.63.4): + - RCT-Folly (= 2020.01.13.00) + - React-jsiexecutor (0.64.0): - DoubleConversion - - Folly (= 2020.01.13.00) - glog - - React-cxxreact (= 0.63.4) - - React-jsi (= 0.63.4) - - React-jsinspector (0.63.4) + - RCT-Folly (= 2020.01.13.00) + - React-cxxreact (= 0.64.0) + - React-jsi (= 0.64.0) + - React-perflogger (= 0.64.0) + - React-jsinspector (0.64.0) - react-native-blur (0.8.0): - React - react-native-maps (0.27.1): - React - - react-native-safe-area-context (3.1.9): + - react-native-safe-area-context (3.2.0): - React-Core - - React-RCTActionSheet (0.63.4): - - React-Core/RCTActionSheetHeaders (= 0.63.4) - - React-RCTAnimation (0.63.4): - - FBReactNativeSpec (= 0.63.4) - - Folly (= 2020.01.13.00) - - RCTTypeSafety (= 0.63.4) - - React-Core/RCTAnimationHeaders (= 0.63.4) - - React-jsi (= 0.63.4) - - ReactCommon/turbomodule/core (= 0.63.4) - - React-RCTBlob (0.63.4): - - FBReactNativeSpec (= 0.63.4) - - Folly (= 2020.01.13.00) - - React-Core/RCTBlobHeaders (= 0.63.4) - - React-Core/RCTWebSocket (= 0.63.4) - - React-jsi (= 0.63.4) - - React-RCTNetwork (= 0.63.4) - - ReactCommon/turbomodule/core (= 0.63.4) - - React-RCTImage (0.63.4): - - FBReactNativeSpec (= 0.63.4) - - Folly (= 2020.01.13.00) - - RCTTypeSafety (= 0.63.4) - - React-Core/RCTImageHeaders (= 0.63.4) - - React-jsi (= 0.63.4) - - React-RCTNetwork (= 0.63.4) - - ReactCommon/turbomodule/core (= 0.63.4) - - React-RCTLinking (0.63.4): - - FBReactNativeSpec (= 0.63.4) - - React-Core/RCTLinkingHeaders (= 0.63.4) - - React-jsi (= 0.63.4) - - ReactCommon/turbomodule/core (= 0.63.4) - - React-RCTNetwork (0.63.4): - - FBReactNativeSpec (= 0.63.4) - - Folly (= 2020.01.13.00) - - RCTTypeSafety (= 0.63.4) - - React-Core/RCTNetworkHeaders (= 0.63.4) - - React-jsi (= 0.63.4) - - ReactCommon/turbomodule/core (= 0.63.4) - - React-RCTSettings (0.63.4): - - FBReactNativeSpec (= 0.63.4) - - Folly (= 2020.01.13.00) - - RCTTypeSafety (= 0.63.4) - - React-Core/RCTSettingsHeaders (= 0.63.4) - - React-jsi (= 0.63.4) - - ReactCommon/turbomodule/core (= 0.63.4) - - React-RCTText (0.63.4): - - React-Core/RCTTextHeaders (= 0.63.4) - - React-RCTVibration (0.63.4): - - FBReactNativeSpec (= 0.63.4) - - Folly (= 2020.01.13.00) - - React-Core/RCTVibrationHeaders (= 0.63.4) - - React-jsi (= 0.63.4) - - ReactCommon/turbomodule/core (= 0.63.4) - - ReactCommon/turbomodule/core (0.63.4): + - React-perflogger (0.64.0) + - React-RCTActionSheet (0.64.0): + - React-Core/RCTActionSheetHeaders (= 0.64.0) + - React-RCTAnimation (0.64.0): + - FBReactNativeSpec (= 0.64.0) + - RCT-Folly (= 2020.01.13.00) + - RCTTypeSafety (= 0.64.0) + - React-Core/RCTAnimationHeaders (= 0.64.0) + - React-jsi (= 0.64.0) + - ReactCommon/turbomodule/core (= 0.64.0) + - React-RCTBlob (0.64.0): + - FBReactNativeSpec (= 0.64.0) + - RCT-Folly (= 2020.01.13.00) + - React-Core/RCTBlobHeaders (= 0.64.0) + - React-Core/RCTWebSocket (= 0.64.0) + - React-jsi (= 0.64.0) + - React-RCTNetwork (= 0.64.0) + - ReactCommon/turbomodule/core (= 0.64.0) + - React-RCTImage (0.64.0): + - FBReactNativeSpec (= 0.64.0) + - RCT-Folly (= 2020.01.13.00) + - RCTTypeSafety (= 0.64.0) + - React-Core/RCTImageHeaders (= 0.64.0) + - React-jsi (= 0.64.0) + - React-RCTNetwork (= 0.64.0) + - ReactCommon/turbomodule/core (= 0.64.0) + - React-RCTLinking (0.64.0): + - FBReactNativeSpec (= 0.64.0) + - React-Core/RCTLinkingHeaders (= 0.64.0) + - React-jsi (= 0.64.0) + - ReactCommon/turbomodule/core (= 0.64.0) + - React-RCTNetwork (0.64.0): + - FBReactNativeSpec (= 0.64.0) + - RCT-Folly (= 2020.01.13.00) + - RCTTypeSafety (= 0.64.0) + - React-Core/RCTNetworkHeaders (= 0.64.0) + - React-jsi (= 0.64.0) + - ReactCommon/turbomodule/core (= 0.64.0) + - React-RCTSettings (0.64.0): + - FBReactNativeSpec (= 0.64.0) + - RCT-Folly (= 2020.01.13.00) + - RCTTypeSafety (= 0.64.0) + - React-Core/RCTSettingsHeaders (= 0.64.0) + - React-jsi (= 0.64.0) + - ReactCommon/turbomodule/core (= 0.64.0) + - React-RCTText (0.64.0): + - React-Core/RCTTextHeaders (= 0.64.0) + - React-RCTVibration (0.64.0): + - FBReactNativeSpec (= 0.64.0) + - RCT-Folly (= 2020.01.13.00) + - React-Core/RCTVibrationHeaders (= 0.64.0) + - React-jsi (= 0.64.0) + - ReactCommon/turbomodule/core (= 0.64.0) + - React-runtimeexecutor (0.64.0): + - React-jsi (= 0.64.0) + - ReactCommon/turbomodule/core (0.64.0): - DoubleConversion - - Folly (= 2020.01.13.00) - glog - - React-callinvoker (= 0.63.4) - - React-Core (= 0.63.4) - - React-cxxreact (= 0.63.4) - - React-jsi (= 0.63.4) + - RCT-Folly (= 2020.01.13.00) + - React-callinvoker (= 0.64.0) + - React-Core (= 0.64.0) + - React-cxxreact (= 0.64.0) + - React-jsi (= 0.64.0) + - React-perflogger (= 0.64.0) - RNCMaskedView (0.1.10): - React - RNGestureHandler (1.10.3): - React-Core - - RNReanimated (1.13.2): + - RNReanimated (1.13.3): - React-Core - RNScreens (2.18.1): - React-Core @@ -317,28 +337,28 @@ PODS: DEPENDENCIES: - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) - - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`) - - Flipper (~> 0.54.0) + - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`) + - Flipper (~> 0.75.1) - Flipper-DoubleConversion (= 1.1.7) - - Flipper-Folly (~> 2.2) + - Flipper-Folly (~> 2.5) - Flipper-Glog (= 0.3.6) - Flipper-PeerTalk (~> 0.0.4) - - Flipper-RSocket (~> 1.1) - - FlipperKit (~> 0.54.0) - - FlipperKit/Core (~> 0.54.0) - - FlipperKit/CppBridge (~> 0.54.0) - - FlipperKit/FBCxxFollyDynamicConvert (~> 0.54.0) - - FlipperKit/FBDefines (~> 0.54.0) - - FlipperKit/FKPortForwarding (~> 0.54.0) - - FlipperKit/FlipperKitHighlightOverlay (~> 0.54.0) - - FlipperKit/FlipperKitLayoutPlugin (~> 0.54.0) - - FlipperKit/FlipperKitLayoutTextSearchable (~> 0.54.0) - - FlipperKit/FlipperKitNetworkPlugin (~> 0.54.0) - - FlipperKit/FlipperKitReactPlugin (~> 0.54.0) - - FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.54.0) - - FlipperKit/SKIOSNetworkPlugin (~> 0.54.0) - - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`) + - Flipper-RSocket (~> 1.3) + - FlipperKit (~> 0.75.1) + - FlipperKit/Core (~> 0.75.1) + - FlipperKit/CppBridge (~> 0.75.1) + - FlipperKit/FBCxxFollyDynamicConvert (~> 0.75.1) + - FlipperKit/FBDefines (~> 0.75.1) + - FlipperKit/FKPortForwarding (~> 0.75.1) + - FlipperKit/FlipperKitHighlightOverlay (~> 0.75.1) + - FlipperKit/FlipperKitLayoutPlugin (~> 0.75.1) + - FlipperKit/FlipperKitLayoutTextSearchable (~> 0.75.1) + - FlipperKit/FlipperKitNetworkPlugin (~> 0.75.1) + - FlipperKit/FlipperKitReactPlugin (~> 0.75.1) + - FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.75.1) + - FlipperKit/SKIOSNetworkPlugin (~> 0.75.1) - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) + - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`) - React (from `../node_modules/react-native/`) @@ -354,6 +374,7 @@ DEPENDENCIES: - "react-native-blur (from `../node_modules/@react-native-community/blur`)" - react-native-maps (from `../node_modules/react-native-maps`) - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`) + - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`) - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`) - React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`) - React-RCTBlob (from `../node_modules/react-native/Libraries/Blob`) @@ -363,6 +384,7 @@ DEPENDENCIES: - React-RCTSettings (from `../node_modules/react-native/Libraries/Settings`) - React-RCTText (from `../node_modules/react-native/Libraries/Text`) - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`) + - React-runtimeexecutor (from `../node_modules/react-native/ReactCommon/runtimeexecutor`) - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`) - "RNCMaskedView (from `../node_modules/@react-native-community/masked-view`)" - RNGestureHandler (from `../node_modules/react-native-gesture-handler`) @@ -374,7 +396,6 @@ SPEC REPOS: trunk: - boost-for-react-native - CocoaAsyncSocket - - CocoaLibEvent - Flipper - Flipper-DoubleConversion - Flipper-Folly @@ -382,6 +403,7 @@ SPEC REPOS: - Flipper-PeerTalk - Flipper-RSocket - FlipperKit + - libevent - OpenSSL-Universal - YogaKit @@ -391,11 +413,11 @@ EXTERNAL SOURCES: FBLazyVector: :path: "../node_modules/react-native/Libraries/FBLazyVector" FBReactNativeSpec: - :path: "../node_modules/react-native/Libraries/FBReactNativeSpec" - Folly: - :podspec: "../node_modules/react-native/third-party-podspecs/Folly.podspec" + :path: "../node_modules/react-native/React/FBReactNativeSpec" glog: :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec" + RCT-Folly: + :podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec" RCTRequired: :path: "../node_modules/react-native/Libraries/RCTRequired" RCTTypeSafety: @@ -422,6 +444,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native-maps" react-native-safe-area-context: :path: "../node_modules/react-native-safe-area-context" + React-perflogger: + :path: "../node_modules/react-native/ReactCommon/reactperflogger" React-RCTActionSheet: :path: "../node_modules/react-native/Libraries/ActionSheetIOS" React-RCTAnimation: @@ -440,6 +464,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/Libraries/Text" React-RCTVibration: :path: "../node_modules/react-native/Libraries/Vibration" + React-runtimeexecutor: + :path: "../node_modules/react-native/ReactCommon/runtimeexecutor" ReactCommon: :path: "../node_modules/react-native/ReactCommon" RNCMaskedView: @@ -455,51 +481,53 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c - CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845 - CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f - DoubleConversion: cde416483dac037923206447da6e1454df403714 - FBLazyVector: 3bb422f41b18121b71783a905c10e58606f7dc3e - FBReactNativeSpec: f2c97f2529dd79c083355182cc158c9f98f4bd6e - Flipper: be611d4b742d8c87fbae2ca5f44603a02539e365 + CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 + DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de + FBLazyVector: 49cbe4b43e445b06bf29199b6ad2057649e4c8f5 + FBReactNativeSpec: 09d8ee1e916f764d2efaed862e708c688e989df1 + Flipper: d3da1aa199aad94455ae725e9f3aa43f3ec17021 Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41 - Flipper-Folly: e4493b013c02d9347d5e0cb4d128680239f6c78a + Flipper-Folly: f7a3caafbd74bda4827954fd7a6e000e36355489 Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6 Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 - Flipper-RSocket: 64e7431a55835eb953b0bf984ef3b90ae9fdddd7 - FlipperKit: ab353d41aea8aae2ea6daaf813e67496642f3d7d - Folly: b73c3869541e86821df3c387eb0af5f65addfab4 - glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3 - OpenSSL-Universal: ff34003318d5e1163e9529b08470708e389ffcdd - RCTRequired: 082f10cd3f905d6c124597fd1c14f6f2655ff65e - RCTTypeSafety: 8c9c544ecbf20337d069e4ae7fd9a377aadf504b - React: b0a957a2c44da4113b0c4c9853d8387f8e64e615 - React-callinvoker: c3f44dd3cb195b6aa46621fff95ded79d59043fe - React-Core: d3b2a1ac9a2c13c3bcde712d9281fc1c8a5b315b - React-CoreModules: 0581ff36cb797da0943d424f69e7098e43e9be60 - React-cxxreact: c1480d4fda5720086c90df537ee7d285d4c57ac3 - React-jsi: a0418934cf48f25b485631deb27c64dc40fb4c31 - React-jsiexecutor: 93bd528844ad21dc07aab1c67cb10abae6df6949 - React-jsinspector: 58aef7155bc9a9683f5b60b35eccea8722a4f53a + Flipper-RSocket: 602921fee03edacf18f5d6f3d3594ba477f456e5 + FlipperKit: 8a20b5c5fcf9436cac58551dc049867247f64b00 + glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62 + libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 + OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b + RCT-Folly: ec7a233ccc97cc556cf7237f0db1ff65b986f27c + RCTRequired: 2f8cb5b7533219bf4218a045f92768129cf7050a + RCTTypeSafety: 512728b73549e72ad7330b92f3d42936f2a4de5b + React: 98eac01574128a790f0bbbafe2d1a8607291ac24 + React-callinvoker: def3f7fae16192df68d9b69fd4bbb59092ee36bc + React-Core: 70a52aa5dbe9b83befae82038451a7df9fd54c5a + React-CoreModules: 052edef46117862e2570eb3a0f06d81c61d2c4b8 + React-cxxreact: c1dc71b30653cfb4770efdafcbdc0ad6d388baab + React-jsi: 74341196d9547cbcbcfa4b3bbbf03af56431d5a1 + React-jsiexecutor: 06a9c77b56902ae7ffcdd7a4905f664adc5d237b + React-jsinspector: 0ae35a37b20d5e031eb020a69cc5afdbd6406301 react-native-blur: cad4d93b364f91e7b7931b3fa935455487e5c33c react-native-maps: f4b89da81626ad7f151a8bfcb79733295d31ce5c - react-native-safe-area-context: b6e0e284002381d2ff29fa4fff42b4d8282e3c94 - React-RCTActionSheet: 89a0ca9f4a06c1f93c26067af074ccdce0f40336 - React-RCTAnimation: 1bde3ecc0c104c55df246eda516e0deb03c4e49b - React-RCTBlob: a97d378b527740cc667e03ebfa183a75231ab0f0 - React-RCTImage: c1b1f2d3f43a4a528c8946d6092384b5c880d2f0 - React-RCTLinking: 35ae4ab9dc0410d1fcbdce4d7623194a27214fb2 - React-RCTNetwork: 29ec2696f8d8cfff7331fac83d3e893c95ef43ae - React-RCTSettings: 60f0691bba2074ef394f95d4c2265ec284e0a46a - React-RCTText: 5c51df3f08cb9dedc6e790161195d12bac06101c - React-RCTVibration: ae4f914cfe8de7d4de95ae1ea6cc8f6315d73d9d - ReactCommon: 73d79c7039f473b76db6ff7c6b159c478acbbb3b + react-native-safe-area-context: f0906bf8bc9835ac9a9d3f97e8bde2a997d8da79 + React-perflogger: 9c547d8f06b9bf00cb447f2b75e8d7f19b7e02af + React-RCTActionSheet: 3080b6e12e0e1a5b313c8c0050699b5c794a1b11 + React-RCTAnimation: 3f96f21a497ae7dabf4d2f150ee43f906aaf516f + React-RCTBlob: 283b8e5025e7f954176bc48164f846909002f3ed + React-RCTImage: 5088a484faac78f2d877e1b79125d3bb1ea94a16 + React-RCTLinking: 5e8fbb3e9a8bc2e4e3eb15b1eb8bda5fcac27b8c + React-RCTNetwork: 38ec277217b1e841d5e6a1fa78da65b9212ccb28 + React-RCTSettings: 242d6e692108c3de4f3bb74b7586a8799e9ab070 + React-RCTText: 8746736ac8eb5a4a74719aa695b7a236a93a83d2 + React-RCTVibration: 0fd6b21751a33cb72fce1a4a33ab9678416d307a + React-runtimeexecutor: cad74a1eaa53ee6e7a3620231939d8fe2c6afcf0 + ReactCommon: cfe2b7fd20e0dbd2d1185cd7d8f99633fbc5ff05 RNCMaskedView: 5a8ec07677aa885546a0d98da336457e2bea557f RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211 - RNReanimated: e03f7425cb7a38dcf1b644d680d1bfc91c3337ad + RNReanimated: 514a11da3a2bcc6c3dfd9de32b38e2b9bf101926 RNScreens: f7ad633b2e0190b77b6a7aab7f914fad6f198d8d - Yoga: 4bd86afe9883422a7c4028c00e34790f560923d6 + Yoga: 8c8436d4171c87504c648ae23b1d81242bdf3bbf YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: 2267d8962573316d00ae86f0e09e0dab238ae5b5 +PODFILE CHECKSUM: 7320c07f4233ced2e4fada92040e176ea6b51395 COCOAPODS: 1.10.1 diff --git a/example/package.json b/example/package.json index e52d2f619..b2589d01e 100644 --- a/example/package.json +++ b/example/package.json @@ -10,30 +10,30 @@ }, "dependencies": { "@gorhom/portal": "^1.0.4", - "@gorhom/showcase-template": "^1.0.2", + "@gorhom/showcase-template": "^2.0.4", "@react-native-community/blur": "^3.6.0", "@react-native-community/masked-view": "0.1.10", "@react-navigation/native": "^5.9.3", "@react-navigation/stack": "^5.14.3", "faker": "^4.1.0", "lodash.isequal": "^4.5.0", - "react": "16.13.1", - "react-native": "0.63.4", + "nanoid": "^3.1.20", + "react": "17.0.1", + "react-native": "0.64.0", "react-native-gesture-handler": "^1.10.3", "react-native-maps": "^0.27.1", - "react-native-reanimated": "^1.13.2", + "react-native-reanimated": "^1.13.3", "react-native-redash": "^14.2.4", - "react-native-safe-area-context": "^3.1.9", + "react-native-safe-area-context": "^3.2.0", "react-native-screens": "^2.18.1" }, "devDependencies": { - "@babel/core": "^7.12.9", - "@babel/runtime": "^7.12.5", + "@babel/core": "^7.13.10", + "@babel/runtime": "^7.13.10", "@types/faker": "^4.1.12", "@types/react": "^17.0.0", - "@types/react-native": "^0.63.37", + "@types/react-native": "^0.64.2", "metro-react-native-babel-preset": "^0.64.0", - "nanoid": "^3.1.20", "typescript": "^4.2.3" } } diff --git a/example/src/App.tsx b/example/src/App.tsx index edd2521ae..6744774cf 100644 --- a/example/src/App.tsx +++ b/example/src/App.tsx @@ -1,159 +1,26 @@ -import React from 'react'; -import { NavigationContainer } from '@react-navigation/native'; -import { createStackNavigator } from '@react-navigation/stack'; -import AppearanceProvider from './components/appearanceProvider'; -import type { AppStackParamsList } from './types'; +import React, { useMemo } from 'react'; +import { ShowcaseApp } from '@gorhom/showcase-template'; +import { screens } from './screens'; +import { version, description } from '../../package.json'; -const Stack = createStackNavigator(); const App = () => { + // variables + const author = useMemo( + () => ({ + username: 'Mo Gorhom', + url: 'https://gorhom.dev', + }), + [] + ); + return ( - - - - require('./screens/Root').default} - options={{ headerShown: false }} - /> - {/* static examples */} - - require('./screens/static/BasicExamples').FlatListExampleScreen - } - /> - - require('./screens/static/BasicExamples').SectionListExampleScreen - } - /> - - require('./screens/static/BasicExamples').ScrollViewExampleScreen - } - /> - - require('./screens/static/BasicExamples').ViewExampleScreen - } - /> - {/* modal examples */} - - require('./screens/modal/SimpleExample').default - } - /> - - require('./screens/modal/BackdropExample').default - } - /> - require('./screens/modal/StackExample').default} - /> - - require('./screens/modal/StackWithBottomInsetExample').default - } - /> - - require('./screens/modal/DynamicSnapPointExample').default - } - /> - {/* advanced examples */} - - require('./screens/advanced/NavigatorExample').default - } - /> - - require('./screens/advanced/CustomHandleExample').default - } - /> - - require('./screens/advanced/CustomBackgroundExample').default - } - /> - - require('./screens/advanced/BackdropExample').default - } - /> - - require('./screens/advanced/MapExample').default - } - /> - - require('./screens/advanced/DynamicSnapPointExample').default - } - /> - - - + ); }; diff --git a/example/src/components/appearanceProvider/AppearanceProvider.tsx b/example/src/components/appearanceProvider/AppearanceProvider.tsx deleted file mode 100644 index 2ac63e76d..000000000 --- a/example/src/components/appearanceProvider/AppearanceProvider.tsx +++ /dev/null @@ -1,45 +0,0 @@ -import React, { - ReactNode, - useCallback, - useEffect, - useMemo, - useState, -} from 'react'; -// @ts-ignore -import { Appearance } from 'react-native'; -import { AppearanceContext } from '../../contexts'; - -interface AppearanceProviderProps { - children?: ReactNode; -} - -const _colorScheme = Appearance.getColorScheme(); - -const AppearanceProvider = ({ children }: AppearanceProviderProps) => { - // state - const [appearance, setAppearance] = useState(_colorScheme); - - // variables - const contextValue = useMemo(() => ({ appearance }), [appearance]); - - // callback - const handleAppearanceChange = useCallback(({ colorScheme }) => { - setAppearance(colorScheme); - }, []); - - // effects - useEffect(() => { - Appearance.addChangeListener(handleAppearanceChange); - - return () => { - Appearance.removeChangeListener(handleAppearanceChange); - }; - }, [handleAppearanceChange]); - return ( - - {children} - - ); -}; - -export default AppearanceProvider; diff --git a/example/src/components/appearanceProvider/index.ts b/example/src/components/appearanceProvider/index.ts deleted file mode 100644 index ef177ea32..000000000 --- a/example/src/components/appearanceProvider/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { default } from './AppearanceProvider'; diff --git a/example/src/components/button/Button.tsx b/example/src/components/button/Button.tsx index 54b0fb132..5735fc3d3 100644 --- a/example/src/components/button/Button.tsx +++ b/example/src/components/button/Button.tsx @@ -1,83 +1,21 @@ -import React, { useMemo } from 'react'; -import { - Text, - StyleSheet, - ViewStyle, - TextStyle, - View, - Platform, -} from 'react-native'; -import { TouchableOpacity } from '@gorhom/bottom-sheet'; -import { useAppearance } from '../../hooks'; +import React from 'react'; +import { ViewStyle, TextStyle } from 'react-native'; +import { ShowcaseButton, ShowcaseLabel } from '@gorhom/showcase-template'; interface ButtonProps { label: string; - labelColor?: string[]; labelStyle?: TextStyle; - containerColor?: string[]; style?: ViewStyle; - onPress?: () => void; + onPress: () => void; } -const Button = ({ - label, - labelColor, - labelStyle: _labelStyle, - containerColor, - style, - onPress, -}: ButtonProps) => { - // hooks - const { appearance } = useAppearance(); - - // styles - const containerStyle = useMemo( - () => [ - styles.container, - style, - containerColor && { - backgroundColor: - appearance === 'light' ? containerColor[0] : containerColor[1], - }, - ], - [style, containerColor, appearance] - ); - const labelStyle = useMemo( - () => [ - styles.label, - _labelStyle, - labelColor && { - color: appearance === 'light' ? labelColor[0] : labelColor[1], - }, - ], - [_labelStyle, labelColor, appearance] - ); - +const Button = ({ label, labelStyle, style, onPress }: ButtonProps) => { // render - - return Platform.OS === 'ios' ? ( - - {label} - - ) : ( - - - {label} - - + return ( + + {label} + ); }; -const styles = StyleSheet.create({ - container: { - padding: 12, - borderRadius: 4, - backgroundColor: '#333', - overflow: 'hidden', - }, - label: { - color: 'white', - }, -}); - export default Button; diff --git a/example/src/components/contactList/ContactList.tsx b/example/src/components/contactList/ContactList.tsx index 95710e4fc..f17b3199f 100644 --- a/example/src/components/contactList/ContactList.tsx +++ b/example/src/components/contactList/ContactList.tsx @@ -1,12 +1,5 @@ import React, { useMemo, useCallback } from 'react'; -import { - StyleSheet, - Text, - Platform, - View, - ViewStyle, - StyleProp, -} from 'react-native'; +import { StyleSheet, Text, Platform, View, ViewStyle } from 'react-native'; import { useSafeAreaInsets } from 'react-native-safe-area-context'; import { useFocusEffect } from '@react-navigation/native'; import { @@ -24,8 +17,7 @@ import ContactItem from '../contactItem'; export interface ContactListProps { type: 'FlatList' | 'SectionList' | 'ScrollView' | 'View'; count?: number; - style?: StyleProp; - header?: (() => JSX.Element) | null; + style?: ViewStyle; onItemPress?: () => void; } @@ -34,7 +26,6 @@ const keyExtractor = (item: any, index: number) => `${item.name}.${index}`; const ContactList = ({ type, count = 25, - header = null, style, onItemPress, }: ContactListProps) => { @@ -44,13 +35,11 @@ const ContactList = ({ // variables const sections = useMemo(() => createContactSectionsMockData(count), [count]); const data = useMemo(() => createContactListMockData(count), [count]); - const stickyHeaderIndices = useMemo(() => [0], []); // styles - const contentContainerStyle = useMemo( + const contentContainerStyle = useMemo( () => ({ ...styles.contentContainer, - // @ts-ignore ...style, paddingBottom: bottomSafeArea, }), @@ -109,10 +98,7 @@ const ContactList = ({ windowSize={10} maxToRenderPerBatch={5} renderItem={renderFlatListItem} - {...(header && { - stickyHeaderIndices: stickyHeaderIndices, - ListHeaderComponent: header, - })} + style={styles.container} contentContainerStyle={contentContainerStyle} focusHook={useFocusEffect} /> @@ -120,16 +106,17 @@ const ContactList = ({ } else if (type === 'ScrollView') { return ( - {header && header()} {data.map(renderScrollViewItem)} ); } else if (type === 'SectionList') { return ( 0} /> @@ -150,7 +133,6 @@ const ContactList = ({ } else if (type === 'View') { return ( - {header && header()} {data.map(renderScrollViewItem)} ); @@ -163,13 +145,19 @@ const styles = StyleSheet.create({ sectionHeaderContainer: { paddingTop: 24, paddingBottom: 6, + backgroundColor: 'white', }, sectionHeaderTitle: { fontSize: 16, textTransform: 'uppercase', }, + container: { + overflow: 'visible', + flex: 1, + }, contentContainer: { paddingHorizontal: 24, + overflow: 'visible', }, }); diff --git a/example/src/components/contactListContainer/ContactListContainer.tsx b/example/src/components/contactListContainer/ContactListContainer.tsx index b6a58c47c..f260ae786 100644 --- a/example/src/components/contactListContainer/ContactListContainer.tsx +++ b/example/src/components/contactListContainer/ContactListContainer.tsx @@ -1,34 +1,34 @@ -import React, { memo, useCallback } from 'react'; -import { StyleSheet } from 'react-native'; -import { Text, View } from 'react-native'; +import React, { memo, useMemo } from 'react'; +import { StyleSheet, Text, View, ViewStyle } from 'react-native'; import ContactList, { ContactListProps } from '../contactList'; interface ContactListContainerProps extends Omit { title: string; + headerStyle?: ViewStyle; } const ContactListContainerComponent = ({ count, type, title, + headerStyle: _headerStyle, onItemPress, }: ContactListContainerProps) => { - // renders - const renderHeader = useCallback(() => { - return ( - + const headerStyle = useMemo(() => [styles.headerContainer, _headerStyle], [ + _headerStyle, + ]); + return ( + <> + {title} - ); - }, [title]); - return ( - + + ); }; @@ -39,8 +39,9 @@ const styles = StyleSheet.create({ fontWeight: '800', }, headerContainer: { - paddingVertical: 24, + padding: 24, backgroundColor: 'white', + zIndex: 99999, }, }); diff --git a/example/src/components/locationDetails/LocationDetails.tsx b/example/src/components/locationDetails/LocationDetails.tsx index 5245be698..d959e6fd0 100644 --- a/example/src/components/locationDetails/LocationDetails.tsx +++ b/example/src/components/locationDetails/LocationDetails.tsx @@ -1,14 +1,13 @@ -import React, { useCallback } from 'react'; +import React, { useCallback, useMemo } from 'react'; import { View, StyleSheet, Image } from 'react-native'; +import { TouchableOpacity } from '@gorhom/bottom-sheet'; import { FlatList } from 'react-native-gesture-handler'; -import { Location } from '../../utils'; +import { ShowcaseLabel, useShowcaseTheme } from '@gorhom/showcase-template'; import Button from '../button'; -import Text from '../text'; +import type { Location } from '../../utils'; const keyExtractor = (item: string, index: number) => `${index}${item}`; const photoSize = 180; -const buttonLabelColors = ['rgba(0, 0, 0, 0.5)', 'rgba(255, 255, 255, 0.5)']; -const backgroundColors = ['rgba(0, 0, 0, 0.125)', 'rgba(255, 255, 255, 0.125)']; export const LOCATION_DETAILS_HEIGHT = 298; @@ -22,6 +21,22 @@ const LocationDetails = ({ photos, onClose, }: LocationDetailsProps) => { + //#region hooks + const { colors } = useShowcaseTheme(); + //#endregion + + //#region styles + const closeButtonStyle = useMemo( + () => [ + styles.closeButton, + { + backgroundColor: colors.secondaryCard, + }, + ], + [colors.secondaryCard] + ); + //#endregion + const renderPhoto = useCallback(({ item }) => { return ( - {name} - {address} + {name} + {address} -