From c5f619fea6c83b5959c29a6818e4908a7d922eb6 Mon Sep 17 00:00:00 2001 From: mjtalbot Date: Tue, 14 May 2024 10:58:21 +0000 Subject: [PATCH] =?UTF-8?q?add=20macos=20deployment=20target=20to=20match?= =?UTF-8?q?=20cocapods=20target,=20and=20point=20cocoa=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …pods resource file at location of privacy file hopefully this fixes pushing to cocoapods (going to push this through to test that) pointing at the file like this feels a little rough, we might be missing a trick here. the path is determined by what is available in the "source".zip we reference. also added a deployment target for osx, so we don't just get landed with "whatever" the host server choses. I went with 13.1 because that is the only reference to a version for this i found anywhere. Diffs= c84d57141 add macos deployment target to match cocapods target, and point cocoa… (#7264) Co-authored-by: Maxwell Talbot --- .github/workflows/RiveRuntime.podspec.template | 2 +- .rive_head | 2 +- RiveRuntime.xcodeproj/project.pbxproj | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/RiveRuntime.podspec.template b/.github/workflows/RiveRuntime.podspec.template index 0e303bad..242168bc 100644 --- a/.github/workflows/RiveRuntime.podspec.template +++ b/.github/workflows/RiveRuntime.podspec.template @@ -35,5 +35,5 @@ Pod::Spec.new do |spec| } spec.ios.vendored_frameworks = 'RiveRuntime.xcframework' spec.osx.vendored_frameworks = 'RiveRuntime.xcframework' - spec.resource_bundles = {'runtime_ios_privacy' => ['Resources/PrivacyInfo.xcprivacy']} + spec.resource_bundles = {'runtime_ios_privacy' => ['RiveRuntime.xcframework/ios-arm64/RiveRuntime.framework/PrivacyInfo.xcprivacy']} end \ No newline at end of file diff --git a/.rive_head b/.rive_head index 52cce909..f4ea6523 100644 --- a/.rive_head +++ b/.rive_head @@ -1 +1 @@ -de0eb61fec94f4c8cd7c99330aec9ab498052160 +c84d57141c25261c525f537a854afe8c1ac1d6b8 diff --git a/RiveRuntime.xcodeproj/project.pbxproj b/RiveRuntime.xcodeproj/project.pbxproj index 12472bd4..c51d6b6f 100644 --- a/RiveRuntime.xcodeproj/project.pbxproj +++ b/RiveRuntime.xcodeproj/project.pbxproj @@ -784,6 +784,7 @@ "${PROJECT_DIR}/dependencies/release", "${PROJECT_DIR}/dependencies", ); + MACOSX_DEPLOYMENT_TARGET = 13.1; MARKETING_VERSION = 0.6.5; OTHER_CFLAGS = ( "-fembed-bitcode", @@ -870,6 +871,7 @@ "${PROJECT_DIR}/dependencies/release", "${PROJECT_DIR}/dependencies", ); + MACOSX_DEPLOYMENT_TARGET = 13.1; MARKETING_VERSION = 0.6.5; MTL_ENABLE_DEBUG_INFO = NO; OTHER_CFLAGS = (