From 8aec647acd104af552fc87e3c52cfe623a90ec32 Mon Sep 17 00:00:00 2001 From: Marc Rousavy Date: Fri, 4 Jun 2021 12:32:20 +0200 Subject: [PATCH] fix: Fix CI (#165) * fix conditional * Build with cache again * Update build-ios.yml * Update build-ios.yml * Build for iPhone 11 Pro * Continue on buildcache restore error * remove emoji * Remove `measureElapsedTime` * Upgrade dependencies * Build with `-quiet` * Use `xcpretty` * set -o --- .github/workflows/build-ios.yml | 9 +- example/ios/Podfile.lock | 404 ++++++++++----------- example/package.json | 6 +- example/yarn.lock | 40 +- ios/Utils/MeasureElapsedTime.swift | 26 -- ios/VisionCamera.xcodeproj/project.pbxproj | 12 - package.json | 6 +- yarn.lock | 39 +- 8 files changed, 266 insertions(+), 276 deletions(-) delete mode 100644 ios/Utils/MeasureElapsedTime.swift diff --git a/.github/workflows/build-ios.yml b/.github/workflows/build-ios.yml index fb97157..cd87d92 100644 --- a/.github/workflows/build-ios.yml +++ b/.github/workflows/build-ios.yml @@ -42,6 +42,7 @@ jobs: - name: Restore buildcache uses: mikehardy/buildcache-action@v1 + continue-on-error: true - name: Setup Ruby (bundle) uses: ruby/setup-ruby@v1 @@ -62,14 +63,16 @@ jobs: ${{ runner.os }}-pods- - name: Install Pods run: bundle exec pod check || bundle exec pod install + - name: Install xcpretty + run: gem install xcpretty - name: Build App - run: "xcodebuild \ + run: "set -o pipefail && xcodebuild \ CC=clang CPLUSPLUS=clang++ LD=clang LDPLUSPLUS=clang++ \ -derivedDataPath build -UseModernBuildSystem=YES \ -workspace VisionCameraExample.xcworkspace \ -scheme VisionCameraExample \ -sdk iphonesimulator \ -configuration Debug \ - -destination \"generic/platform=iOS Simulator\" \ + -destination 'platform=iOS Simulator,name=iPhone 11 Pro' \ build \ - CODE_SIGNING_ALLOWED=NO" + CODE_SIGNING_ALLOWED=NO | xcpretty" diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index dfac544..0b3a5b8 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1,14 +1,14 @@ PODS: - boost-for-react-native (1.63.0) - DoubleConversion (1.1.6) - - FBLazyVector (0.64.1) - - FBReactNativeSpec (0.64.1): + - FBLazyVector (0.64.2) + - FBReactNativeSpec (0.64.2): - RCT-Folly (= 2020.01.13.00) - - RCTRequired (= 0.64.1) - - RCTTypeSafety (= 0.64.1) - - React-Core (= 0.64.1) - - React-jsi (= 0.64.1) - - ReactCommon/turbomodule/core (= 0.64.1) + - RCTRequired (= 0.64.2) + - RCTTypeSafety (= 0.64.2) + - React-Core (= 0.64.2) + - React-jsi (= 0.64.2) + - ReactCommon/turbomodule/core (= 0.64.2) - glog (0.3.5) - RCT-Folly (2020.01.13.00): - boost-for-react-native @@ -19,190 +19,190 @@ PODS: - boost-for-react-native - DoubleConversion - glog - - RCTRequired (0.64.1) - - RCTTypeSafety (0.64.1): - - FBLazyVector (= 0.64.1) + - RCTRequired (0.64.2) + - RCTTypeSafety (0.64.2): + - FBLazyVector (= 0.64.2) - RCT-Folly (= 2020.01.13.00) - - RCTRequired (= 0.64.1) - - React-Core (= 0.64.1) - - React (0.64.1): - - React-Core (= 0.64.1) - - React-Core/DevSupport (= 0.64.1) - - React-Core/RCTWebSocket (= 0.64.1) - - React-RCTActionSheet (= 0.64.1) - - React-RCTAnimation (= 0.64.1) - - React-RCTBlob (= 0.64.1) - - React-RCTImage (= 0.64.1) - - React-RCTLinking (= 0.64.1) - - React-RCTNetwork (= 0.64.1) - - React-RCTSettings (= 0.64.1) - - React-RCTText (= 0.64.1) - - React-RCTVibration (= 0.64.1) - - React-callinvoker (0.64.1) - - React-Core (0.64.1): + - RCTRequired (= 0.64.2) + - React-Core (= 0.64.2) + - React (0.64.2): + - React-Core (= 0.64.2) + - React-Core/DevSupport (= 0.64.2) + - React-Core/RCTWebSocket (= 0.64.2) + - React-RCTActionSheet (= 0.64.2) + - React-RCTAnimation (= 0.64.2) + - React-RCTBlob (= 0.64.2) + - React-RCTImage (= 0.64.2) + - React-RCTLinking (= 0.64.2) + - React-RCTNetwork (= 0.64.2) + - React-RCTSettings (= 0.64.2) + - React-RCTText (= 0.64.2) + - React-RCTVibration (= 0.64.2) + - React-callinvoker (0.64.2) + - React-Core (0.64.2): - glog - RCT-Folly (= 2020.01.13.00) - - React-Core/Default (= 0.64.1) - - React-cxxreact (= 0.64.1) - - React-jsi (= 0.64.1) - - React-jsiexecutor (= 0.64.1) - - React-perflogger (= 0.64.1) + - React-Core/Default (= 0.64.2) + - React-cxxreact (= 0.64.2) + - React-jsi (= 0.64.2) + - React-jsiexecutor (= 0.64.2) + - React-perflogger (= 0.64.2) - Yoga - - React-Core/CoreModulesHeaders (0.64.1): + - React-Core/CoreModulesHeaders (0.64.2): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.64.1) - - React-jsi (= 0.64.1) - - React-jsiexecutor (= 0.64.1) - - React-perflogger (= 0.64.1) + - React-cxxreact (= 0.64.2) + - React-jsi (= 0.64.2) + - React-jsiexecutor (= 0.64.2) + - React-perflogger (= 0.64.2) - Yoga - - React-Core/Default (0.64.1): + - React-Core/Default (0.64.2): - glog - RCT-Folly (= 2020.01.13.00) - - React-cxxreact (= 0.64.1) - - React-jsi (= 0.64.1) - - React-jsiexecutor (= 0.64.1) - - React-perflogger (= 0.64.1) + - React-cxxreact (= 0.64.2) + - React-jsi (= 0.64.2) + - React-jsiexecutor (= 0.64.2) + - React-perflogger (= 0.64.2) - Yoga - - React-Core/DevSupport (0.64.1): + - React-Core/DevSupport (0.64.2): - glog - RCT-Folly (= 2020.01.13.00) - - React-Core/Default (= 0.64.1) - - React-Core/RCTWebSocket (= 0.64.1) - - React-cxxreact (= 0.64.1) - - React-jsi (= 0.64.1) - - React-jsiexecutor (= 0.64.1) - - React-jsinspector (= 0.64.1) - - React-perflogger (= 0.64.1) + - React-Core/Default (= 0.64.2) + - React-Core/RCTWebSocket (= 0.64.2) + - React-cxxreact (= 0.64.2) + - React-jsi (= 0.64.2) + - React-jsiexecutor (= 0.64.2) + - React-jsinspector (= 0.64.2) + - React-perflogger (= 0.64.2) - Yoga - - React-Core/RCTActionSheetHeaders (0.64.1): + - React-Core/RCTActionSheetHeaders (0.64.2): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.64.1) - - React-jsi (= 0.64.1) - - React-jsiexecutor (= 0.64.1) - - React-perflogger (= 0.64.1) + - React-cxxreact (= 0.64.2) + - React-jsi (= 0.64.2) + - React-jsiexecutor (= 0.64.2) + - React-perflogger (= 0.64.2) - Yoga - - React-Core/RCTAnimationHeaders (0.64.1): + - React-Core/RCTAnimationHeaders (0.64.2): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.64.1) - - React-jsi (= 0.64.1) - - React-jsiexecutor (= 0.64.1) - - React-perflogger (= 0.64.1) + - React-cxxreact (= 0.64.2) + - React-jsi (= 0.64.2) + - React-jsiexecutor (= 0.64.2) + - React-perflogger (= 0.64.2) - Yoga - - React-Core/RCTBlobHeaders (0.64.1): + - React-Core/RCTBlobHeaders (0.64.2): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.64.1) - - React-jsi (= 0.64.1) - - React-jsiexecutor (= 0.64.1) - - React-perflogger (= 0.64.1) + - React-cxxreact (= 0.64.2) + - React-jsi (= 0.64.2) + - React-jsiexecutor (= 0.64.2) + - React-perflogger (= 0.64.2) - Yoga - - React-Core/RCTImageHeaders (0.64.1): + - React-Core/RCTImageHeaders (0.64.2): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.64.1) - - React-jsi (= 0.64.1) - - React-jsiexecutor (= 0.64.1) - - React-perflogger (= 0.64.1) + - React-cxxreact (= 0.64.2) + - React-jsi (= 0.64.2) + - React-jsiexecutor (= 0.64.2) + - React-perflogger (= 0.64.2) - Yoga - - React-Core/RCTLinkingHeaders (0.64.1): + - React-Core/RCTLinkingHeaders (0.64.2): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.64.1) - - React-jsi (= 0.64.1) - - React-jsiexecutor (= 0.64.1) - - React-perflogger (= 0.64.1) + - React-cxxreact (= 0.64.2) + - React-jsi (= 0.64.2) + - React-jsiexecutor (= 0.64.2) + - React-perflogger (= 0.64.2) - Yoga - - React-Core/RCTNetworkHeaders (0.64.1): + - React-Core/RCTNetworkHeaders (0.64.2): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.64.1) - - React-jsi (= 0.64.1) - - React-jsiexecutor (= 0.64.1) - - React-perflogger (= 0.64.1) + - React-cxxreact (= 0.64.2) + - React-jsi (= 0.64.2) + - React-jsiexecutor (= 0.64.2) + - React-perflogger (= 0.64.2) - Yoga - - React-Core/RCTSettingsHeaders (0.64.1): + - React-Core/RCTSettingsHeaders (0.64.2): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.64.1) - - React-jsi (= 0.64.1) - - React-jsiexecutor (= 0.64.1) - - React-perflogger (= 0.64.1) + - React-cxxreact (= 0.64.2) + - React-jsi (= 0.64.2) + - React-jsiexecutor (= 0.64.2) + - React-perflogger (= 0.64.2) - Yoga - - React-Core/RCTTextHeaders (0.64.1): + - React-Core/RCTTextHeaders (0.64.2): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.64.1) - - React-jsi (= 0.64.1) - - React-jsiexecutor (= 0.64.1) - - React-perflogger (= 0.64.1) + - React-cxxreact (= 0.64.2) + - React-jsi (= 0.64.2) + - React-jsiexecutor (= 0.64.2) + - React-perflogger (= 0.64.2) - Yoga - - React-Core/RCTVibrationHeaders (0.64.1): + - React-Core/RCTVibrationHeaders (0.64.2): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.64.1) - - React-jsi (= 0.64.1) - - React-jsiexecutor (= 0.64.1) - - React-perflogger (= 0.64.1) + - React-cxxreact (= 0.64.2) + - React-jsi (= 0.64.2) + - React-jsiexecutor (= 0.64.2) + - React-perflogger (= 0.64.2) - Yoga - - React-Core/RCTWebSocket (0.64.1): + - React-Core/RCTWebSocket (0.64.2): - glog - RCT-Folly (= 2020.01.13.00) - - React-Core/Default (= 0.64.1) - - React-cxxreact (= 0.64.1) - - React-jsi (= 0.64.1) - - React-jsiexecutor (= 0.64.1) - - React-perflogger (= 0.64.1) + - React-Core/Default (= 0.64.2) + - React-cxxreact (= 0.64.2) + - React-jsi (= 0.64.2) + - React-jsiexecutor (= 0.64.2) + - React-perflogger (= 0.64.2) - Yoga - - React-CoreModules (0.64.1): - - FBReactNativeSpec (= 0.64.1) + - React-CoreModules (0.64.2): + - FBReactNativeSpec (= 0.64.2) - RCT-Folly (= 2020.01.13.00) - - RCTTypeSafety (= 0.64.1) - - React-Core/CoreModulesHeaders (= 0.64.1) - - React-jsi (= 0.64.1) - - React-RCTImage (= 0.64.1) - - ReactCommon/turbomodule/core (= 0.64.1) - - React-cxxreact (0.64.1): + - RCTTypeSafety (= 0.64.2) + - React-Core/CoreModulesHeaders (= 0.64.2) + - React-jsi (= 0.64.2) + - React-RCTImage (= 0.64.2) + - ReactCommon/turbomodule/core (= 0.64.2) + - React-cxxreact (0.64.2): - boost-for-react-native (= 1.63.0) - DoubleConversion - glog - RCT-Folly (= 2020.01.13.00) - - React-callinvoker (= 0.64.1) - - React-jsi (= 0.64.1) - - React-jsinspector (= 0.64.1) - - React-perflogger (= 0.64.1) - - React-runtimeexecutor (= 0.64.1) - - React-jsi (0.64.1): + - React-callinvoker (= 0.64.2) + - React-jsi (= 0.64.2) + - React-jsinspector (= 0.64.2) + - React-perflogger (= 0.64.2) + - React-runtimeexecutor (= 0.64.2) + - React-jsi (0.64.2): - boost-for-react-native (= 1.63.0) - DoubleConversion - glog - RCT-Folly (= 2020.01.13.00) - - React-jsi/Default (= 0.64.1) - - React-jsi/Default (0.64.1): + - React-jsi/Default (= 0.64.2) + - React-jsi/Default (0.64.2): - boost-for-react-native (= 1.63.0) - DoubleConversion - glog - RCT-Folly (= 2020.01.13.00) - - React-jsiexecutor (0.64.1): + - React-jsiexecutor (0.64.2): - DoubleConversion - glog - RCT-Folly (= 2020.01.13.00) - - React-cxxreact (= 0.64.1) - - React-jsi (= 0.64.1) - - React-perflogger (= 0.64.1) - - React-jsinspector (0.64.1) + - React-cxxreact (= 0.64.2) + - React-jsi (= 0.64.2) + - React-perflogger (= 0.64.2) + - React-jsinspector (0.64.2) - react-native-blur (0.8.0): - React - react-native-cameraroll (4.0.4): @@ -214,70 +214,70 @@ PODS: - react-native-video/Video (= 5.1.1) - react-native-video/Video (5.1.1): - React-Core - - React-perflogger (0.64.1) - - React-RCTActionSheet (0.64.1): - - React-Core/RCTActionSheetHeaders (= 0.64.1) - - React-RCTAnimation (0.64.1): - - FBReactNativeSpec (= 0.64.1) + - React-perflogger (0.64.2) + - React-RCTActionSheet (0.64.2): + - React-Core/RCTActionSheetHeaders (= 0.64.2) + - React-RCTAnimation (0.64.2): + - FBReactNativeSpec (= 0.64.2) - RCT-Folly (= 2020.01.13.00) - - RCTTypeSafety (= 0.64.1) - - React-Core/RCTAnimationHeaders (= 0.64.1) - - React-jsi (= 0.64.1) - - ReactCommon/turbomodule/core (= 0.64.1) - - React-RCTBlob (0.64.1): - - FBReactNativeSpec (= 0.64.1) + - RCTTypeSafety (= 0.64.2) + - React-Core/RCTAnimationHeaders (= 0.64.2) + - React-jsi (= 0.64.2) + - ReactCommon/turbomodule/core (= 0.64.2) + - React-RCTBlob (0.64.2): + - FBReactNativeSpec (= 0.64.2) - RCT-Folly (= 2020.01.13.00) - - React-Core/RCTBlobHeaders (= 0.64.1) - - React-Core/RCTWebSocket (= 0.64.1) - - React-jsi (= 0.64.1) - - React-RCTNetwork (= 0.64.1) - - ReactCommon/turbomodule/core (= 0.64.1) - - React-RCTImage (0.64.1): - - FBReactNativeSpec (= 0.64.1) + - React-Core/RCTBlobHeaders (= 0.64.2) + - React-Core/RCTWebSocket (= 0.64.2) + - React-jsi (= 0.64.2) + - React-RCTNetwork (= 0.64.2) + - ReactCommon/turbomodule/core (= 0.64.2) + - React-RCTImage (0.64.2): + - FBReactNativeSpec (= 0.64.2) - RCT-Folly (= 2020.01.13.00) - - RCTTypeSafety (= 0.64.1) - - React-Core/RCTImageHeaders (= 0.64.1) - - React-jsi (= 0.64.1) - - React-RCTNetwork (= 0.64.1) - - ReactCommon/turbomodule/core (= 0.64.1) - - React-RCTLinking (0.64.1): - - FBReactNativeSpec (= 0.64.1) - - React-Core/RCTLinkingHeaders (= 0.64.1) - - React-jsi (= 0.64.1) - - ReactCommon/turbomodule/core (= 0.64.1) - - React-RCTNetwork (0.64.1): - - FBReactNativeSpec (= 0.64.1) + - RCTTypeSafety (= 0.64.2) + - React-Core/RCTImageHeaders (= 0.64.2) + - React-jsi (= 0.64.2) + - React-RCTNetwork (= 0.64.2) + - ReactCommon/turbomodule/core (= 0.64.2) + - React-RCTLinking (0.64.2): + - FBReactNativeSpec (= 0.64.2) + - React-Core/RCTLinkingHeaders (= 0.64.2) + - React-jsi (= 0.64.2) + - ReactCommon/turbomodule/core (= 0.64.2) + - React-RCTNetwork (0.64.2): + - FBReactNativeSpec (= 0.64.2) - RCT-Folly (= 2020.01.13.00) - - RCTTypeSafety (= 0.64.1) - - React-Core/RCTNetworkHeaders (= 0.64.1) - - React-jsi (= 0.64.1) - - ReactCommon/turbomodule/core (= 0.64.1) - - React-RCTSettings (0.64.1): - - FBReactNativeSpec (= 0.64.1) + - RCTTypeSafety (= 0.64.2) + - React-Core/RCTNetworkHeaders (= 0.64.2) + - React-jsi (= 0.64.2) + - ReactCommon/turbomodule/core (= 0.64.2) + - React-RCTSettings (0.64.2): + - FBReactNativeSpec (= 0.64.2) - RCT-Folly (= 2020.01.13.00) - - RCTTypeSafety (= 0.64.1) - - React-Core/RCTSettingsHeaders (= 0.64.1) - - React-jsi (= 0.64.1) - - ReactCommon/turbomodule/core (= 0.64.1) - - React-RCTText (0.64.1): - - React-Core/RCTTextHeaders (= 0.64.1) - - React-RCTVibration (0.64.1): - - FBReactNativeSpec (= 0.64.1) + - RCTTypeSafety (= 0.64.2) + - React-Core/RCTSettingsHeaders (= 0.64.2) + - React-jsi (= 0.64.2) + - ReactCommon/turbomodule/core (= 0.64.2) + - React-RCTText (0.64.2): + - React-Core/RCTTextHeaders (= 0.64.2) + - React-RCTVibration (0.64.2): + - FBReactNativeSpec (= 0.64.2) - RCT-Folly (= 2020.01.13.00) - - React-Core/RCTVibrationHeaders (= 0.64.1) - - React-jsi (= 0.64.1) - - ReactCommon/turbomodule/core (= 0.64.1) - - React-runtimeexecutor (0.64.1): - - React-jsi (= 0.64.1) - - ReactCommon/turbomodule/core (0.64.1): + - React-Core/RCTVibrationHeaders (= 0.64.2) + - React-jsi (= 0.64.2) + - ReactCommon/turbomodule/core (= 0.64.2) + - React-runtimeexecutor (0.64.2): + - React-jsi (= 0.64.2) + - ReactCommon/turbomodule/core (0.64.2): - DoubleConversion - glog - RCT-Folly (= 2020.01.13.00) - - React-callinvoker (= 0.64.1) - - React-Core (= 0.64.1) - - React-cxxreact (= 0.64.1) - - React-jsi (= 0.64.1) - - React-perflogger (= 0.64.1) + - React-callinvoker (= 0.64.2) + - React-Core (= 0.64.2) + - React-cxxreact (= 0.64.2) + - React-jsi (= 0.64.2) + - React-perflogger (= 0.64.2) - ReactNativeNavigation (7.15.0-snapshot.1548): - React-Core - React-RCTImage @@ -455,43 +455,43 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de - FBLazyVector: 7b423f9e248eae65987838148c36eec1dbfe0b53 - FBReactNativeSpec: 17b92ef63a5334d2c068d3a05f0b49ace5649eb3 + FBLazyVector: e686045572151edef46010a6f819ade377dfeb4b + FBReactNativeSpec: 1586584cb53515e1d2fe42790d326142ae101d7b glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62 RCT-Folly: ec7a233ccc97cc556cf7237f0db1ff65b986f27c - RCTRequired: ec2ebc96b7bfba3ca5c32740f5a0c6a014a274d2 - RCTTypeSafety: 22567f31e67c3e088c7ac23ea46ab6d4779c0ea5 - React: a241e3dbb1e91d06332f1dbd2b3ab26e1a4c4b9d - React-callinvoker: da4d1c6141696a00163960906bc8a55b985e4ce4 - React-Core: 46ba164c437d7dac607b470c83c8308b05799748 - React-CoreModules: 217bd14904491c7b9940ff8b34a3fe08013c2f14 - React-cxxreact: 0090588ae6660c4615d3629fdd5c768d0983add4 - React-jsi: 5de8204706bd872b78ea646aee5d2561ca1214b6 - React-jsiexecutor: 124e8f99992490d0d13e0649d950d3e1aae06fe9 - React-jsinspector: 500a59626037be5b3b3d89c5151bc3baa9abf1a9 + RCTRequired: 6d3e854f0e7260a648badd0d44fc364bc9da9728 + RCTTypeSafety: c1f31d19349c6b53085766359caac425926fafaa + React: bda6b6d7ae912de97d7a61aa5c160db24aa2ad69 + React-callinvoker: 9840ea7e8e88ed73d438edb725574820b29b5baa + React-Core: b5e385da7ce5f16a220fc60fd0749eae2c6120f0 + React-CoreModules: 17071a4e2c5239b01585f4aa8070141168ab298f + React-cxxreact: 9be7b6340ed9f7c53e53deca7779f07cd66525ba + React-jsi: 67747b9722f6dab2ffe15b011bcf6b3f2c3f1427 + React-jsiexecutor: 80c46bd381fd06e418e0d4f53672dc1d1945c4c3 + React-jsinspector: cc614ec18a9ca96fd275100c16d74d62ee11f0ae react-native-blur: cad4d93b364f91e7b7931b3fa935455487e5c33c react-native-cameraroll: 88f4e62d9ecd0e1f253abe4f685474f2ea14bfa2 react-native-slider: e99fc201cefe81270fc9d81714a7a0f5e566b168 react-native-video: 0bb76b6d6b77da3009611586c7dbf817b947f30e - React-perflogger: aad6d4b4a267936b3667260d1f649b6f6069a675 - React-RCTActionSheet: fc376be462c9c8d6ad82c0905442fd77f82a9d2a - React-RCTAnimation: ba0a1c3a2738be224a08092fa7f1b444ab77d309 - React-RCTBlob: f758d4403fc5828a326dc69e27b41e1a92f34947 - React-RCTImage: ce57088705f4a8d03f6594b066a59c29143ba73e - React-RCTLinking: 852a3a95c65fa63f657a4b4e2d3d83a815e00a7c - React-RCTNetwork: 9d7ccb8a08d522d71700b4fb677d9fa28cccd118 - React-RCTSettings: d8aaf4389ff06114dee8c42ef5f0f2915946011e - React-RCTText: 809c12ed6b261796ba056c04fcd20d8b90bcc81d - React-RCTVibration: 4b99a7f5c6c0abbc5256410cc5425fb8531986e1 - React-runtimeexecutor: ff951a0c241bfaefc4940a3f1f1a229e7cb32fa6 - ReactCommon: bedc99ed4dae329c4fcf128d0c31b9115e5365ca + React-perflogger: 25373e382fed75ce768a443822f07098a15ab737 + React-RCTActionSheet: af7796ba49ffe4ca92e7277a5d992d37203f7da5 + React-RCTAnimation: 6a2e76ab50c6f25b428d81b76a5a45351c4d77aa + React-RCTBlob: 02a2887023e0eed99391b6445b2e23a2a6f9226d + React-RCTImage: ce5bf8e7438f2286d9b646a05d6ab11f38b0323d + React-RCTLinking: ccd20742de14e020cb5f99d5c7e0bf0383aefbd9 + React-RCTNetwork: dfb9d089ab0753e5e5f55fc4b1210858f7245647 + React-RCTSettings: b14aef2d83699e48b410fb7c3ba5b66cd3291ae2 + React-RCTText: 41a2e952dd9adc5caf6fb68ed46b275194d5da5f + React-RCTVibration: 24600e3b1aaa77126989bc58b6747509a1ba14f3 + React-runtimeexecutor: a9904c6d0218fb9f8b19d6dd88607225927668f9 + ReactCommon: 149906e01aa51142707a10665185db879898e966 ReactNativeNavigation: 1357861a63f5d4da6ee099062c4d3473d777c86a RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211 RNReanimated: 9c13c86454bfd54dab7505c1a054470bfecd2563 RNStaticSafeAreaInsets: 6103cf09647fa427186d30f67b0f5163c1ae8252 RNVectorIcons: 31cebfcf94e8cf8686eb5303ae0357da64d7a5a4 VisionCamera: 478f70a945846254699cfd33c2ac852e79258b83 - Yoga: a7de31c64fe738607e7a3803e3f591a4b1df7393 + Yoga: 575c581c63e0d35c9a83f4b46d01d63abc1100ac PODFILE CHECKSUM: 4b093c1d474775c2eac3268011e4b0b80929d3a2 diff --git a/example/package.json b/example/package.json index 351f522..d821aca 100644 --- a/example/package.json +++ b/example/package.json @@ -15,7 +15,7 @@ "@react-native-community/cameraroll": "^4.0.4", "@react-native-community/slider": "^3.0.3", "react": "^17.0.2", - "react-native": "^0.64.1", + "react-native": "^0.64.2", "react-native-gesture-handler": "^1.10.3", "react-native-navigation": "7.15.0-snapshot.1548", "react-native-pressable-opacity": "^1.0.4", @@ -29,8 +29,8 @@ "@babel/runtime": "^7.14.0", "@react-native-community/eslint-config": "^2.0.0", "@react-native-community/eslint-plugin": "^1.1.0", - "@types/react": "^17.0.8", - "@types/react-native": "^0.64.8", + "@types/react": "^17.0.9", + "@types/react-native": "^0.64.10", "@types/react-native-vector-icons": "^6.4.6", "@types/react-native-video": "^5.0.5", "@typescript-eslint/eslint-plugin": "^4.26.0", diff --git a/example/yarn.lock b/example/yarn.lock index d371921..fe2338e 100644 --- a/example/yarn.lock +++ b/example/yarn.lock @@ -794,7 +794,7 @@ hermes-profile-transformer "^0.0.6" ip "^1.1.5" -"@react-native-community/cli-platform-android@^5.0.1-alpha.0", "@react-native-community/cli-platform-android@^5.0.1-alpha.1": +"@react-native-community/cli-platform-android@^5.0.1-alpha.1": version "5.0.1-alpha.1" resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-android/-/cli-platform-android-5.0.1-alpha.1.tgz#343ea5b469ac696268ecc1961ee44b91d1367cd1" integrity sha512-Fx9Tm0Z9sl5CD/VS8XWIY1gTgf28MMnAvyx0oj7yO4IzWuOpJPyWxTJITc80GAK6tlyijORv5kriYpXnquxQLg== @@ -810,7 +810,7 @@ slash "^3.0.0" xmldoc "^1.1.2" -"@react-native-community/cli-platform-ios@^5.0.1-alpha.0": +"@react-native-community/cli-platform-ios@^5.0.1-alpha.1": version "5.0.1-alpha.2" resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-5.0.1-alpha.2.tgz#58ab0641355cbe68a0d1737dde8c7d66eb0c0e39" integrity sha512-W15A75j+4bx6qbcapFia1A0M+W3JAt7Bc4VgEYvxDDRI62EsSHk1k6ZBNxs/j0cDPSYF9ZXHlRI+CWi3r9bTbQ== @@ -857,7 +857,7 @@ dependencies: ora "^3.4.0" -"@react-native-community/cli@^5.0.1-alpha.0": +"@react-native-community/cli@^5.0.1-alpha.1": version "5.0.1-alpha.2" resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-5.0.1-alpha.2.tgz#7e78378120fd4e264e4b577cbcf5e52b5beaa53b" integrity sha512-PP22TVV2VyELXhAX4PcBisasssastSEx23XDklfPoCPIXD2QgGC7y39n/b5I9tOzKi2qYswCEAcDpwXYwevGOg== @@ -1028,14 +1028,21 @@ "@types/react" "*" "@types/react-native" "*" -"@types/react-native@*", "@types/react-native@^0.64.8": +"@types/react-native@*": version "0.64.8" resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.64.8.tgz#6679198048581b1c33ac6050c1d46dced5e229b8" integrity sha512-Jg1x3TTDTkVKu5gX1pPLKdkWqDQgDPOMP0wMG8d9br9tDITisA79zJ07o8dcPJWKETsBglHYPUQRVG2fxC2V8g== dependencies: "@types/react" "*" -"@types/react@*", "@types/react@^17.0.8": +"@types/react-native@^0.64.10": + version "0.64.10" + resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.64.10.tgz#5eb6a72c77ce0f7e6e14b19c61a6bc585975eef5" + integrity sha512-3Kb9QM5/WZ6p58yZ7VPbvjvi6Wc/ZkESgJhKso1gKkNuHBe/4WL6586R2JRDiz9Tsxal9lMnbj3fligBVGl8PA== + dependencies: + "@types/react" "*" + +"@types/react@*": version "17.0.8" resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.8.tgz#fe76e3ba0fbb5602704110fd1e3035cf394778e3" integrity sha512-3sx4c0PbXujrYAKwXxNONXUtRp9C+hE2di0IuxFyf5BELD+B+AXL8G7QrmSKhVwKZDbv0igiAjQAMhXj8Yg3aw== @@ -1044,6 +1051,15 @@ "@types/scheduler" "*" csstype "^3.0.2" +"@types/react@^17.0.9": + version "17.0.9" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.9.tgz#1147fb520024a62c9b3841f5cb4db89b73ddb87f" + integrity sha512-2Cw7FvevpJxQrCb+k5t6GH1KIvmadj5uBbjPaLlJB/nZWUj56e1ZqcD6zsoMFB47MsJUTFl9RJ132A7hb3QFJA== + dependencies: + "@types/prop-types" "*" + "@types/scheduler" "*" + csstype "^3.0.2" + "@types/scheduler@*": version "0.16.1" resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.1.tgz#18845205e86ff0038517aab7a18a62a6b9f71275" @@ -4724,15 +4740,15 @@ react-native-video@^5.1.1: prop-types "^15.7.2" shaka-player "^2.5.9" -react-native@^0.64.1: - version "0.64.1" - resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.64.1.tgz#cd38f5b47b085549686f34eb0c9dcd466f307635" - integrity sha512-jvSj+hNAfwvhaSmxd5KHJ5HidtG0pDXzoH6DaqNpU74g3CmAiA8vuk58B5yx/DYuffGq6PeMniAcwuh3Xp4biQ== +react-native@^0.64.2: + version "0.64.2" + resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.64.2.tgz#233b6ed84ac4749c8bc2a2d6cf63577a1c437d18" + integrity sha512-Ty/fFHld9DcYsFZujXYdeVjEhvSeQcwuTGXezyoOkxfiGEGrpL/uwUZvMzwShnU4zbbTKDu2PAm/uwuOittRGA== dependencies: "@jest/create-cache-key-function" "^26.5.0" - "@react-native-community/cli" "^5.0.1-alpha.0" - "@react-native-community/cli-platform-android" "^5.0.1-alpha.0" - "@react-native-community/cli-platform-ios" "^5.0.1-alpha.0" + "@react-native-community/cli" "^5.0.1-alpha.1" + "@react-native-community/cli-platform-android" "^5.0.1-alpha.1" + "@react-native-community/cli-platform-ios" "^5.0.1-alpha.1" "@react-native/assets" "1.0.0" "@react-native/normalize-color" "1.0.0" "@react-native/polyfills" "1.0.0" diff --git a/ios/Utils/MeasureElapsedTime.swift b/ios/Utils/MeasureElapsedTime.swift deleted file mode 100644 index d0a4432..0000000 --- a/ios/Utils/MeasureElapsedTime.swift +++ /dev/null @@ -1,26 +0,0 @@ -// -// MeasureElapsedTime.swift -// VisionCamera -// -// Created by Marc Rousavy on 01.06.21. -// Copyright © 2021 mrousavy. All rights reserved. -// - -import Foundation - -/** - Measures the amount of time the given codeblock takes to execute. - Results will be printed to the [ReactLogger] with millisecond precision. - */ -@inlinable -func measureElapsedTime(_ label: String = #function, _ code: () -> T) -> T { - #if DEBUG - let start = DispatchTime.now() - defer { - let end = DispatchTime.now() - let nanoTime = end.uptimeNanoseconds - start.uptimeNanoseconds - ReactLogger.log(level: .info, message: "⏱ \(label) took: \(Double(nanoTime) / 1_000_000)ms!") - } - #endif - return code() -} diff --git a/ios/VisionCamera.xcodeproj/project.pbxproj b/ios/VisionCamera.xcodeproj/project.pbxproj index c807156..f3fa056 100644 --- a/ios/VisionCamera.xcodeproj/project.pbxproj +++ b/ios/VisionCamera.xcodeproj/project.pbxproj @@ -54,7 +54,6 @@ B88B47472667C8E00091F538 /* AVCaptureSession+setVideoStabilizationMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = B88B47462667C8E00091F538 /* AVCaptureSession+setVideoStabilizationMode.swift */; }; B8994E6C263F03E100069589 /* JSIUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = B8994E6B263F03E100069589 /* JSIUtils.mm */; }; B8A751D82609E4B30011C623 /* FrameProcessorRuntimeManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = B8A751D72609E4B30011C623 /* FrameProcessorRuntimeManager.mm */; }; - B8CCC5A1266694B200B3916F /* MeasureElapsedTime.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8CCC5A0266694B200B3916F /* MeasureElapsedTime.swift */; }; B8D22CDC2642DB4D00234472 /* AVAssetWriterInputPixelBufferAdaptor+initWithVideoSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8D22CDB2642DB4D00234472 /* AVAssetWriterInputPixelBufferAdaptor+initWithVideoSettings.swift */; }; B8DB3BC8263DC28C004C18D7 /* AVAssetWriter.Status+descriptor.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8DB3BC7263DC28C004C18D7 /* AVAssetWriter.Status+descriptor.swift */; }; B8DB3BCA263DC4D8004C18D7 /* RecordingSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8DB3BC9263DC4D8004C18D7 /* RecordingSession.swift */; }; @@ -133,7 +132,6 @@ B8994E6B263F03E100069589 /* JSIUtils.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = JSIUtils.mm; sourceTree = ""; }; B8A751D62609E4980011C623 /* FrameProcessorRuntimeManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FrameProcessorRuntimeManager.h; sourceTree = ""; }; B8A751D72609E4B30011C623 /* FrameProcessorRuntimeManager.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = FrameProcessorRuntimeManager.mm; sourceTree = ""; }; - B8CCC5A0266694B200B3916F /* MeasureElapsedTime.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeasureElapsedTime.swift; sourceTree = ""; }; B8D22CDB2642DB4D00234472 /* AVAssetWriterInputPixelBufferAdaptor+initWithVideoSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AVAssetWriterInputPixelBufferAdaptor+initWithVideoSettings.swift"; sourceTree = ""; }; B8DB3BC7263DC28C004C18D7 /* AVAssetWriter.Status+descriptor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AVAssetWriter.Status+descriptor.swift"; sourceTree = ""; }; B8DB3BC9263DC4D8004C18D7 /* RecordingSession.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecordingSession.swift; sourceTree = ""; }; @@ -182,7 +180,6 @@ B8DCF08F25EA7BEE00EA5C72 /* cpp */, B887516125E0102000DB86D6 /* Extensions */, B887517225E0102000DB86D6 /* Parsers */, - B8CCC59F266694A200B3916F /* Utils */, B887516D25E0102000DB86D6 /* React Utils */, 134814211AA4EA7D00B7C361 /* Products */, ); @@ -246,14 +243,6 @@ path = Parsers; sourceTree = ""; }; - B8CCC59F266694A200B3916F /* Utils */ = { - isa = PBXGroup; - children = ( - B8CCC5A0266694B200B3916F /* MeasureElapsedTime.swift */, - ); - path = Utils; - sourceTree = ""; - }; B8DCF08F25EA7BEE00EA5C72 /* cpp */ = { isa = PBXGroup; children = ( @@ -391,7 +380,6 @@ B887518C25E0102000DB86D6 /* AVCaptureDevice+isMultiCam.swift in Sources */, B887518D25E0102000DB86D6 /* AVCaptureDevice+physicalDevices.swift in Sources */, B887519625E0102000DB86D6 /* Promise.swift in Sources */, - B8CCC5A1266694B200B3916F /* MeasureElapsedTime.swift in Sources */, B8DB3BC8263DC28C004C18D7 /* AVAssetWriter.Status+descriptor.swift in Sources */, B887518725E0102000DB86D6 /* CameraViewManager.m in Sources */, B88751A925E0102000DB86D6 /* CameraView.swift in Sources */, diff --git a/package.json b/package.json index 6872dec..3a86fcb 100644 --- a/package.json +++ b/package.json @@ -73,8 +73,8 @@ "@react-native-community/eslint-config": "^2.0.0", "@react-native-community/eslint-plugin": "^1.1.0", "@release-it/conventional-changelog": "^2.0.0", - "@types/react": "^17.0.8", - "@types/react-native": "^0.64.8", + "@types/react": "^17.0.9", + "@types/react-native": "^0.64.10", "@typescript-eslint/eslint-plugin": "^4.26.0", "@typescript-eslint/parser": "^4.26.0", "eslint": "^7.27.0", @@ -85,7 +85,7 @@ "pod-install": "^0.1.23", "prettier": "^2.3.0", "react": "^17.0.2", - "react-native": "^0.64.1", + "react-native": "^0.64.2", "react-native-builder-bob": "^0.18.1", "react-native-reanimated": "^2.2.0", "release-it": "^14.6.1", diff --git a/yarn.lock b/yarn.lock index 8b33e08..0bb1881 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1245,7 +1245,7 @@ hermes-profile-transformer "^0.0.6" ip "^1.1.5" -"@react-native-community/cli-platform-android@^5.0.1-alpha.0", "@react-native-community/cli-platform-android@^5.0.1-alpha.1": +"@react-native-community/cli-platform-android@^5.0.1-alpha.1": version "5.0.1-alpha.1" resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-android/-/cli-platform-android-5.0.1-alpha.1.tgz#343ea5b469ac696268ecc1961ee44b91d1367cd1" integrity sha512-Fx9Tm0Z9sl5CD/VS8XWIY1gTgf28MMnAvyx0oj7yO4IzWuOpJPyWxTJITc80GAK6tlyijORv5kriYpXnquxQLg== @@ -1261,7 +1261,7 @@ slash "^3.0.0" xmldoc "^1.1.2" -"@react-native-community/cli-platform-ios@^5.0.1-alpha.0": +"@react-native-community/cli-platform-ios@^5.0.1-alpha.1": version "5.0.1-alpha.2" resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-5.0.1-alpha.2.tgz#58ab0641355cbe68a0d1737dde8c7d66eb0c0e39" integrity sha512-W15A75j+4bx6qbcapFia1A0M+W3JAt7Bc4VgEYvxDDRI62EsSHk1k6ZBNxs/j0cDPSYF9ZXHlRI+CWi3r9bTbQ== @@ -1308,7 +1308,7 @@ dependencies: ora "^3.4.0" -"@react-native-community/cli@^5.0.1-alpha.0": +"@react-native-community/cli@^5.0.1-alpha.1": version "5.0.1-alpha.2" resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-5.0.1-alpha.2.tgz#7e78378120fd4e264e4b577cbcf5e52b5beaa53b" integrity sha512-PP22TVV2VyELXhAX4PcBisasssastSEx23XDklfPoCPIXD2QgGC7y39n/b5I9tOzKi2qYswCEAcDpwXYwevGOg== @@ -1524,14 +1524,14 @@ resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7" integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw== -"@types/react-native@^0.64.8": - version "0.64.8" - resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.64.8.tgz#6679198048581b1c33ac6050c1d46dced5e229b8" - integrity sha512-Jg1x3TTDTkVKu5gX1pPLKdkWqDQgDPOMP0wMG8d9br9tDITisA79zJ07o8dcPJWKETsBglHYPUQRVG2fxC2V8g== +"@types/react-native@^0.64.10": + version "0.64.10" + resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.64.10.tgz#5eb6a72c77ce0f7e6e14b19c61a6bc585975eef5" + integrity sha512-3Kb9QM5/WZ6p58yZ7VPbvjvi6Wc/ZkESgJhKso1gKkNuHBe/4WL6586R2JRDiz9Tsxal9lMnbj3fligBVGl8PA== dependencies: "@types/react" "*" -"@types/react@*", "@types/react@^17.0.8": +"@types/react@*": version "17.0.8" resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.8.tgz#fe76e3ba0fbb5602704110fd1e3035cf394778e3" integrity sha512-3sx4c0PbXujrYAKwXxNONXUtRp9C+hE2di0IuxFyf5BELD+B+AXL8G7QrmSKhVwKZDbv0igiAjQAMhXj8Yg3aw== @@ -1540,6 +1540,15 @@ "@types/scheduler" "*" csstype "^3.0.2" +"@types/react@^17.0.9": + version "17.0.9" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.9.tgz#1147fb520024a62c9b3841f5cb4db89b73ddb87f" + integrity sha512-2Cw7FvevpJxQrCb+k5t6GH1KIvmadj5uBbjPaLlJB/nZWUj56e1ZqcD6zsoMFB47MsJUTFl9RJ132A7hb3QFJA== + dependencies: + "@types/prop-types" "*" + "@types/scheduler" "*" + csstype "^3.0.2" + "@types/responselike@*", "@types/responselike@^1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29" @@ -6352,15 +6361,15 @@ react-native-reanimated@^2.2.0: mockdate "^3.0.2" string-hash-64 "^1.0.3" -react-native@^0.64.1: - version "0.64.1" - resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.64.1.tgz#cd38f5b47b085549686f34eb0c9dcd466f307635" - integrity sha512-jvSj+hNAfwvhaSmxd5KHJ5HidtG0pDXzoH6DaqNpU74g3CmAiA8vuk58B5yx/DYuffGq6PeMniAcwuh3Xp4biQ== +react-native@^0.64.2: + version "0.64.2" + resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.64.2.tgz#233b6ed84ac4749c8bc2a2d6cf63577a1c437d18" + integrity sha512-Ty/fFHld9DcYsFZujXYdeVjEhvSeQcwuTGXezyoOkxfiGEGrpL/uwUZvMzwShnU4zbbTKDu2PAm/uwuOittRGA== dependencies: "@jest/create-cache-key-function" "^26.5.0" - "@react-native-community/cli" "^5.0.1-alpha.0" - "@react-native-community/cli-platform-android" "^5.0.1-alpha.0" - "@react-native-community/cli-platform-ios" "^5.0.1-alpha.0" + "@react-native-community/cli" "^5.0.1-alpha.1" + "@react-native-community/cli-platform-android" "^5.0.1-alpha.1" + "@react-native-community/cli-platform-ios" "^5.0.1-alpha.1" "@react-native/assets" "1.0.0" "@react-native/normalize-color" "1.0.0" "@react-native/polyfills" "1.0.0"