2 Commits

Author	SHA1	Message	Date
mjtalbot	7ba8990d98	Add NSPrivacyCollectionDataTypes to privacy manifest ... It appears `NSPrivacyCollectionDataTypes` is a required field in the privacy manifest. Since we don't collect any data in our runtimes, I have left the data types array empty. Reference: https://developer.apple.com/documentation/bundleresources/privacy_manifest_files/describing_data_use_in_privacy_manifests?language=objc Diffs= de0eb61fe Add NSPrivacyCollectionDataTypes to privacy manifest (#7242) Co-authored-by: Maxwell Talbot <talbot.maxwell@gmail.com> Co-authored-by: Philip Chung <philterdesign@gmail.com>	2024-05-10 08:37:11 +00:00
csmartdalton	ff6524aaae	Pushing merge, resolved using upstream.\n\n message=Add required descriptor to avoid crash when creating a new RTV ... CreateRenderTargetView doesn't allow a NULL descriptor when the target texture is typeless. This change adds a descriptor (with the assumption that the texture in question is a 2D texture in R8G8B8A8_UNORM format). Authored-by: Elliot Colp <elliot.colp@gmail.com> Diffs= 8700c7365 remove harfbuzz flag (#7233) e0c4d9a20 Don't defer path update if Shape has a dependent skin (#7231) 806ae1fae Fix an assert in contour_measure.cpp (#7232) 7d03c3faf Add strokes, gradients, and blend modes to path_fuzz (#7230) 4342a3f04 Wasm fallback and min safari version (#7214) 4c23759b6 Add privacy manifest for Apple platforms (#7194) Co-authored-by: Philip Chung <philterdesign@gmail.com> diff=\n\ndiff --cc RiveRuntime.podspec index 4f684ca,d485ee4..0000000 --- a/RiveRuntime.podspec +++ b/RiveRuntime.podspec @@@ -27,12 -27,12 +27,16 @@@ Pod::Spec.new do |spec LICENSE } spec.authors = { "Luigi Rosso" => "luigi@rive.app" } - spec.platform = :ios, '14.0' spec.ios.deployment_target = '14.0' + spec.osx.deployment_target = '13.1' spec.swift_version = '5.0' spec.source = { - :http => "https://github.com/rive-app/rive-ios/releases/download/3.0.1/RiveRuntime.xcframework.zip", + :http => "https://github.com/rive-app/rive-ios/releases/download/5.11.2/RiveRuntime.xcframework.zip", } spec.ios.vendored_frameworks = 'RiveRuntime.xcframework' ++<<<<<<< ours + spec.osx.vendored_frameworks = 'RiveRuntime.xcframework' ++======= + spec.resource_bundles = {'runtime_ios_privacy' => ['Resources/PrivacyInfo.xcprivacy']} ++>>>>>>> theirs end	2024-05-09 11:20:52 -06:00