diff --git a/bun.lock b/bun.lock index 6186d562..0887f14a 100644 --- a/bun.lock +++ b/bun.lock @@ -51,7 +51,7 @@ }, "example": { "name": "react-native-video-example", - "version": "7.0.0-alpha.10", + "version": "7.0.0-alpha.11", "dependencies": { "@react-native-community/slider": "^4.5.6", "@react-native-video/drm": "*", @@ -79,7 +79,7 @@ }, "packages/drm-plugin": { "name": "@react-native-video/drm", - "version": "7.0.0-alpha.10", + "version": "7.0.0-alpha.11", "devDependencies": { "@react-native/babel-preset": "0.79.2", "@release-it/conventional-changelog": "^9.0.2", @@ -107,7 +107,7 @@ }, "packages/react-native-video": { "name": "react-native-video", - "version": "7.0.0-alpha.10", + "version": "7.0.0-alpha.11", "devDependencies": { "@expo/config-plugins": "^10.0.2", "@react-native/eslint-config": "^0.77.0", diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 62e324e4..ec0374c9 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1565,7 +1565,7 @@ PODS: - React-logger (= 0.77.3) - React-perflogger (= 0.77.3) - React-utils (= 0.77.3) - - ReactNativeVideo (7.0.0-alpha.7): + - ReactNativeVideo (7.0.0-alpha.11): - DoubleConversion - glog - hermes-engine @@ -1587,7 +1587,7 @@ PODS: - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - Yoga - - ReactNativeVideoDrm (7.0.0-alpha.7): + - ReactNativeVideoDrm (7.0.0-alpha.11): - DoubleConversion - glog - hermes-engine @@ -1904,8 +1904,8 @@ SPEC CHECKSUMS: ReactAppDependencyProvider: 31015410a4a53b9fd0a908ad4d6e3e2b9a25086a ReactCodegen: 53316394e985ded1babc7f143c90c77d2bb1b43c ReactCommon: bf4612cba0fa356b529385029f470d5529dddde4 - ReactNativeVideo: 0189b775e803a2ed5c9601d6f203d82d98736770 - ReactNativeVideoDrm: 561d9e3e110dfe1be287155dd1f273d2b8d90d90 + ReactNativeVideo: d6536278408a2518bf15b8f0b8fb066b3c824065 + ReactNativeVideoDrm: 4316a2f9e2ba34ed83de3c70fd37ab985568f948 SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748 Yoga: 92f3bb322c40a86b7233b815854730442e01b8c4 diff --git a/example/patches/nitrogen+0.30.1.patch b/example/patches/nitrogen+0.30.1.patch new file mode 100644 index 00000000..189707de --- /dev/null +++ b/example/patches/nitrogen+0.30.1.patch @@ -0,0 +1,18 @@ +diff --git a/node_modules/nitrogen/src/syntax/swift/SwiftCxxBridgedType.ts b/node_modules/nitrogen/src/syntax/swift/SwiftCxxBridgedType.ts +index a1761b4..b79abb6 100644 +--- a/node_modules/nitrogen/src/syntax/swift/SwiftCxxBridgedType.ts ++++ b/node_modules/nitrogen/src/syntax/swift/SwiftCxxBridgedType.ts +@@ -452,7 +452,12 @@ export class SwiftCxxBridgedType implements BridgedType<'swift', 'c++'> { + // TODO: Remove this check for booleans once https://github.com/swiftlang/swift/issues/84848 is fixed. + const swiftBug84848Workaround = + optional.wrappingType.kind === 'boolean' +- if (!wrapping.needsSpecialHandling && !swiftBug84848Workaround) { ++ ++ // TODO: Remove this check for numbers once the Swift bug is fixed. ++ const swiftNumberWorkaround = ++ optional.wrappingType.kind === 'number' ++ ++ if (!wrapping.needsSpecialHandling && !swiftBug84848Workaround && !swiftNumberWorkaround) { + return `${cppParameterName}.value` + } + return ` diff --git a/packages/react-native-video/nitrogen/generated/ios/swift/BandwidthData.swift b/packages/react-native-video/nitrogen/generated/ios/swift/BandwidthData.swift index 94f0d26a..e57f8f00 100644 --- a/packages/react-native-video/nitrogen/generated/ios/swift/BandwidthData.swift +++ b/packages/react-native-video/nitrogen/generated/ios/swift/BandwidthData.swift @@ -48,7 +48,14 @@ public extension BandwidthData { var width: Double? { @inline(__always) get { - return self.__width.value + return { () -> Double? in + if bridge.has_value_std__optional_double_(self.__width) { + let __unwrapped = bridge.get_std__optional_double_(self.__width) + return __unwrapped + } else { + return nil + } + }() } @inline(__always) set { @@ -65,7 +72,14 @@ public extension BandwidthData { var height: Double? { @inline(__always) get { - return self.__height.value + return { () -> Double? in + if bridge.has_value_std__optional_double_(self.__height) { + let __unwrapped = bridge.get_std__optional_double_(self.__height) + return __unwrapped + } else { + return nil + } + }() } @inline(__always) set { diff --git a/packages/react-native-video/nitrogen/generated/ios/swift/BufferConfig.swift b/packages/react-native-video/nitrogen/generated/ios/swift/BufferConfig.swift index 1c4dbaf6..d0bb6459 100644 --- a/packages/react-native-video/nitrogen/generated/ios/swift/BufferConfig.swift +++ b/packages/react-native-video/nitrogen/generated/ios/swift/BufferConfig.swift @@ -108,7 +108,14 @@ public extension BufferConfig { var minBufferMs: Double? { @inline(__always) get { - return self.__minBufferMs.value + return { () -> Double? in + if bridge.has_value_std__optional_double_(self.__minBufferMs) { + let __unwrapped = bridge.get_std__optional_double_(self.__minBufferMs) + return __unwrapped + } else { + return nil + } + }() } @inline(__always) set { @@ -125,7 +132,14 @@ public extension BufferConfig { var maxBufferMs: Double? { @inline(__always) get { - return self.__maxBufferMs.value + return { () -> Double? in + if bridge.has_value_std__optional_double_(self.__maxBufferMs) { + let __unwrapped = bridge.get_std__optional_double_(self.__maxBufferMs) + return __unwrapped + } else { + return nil + } + }() } @inline(__always) set { @@ -142,7 +156,14 @@ public extension BufferConfig { var bufferForPlaybackMs: Double? { @inline(__always) get { - return self.__bufferForPlaybackMs.value + return { () -> Double? in + if bridge.has_value_std__optional_double_(self.__bufferForPlaybackMs) { + let __unwrapped = bridge.get_std__optional_double_(self.__bufferForPlaybackMs) + return __unwrapped + } else { + return nil + } + }() } @inline(__always) set { @@ -159,7 +180,14 @@ public extension BufferConfig { var bufferForPlaybackAfterRebufferMs: Double? { @inline(__always) get { - return self.__bufferForPlaybackAfterRebufferMs.value + return { () -> Double? in + if bridge.has_value_std__optional_double_(self.__bufferForPlaybackAfterRebufferMs) { + let __unwrapped = bridge.get_std__optional_double_(self.__bufferForPlaybackAfterRebufferMs) + return __unwrapped + } else { + return nil + } + }() } @inline(__always) set { @@ -176,7 +204,14 @@ public extension BufferConfig { var backBufferDurationMs: Double? { @inline(__always) get { - return self.__backBufferDurationMs.value + return { () -> Double? in + if bridge.has_value_std__optional_double_(self.__backBufferDurationMs) { + let __unwrapped = bridge.get_std__optional_double_(self.__backBufferDurationMs) + return __unwrapped + } else { + return nil + } + }() } @inline(__always) set { @@ -193,7 +228,14 @@ public extension BufferConfig { var preferredForwardBufferDurationMs: Double? { @inline(__always) get { - return self.__preferredForwardBufferDurationMs.value + return { () -> Double? in + if bridge.has_value_std__optional_double_(self.__preferredForwardBufferDurationMs) { + let __unwrapped = bridge.get_std__optional_double_(self.__preferredForwardBufferDurationMs) + return __unwrapped + } else { + return nil + } + }() } @inline(__always) set { @@ -210,7 +252,14 @@ public extension BufferConfig { var preferredPeakBitRate: Double? { @inline(__always) get { - return self.__preferredPeakBitRate.value + return { () -> Double? in + if bridge.has_value_std__optional_double_(self.__preferredPeakBitRate) { + let __unwrapped = bridge.get_std__optional_double_(self.__preferredPeakBitRate) + return __unwrapped + } else { + return nil + } + }() } @inline(__always) set { @@ -244,7 +293,14 @@ public extension BufferConfig { var preferredPeakBitRateForExpensiveNetworks: Double? { @inline(__always) get { - return self.__preferredPeakBitRateForExpensiveNetworks.value + return { () -> Double? in + if bridge.has_value_std__optional_double_(self.__preferredPeakBitRateForExpensiveNetworks) { + let __unwrapped = bridge.get_std__optional_double_(self.__preferredPeakBitRateForExpensiveNetworks) + return __unwrapped + } else { + return nil + } + }() } @inline(__always) set { diff --git a/packages/react-native-video/nitrogen/generated/ios/swift/LivePlaybackParams.swift b/packages/react-native-video/nitrogen/generated/ios/swift/LivePlaybackParams.swift index 3390dd71..64c31c5c 100644 --- a/packages/react-native-video/nitrogen/generated/ios/swift/LivePlaybackParams.swift +++ b/packages/react-native-video/nitrogen/generated/ios/swift/LivePlaybackParams.swift @@ -55,7 +55,14 @@ public extension LivePlaybackParams { var minPlaybackSpeed: Double? { @inline(__always) get { - return self.__minPlaybackSpeed.value + return { () -> Double? in + if bridge.has_value_std__optional_double_(self.__minPlaybackSpeed) { + let __unwrapped = bridge.get_std__optional_double_(self.__minPlaybackSpeed) + return __unwrapped + } else { + return nil + } + }() } @inline(__always) set { @@ -72,7 +79,14 @@ public extension LivePlaybackParams { var maxPlaybackSpeed: Double? { @inline(__always) get { - return self.__maxPlaybackSpeed.value + return { () -> Double? in + if bridge.has_value_std__optional_double_(self.__maxPlaybackSpeed) { + let __unwrapped = bridge.get_std__optional_double_(self.__maxPlaybackSpeed) + return __unwrapped + } else { + return nil + } + }() } @inline(__always) set { @@ -89,7 +103,14 @@ public extension LivePlaybackParams { var maxOffsetMs: Double? { @inline(__always) get { - return self.__maxOffsetMs.value + return { () -> Double? in + if bridge.has_value_std__optional_double_(self.__maxOffsetMs) { + let __unwrapped = bridge.get_std__optional_double_(self.__maxOffsetMs) + return __unwrapped + } else { + return nil + } + }() } @inline(__always) set { @@ -106,7 +127,14 @@ public extension LivePlaybackParams { var minOffsetMs: Double? { @inline(__always) get { - return self.__minOffsetMs.value + return { () -> Double? in + if bridge.has_value_std__optional_double_(self.__minOffsetMs) { + let __unwrapped = bridge.get_std__optional_double_(self.__minOffsetMs) + return __unwrapped + } else { + return nil + } + }() } @inline(__always) set { @@ -123,7 +151,14 @@ public extension LivePlaybackParams { var targetOffsetMs: Double? { @inline(__always) get { - return self.__targetOffsetMs.value + return { () -> Double? in + if bridge.has_value_std__optional_double_(self.__targetOffsetMs) { + let __unwrapped = bridge.get_std__optional_double_(self.__targetOffsetMs) + return __unwrapped + } else { + return nil + } + }() } @inline(__always) set {