fix: Fix build on Xcode 14 (#2033)
* fix: Fix build on Xcode 14 * Format * Make CI run on `macOS-latest` * Nested if
This commit is contained in:
parent
9573ae19cb
commit
2666ac53a6
4
.github/workflows/build-ios.yml
vendored
4
.github/workflows/build-ios.yml
vendored
@ -21,7 +21,7 @@ on:
|
||||
jobs:
|
||||
build:
|
||||
name: Build iOS Example App
|
||||
runs-on: macOS-13
|
||||
runs-on: macOS-latest
|
||||
defaults:
|
||||
run:
|
||||
working-directory: package/example/ios
|
||||
@ -80,7 +80,7 @@ jobs:
|
||||
|
||||
build-no-frame-processors:
|
||||
name: Build iOS Example App without Frame Processors
|
||||
runs-on: macOS-13
|
||||
runs-on: macOS-latest
|
||||
defaults:
|
||||
run:
|
||||
working-directory: package/example/ios
|
||||
|
2
.github/workflows/validate-ios.yml
vendored
2
.github/workflows/validate-ios.yml
vendored
@ -27,7 +27,7 @@ jobs:
|
||||
env:
|
||||
WORKING_DIRECTORY: ios
|
||||
SwiftFormat:
|
||||
runs-on: macOS-13
|
||||
runs-on: macOS-latest
|
||||
defaults:
|
||||
run:
|
||||
working-directory: ./package/ios
|
||||
|
@ -38,13 +38,15 @@ class CameraDevicesManager: RCTEventEmitter {
|
||||
|
||||
override func constantsToExport() -> [AnyHashable: Any]! {
|
||||
let devices = getDevicesJson()
|
||||
let preferredDevice: [String: Any]?
|
||||
if #available(iOS 17.0, *),
|
||||
let userPreferred = AVCaptureDevice.userPreferredCamera {
|
||||
let preferredDevice = devices.first
|
||||
|
||||
#if swift(>=5.9)
|
||||
if #available(iOS 17.0, *) {
|
||||
if let userPreferred = AVCaptureDevice.userPreferredCamera {
|
||||
preferredDevice = userPreferred.toDictionary()
|
||||
} else {
|
||||
preferredDevice = devices.first
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
return [
|
||||
"availableCameraDevices": devices,
|
||||
|
@ -32,6 +32,7 @@ extension AVCaptureOutput {
|
||||
func setOrientation(_ orientation: Orientation) {
|
||||
// Set orientation for each connection
|
||||
connections.forEach { connection in
|
||||
#if swift(>=5.9)
|
||||
if #available(iOS 17.0, *) {
|
||||
// Camera Sensors are always in landscape rotation (90deg).
|
||||
// We are setting the target rotation here, so we need to rotate by landscape once.
|
||||
@ -46,6 +47,11 @@ extension AVCaptureOutput {
|
||||
connection.videoOrientation = orientation.toAVCaptureVideoOrientation()
|
||||
}
|
||||
}
|
||||
#else
|
||||
if connection.isVideoOrientationSupported {
|
||||
connection.videoOrientation = orientation.toAVCaptureVideoOrientation()
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user