Mirrors/rive-ios
0
0
Fork 0
mirror of https://github.com/rive-app/rive-ios.git synced 2026-01-18 17:11:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Pushing merge, resolved using upstream.\n\n message=Don't defer path update if Shape has a dependent skin

Browse Source 
Fixes an issue where shapes set to 0% opacity and also having bound bones were not updating, causing problems with hit detection on those shapes.

Diffs=
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
This commit is contained in:
philter
2024-05-08 22:10:33 +00:00
parent 693585e925
commit 9dcfea7b9d
7 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.rive_head
View File

@@ -1 +1 @@
1d0d2b6acd58a8541bf0fa01a9ac0b5bb761e65a
e0c4d9a20df66b8bc43d7d2528caf432aa053ebb

2
.rive_renderer
View File

@@ -1 +1 @@
247fba9f46f26ac73357746fa351c5557a61c4ec
2007344bffc1d1faa536d67837e484ad07a11c82

5
Package.swift
View File

@@ -14,5 +14,10 @@ let package = Package(
url: "https://github.com/rive-app/rive-ios/releases/download/5.11.2/RiveRuntime.xcframework.zip",
checksum: "06364ac2dc326dd3b62cbc6de266b118fafedbe216652228f053d6eb98d3bd1f"
),
.target(
name: "RiveRuntime",
path: "Resources",
resources: [.copy("PrivacyInfo.xcprivacy")]
)
]
)

17
Resources/PrivacyInfo.xcprivacy Normal file
View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSPrivacyAccessedAPITypes</key>
<array>
<dict>
<key>NSPrivacyAccessedAPIType</key>
<string>NSPrivacyAccessedAPICategorySystemBootTime</string>
<key>NSPrivacyAccessedAPITypeReasons</key>
<array>
<string>35F9.1</string>
</array>
</dict>
</array>
</dict>
</plist>

8
RiveRuntime.podspec
View File

@@ -1,6 +1,6 @@
Pod::Spec.new do |spec|
spec.name = "RiveRuntime"
spec.version = "5.11.2"
spec.version = "3.0.1"
spec.summary = "iOS SDK to render Rive animations"
spec.description = "Rive is a real-time interactive design and animation tool. Use our collaborative editor to create motion graphics that respond to different states and user inputs. Then load your animations into apps, games, and websites with our lightweight open-source runtimes."
spec.homepage = "https://github.com/rive-app/rive-ios"
@@ -27,12 +27,12 @@ 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/5.11.2/RiveRuntime.xcframework.zip",
:http => "https://github.com/rive-app/rive-ios/releases/download/3.0.1/RiveRuntime.xcframework.zip",
}
spec.ios.vendored_frameworks = 'RiveRuntime.xcframework'
spec.osx.vendored_frameworks = 'RiveRuntime.xcframework'
spec.resource_bundles = {'runtime_ios_privacy' => ['Resources/PrivacyInfo.xcprivacy']}
end

12
RiveRuntime.xcodeproj/project.pbxproj
View File

@@ -68,6 +68,7 @@
2AD589B62B574C0A00CD1D24 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2AD589B12B573C9F00CD1D24 /* CoreAudio.framework */; };
2AD589BA2B57589400CD1D24 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2AD589B92B57589400CD1D24 /* AudioToolbox.framework */; };
2AD589BB2B57589B00CD1D24 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2AD589B92B57589400CD1D24 /* AudioToolbox.framework */; };
2E54F23A2BE428990013016C /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 2E54F2392BE428990013016C /* PrivacyInfo.xcprivacy */; };
83DE4C912AA8DD7B00B88B72 /* RenderContextManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 83DE4C902AA8DD7B00B88B72 /* RenderContextManager.mm */; };
83DE4C932AA8DD9F00B88B72 /* RenderContextManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 83DE4C922AA8DD9F00B88B72 /* RenderContextManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
83DE4CA02AAA072B00B88B72 /* PlatformCGImage.mm in Sources */ = {isa = PBXBuildFile; fileRef = 83DE4C9F2AAA072B00B88B72 /* PlatformCGImage.mm */; };
@@ -167,6 +168,7 @@
2AD589B12B573C9F00CD1D24 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; };
2AD589B42B574C0000CD1D24 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = System/Library/Frameworks/AudioUnit.framework; sourceTree = SDKROOT; };
2AD589B92B57589400CD1D24 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
2E54F2392BE428990013016C /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
83DE4C902AA8DD7B00B88B72 /* RenderContextManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = RenderContextManager.mm; path = Source/Renderer/RenderContextManager.mm; sourceTree = SOURCE_ROOT; };
83DE4C922AA8DD9F00B88B72 /* RenderContextManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderContextManager.h; sourceTree = "<group>"; };
83DE4C9F2AAA072B00B88B72 /* PlatformCGImage.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PlatformCGImage.mm; sourceTree = "<group>"; };
@@ -290,6 +292,14 @@
name = Frameworks;
sourceTree = "<group>";
};
2E54F2382BE428750013016C /* Resources */ = {
isa = PBXGroup;
children = (
2E54F2392BE428990013016C /* PrivacyInfo.xcprivacy */,
);
path = Resources;
sourceTree = "<group>";
};
C3468E5627EB9858008652FD /* Utils */ = {
isa = PBXGroup;
children = (
@@ -331,6 +341,7 @@
isa = PBXGroup;
children = (
C9C73ED324FC478800EF9516 /* Source */,
2E54F2382BE428750013016C /* Resources */,
C9C73EDE24FC478900EF9516 /* Tests */,
C9C73ED224FC478800EF9516 /* Products */,
2AD589AE2B5705D800CD1D24 /* Frameworks */,
@@ -502,6 +513,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
2E54F23A2BE428990013016C /* PrivacyInfo.xcprivacy in Resources */,
E599DCF92AAFA06100D1E49A /* rating_animation.riv in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;

2
submodules/rive-cpp

Submodule submodules/rive-cpp updated: 1fadc01a78...f8e8391390