Skip to content

Commit

Permalink
add macos deployment target to match cocapods target, and point cocoa…
Browse files Browse the repository at this point in the history
…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 <talbot.maxwell@gmail.com>
  • Loading branch information
mjtalbot and mjtalbot committed May 14, 2024
1 parent 9b62207 commit c5f619f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/RiveRuntime.podspec.template
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .rive_head
Original file line number Diff line number Diff line change
@@ -1 +1 @@
de0eb61fec94f4c8cd7c99330aec9ab498052160
c84d57141c25261c525f537a854afe8c1ac1d6b8
2 changes: 2 additions & 0 deletions RiveRuntime.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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 = (
Expand Down

0 comments on commit c5f619f

Please sign in to comment.