lottie-ios 4.4.0 → 4.4.1

package/.github/workflows/main.yml

@@ -27,7 +27,7 @@ jobs:
 
   build-package:
     name: "Build Package"
-    runs-on: macos-13
+    runs-on: macos-14
     strategy:
       fail-fast: false
       matrix:
@@ -44,7 +44,7 @@ jobs:
 
   build-example:
     name: "Build Example App"
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
       - uses: actions/checkout@v2
       - uses: ./.github/actions/setup
@@ -55,7 +55,7 @@ jobs:
 
   test-package:
     name: "Test Package"
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
       - uses: actions/checkout@v2
       - uses: ./.github/actions/setup
@@ -75,7 +75,7 @@ jobs:
 
   emerge-upload:
     name: "Emerge Upload"
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
       - uses: actions/checkout@v2
       - uses: ./.github/actions/setup
@@ -121,7 +121,7 @@ jobs:
 
   build-xcframework-with-visionOS-support:
     name: "Build XCFramework"
-    runs-on: macos-13
+    runs-on: macos-14
     strategy:
       matrix:
         xcode:
@@ -146,7 +146,7 @@ jobs:
 
   cocoapod:
     name: "Lint CocoaPods podspec"
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
       - uses: actions/checkout@v2
       - uses: ./.github/actions/setup
@@ -157,7 +157,7 @@ jobs:
 
   spm-xcode-15:
     name: "Test Swift Package Manager"
-    runs-on: macos-13
+    runs-on: macos-14
     strategy:
       matrix:
         xcode:
@@ -173,7 +173,7 @@ jobs:
 
   carthage:
     name: "Test Carthage support"
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
       - uses: actions/checkout@v2
       - uses: ./.github/actions/setup
@@ -186,7 +186,7 @@ jobs:
 
   swiftlint:
     name: "Lint Swift"
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
       - uses: actions/checkout@v2
       - uses: ./.github/actions/setup
@@ -195,7 +195,7 @@ jobs:
 
   embedded-libraries:
     name: "Lint Embedded Libraries"
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
       - uses: actions/checkout@v2
       - uses: ./.github/actions/setup

package/Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org' do
-  gem 'cocoapods', '~> 1.11.0'
+  gem 'cocoapods', '~> 1.15.0'
   gem "rake", "~> 13.0.0"
   gem 'git', '~> 1.18'
 end

package/Gemfile.lock

@@ -4,9 +4,9 @@ GEM
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.5)
+    CFPropertyList (3.0.6)
       rexml
-    activesupport (6.1.4.1)
+    activesupport (6.1.7.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -18,16 +18,16 @@ GEM
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     atomos (0.1.3)
-    claide (1.0.3)
-    cocoapods (1.11.2)
+    claide (1.1.0)
+    cocoapods (1.15.0)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.11.2)
+      cocoapods-core (= 1.15.0)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
-      cocoapods-downloader (>= 1.4.0, < 2.0)
+      cocoapods-downloader (>= 2.1, < 3.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.4.0, < 2.0)
+      cocoapods-trunk (>= 1.6.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
@@ -35,10 +35,10 @@ GEM
       gh_inspector (~> 1.0)
       molinillo (~> 0.8.0)
       nap (~> 1.0)
-      ruby-macho (>= 1.0, < 3.0)
-      xcodeproj (>= 1.21.0, < 2.0)
-    cocoapods-core (1.11.2)
-      activesupport (>= 5.0, < 7)
+      ruby-macho (>= 2.3.0, < 3.0)
+      xcodeproj (>= 1.23.0, < 2.0)
+    cocoapods-core (1.15.0)
+      activesupport (>= 5.0, < 8)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
       concurrent-ruby (~> 1.1)
@@ -48,7 +48,7 @@ GEM
       public_suffix (~> 4.0)
       typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.5)
-    cocoapods-downloader (1.6.3)
+    cocoapods-downloader (2.1)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.1)
@@ -57,11 +57,11 @@ GEM
       netrc (~> 0.11)
     cocoapods-try (1.2.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.2.3)
     escape (0.0.4)
-    ethon (0.15.0)
+    ethon (0.16.0)
       ffi (>= 1.15.0)
-    ffi (1.15.4)
+    ffi (1.16.3)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
@@ -69,10 +69,10 @@ GEM
       addressable (~> 2.8)
       rchardet (~> 1.8)
     httpclient (2.8.3)
-    i18n (1.8.11)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    json (2.6.1)
-    minitest (5.14.4)
+    json (2.7.1)
+    minitest (5.21.2)
     molinillo (0.8.0)
     nanaimo (0.3.0)
     nap (1.1.0)
@@ -80,28 +80,28 @@ GEM
     public_suffix (4.0.6)
     rake (13.0.6)
     rchardet (1.8.0)
-    rexml (3.2.5)
+    rexml (3.2.6)
     ruby-macho (2.5.1)
-    typhoeus (1.4.0)
+    typhoeus (1.4.1)
       ethon (>= 0.9.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    xcodeproj (1.21.0)
+    xcodeproj (1.24.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
       nanaimo (~> 0.3.0)
       rexml (~> 3.2.4)
-    zeitwerk (2.5.1)
+    zeitwerk (2.6.12)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (~> 1.11.0)!
+  cocoapods (~> 1.15.0)!
   git (~> 1.18)!
   rake (~> 13.0.0)!
 
 BUNDLED WITH
-   2.2.16
+   2.3.19

package/Lottie.xcworkspace/xcuserdata/calstephens.xcuserdatad/IDEFindNavigatorScopes.plist

@@ -0,0 +1,5 @@
+<?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">
+<array/>
+</plist>

package/Lottie.xcworkspace/xcuserdata/calstephens.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -3,38 +3,4 @@
    uuid = "01C80884-20C6-43CD-959A-834F11C6CFBC"
    type = "0"
    version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "8091EB50-102C-46B2-9DCE-9CC40A3FE4E9"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Sources/Private/MainThread/NodeRenderSystem/Nodes/RenderNodes/StrokeNode.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "112"
-            endingLineNumber = "112"
-            landmarkName = "rebuildOutputs(frame:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "CC3C8E8A-14BE-4C8D-8423-0224C306B322"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Sources/Private/CoreAnimation/Layers/ShapeItemLayer.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "245"
-            endingLineNumber = "245"
-            landmarkName = "ShapeItemLayer"
-            landmarkType = "3">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
 </Bucket>

package/README.md

@@ -41,7 +41,7 @@ To install Lottie using [Swift Package Manager](https://github.com/apple/swift-p
 or you can add the following dependency to your `Package.swift`:
 
 ```swift
-.package(url: "https://github.com/airbnb/lottie-spm.git", from: "4.4.0")
+.package(url: "https://github.com/airbnb/lottie-spm.git", from: "4.4.1")
 ```
 
 When using Swift Package Manager we recommend using the [lottie-spm](https://github.com/airbnb/lottie-spm) repo instead of the main lottie-ios repo.  The main git repository for [lottie-ios](https://github.com/airbnb/lottie-ios) is somewhat large (300+ MB), and Swift Package Manager always downloads the full repository with all git history. The [lottie-spm](https://github.com/airbnb/lottie-spm) repo is much smaller (less than 500kb), so can be downloaded much more quickly. 

package/Rakefile

@@ -262,10 +262,5 @@ def ifVisionOSEnabled
 end
 
 def installVisionOSIfNecessary
-  # visionOS is unsupported by default on Intel, but we can override this
-  # https://github.com/actions/runner-images/issues/8144#issuecomment-1902072070
-  sh 'defaults write com.apple.dt.Xcode AllowUnsupportedVisionOSHost -bool YES'
-  sh 'defaults write com.apple.CoreSimulator AllowUnsupportedVisionOSHost -bool YES'
-
   xcodebuild("-downloadPlatform visionOS")
 end

package/Sources/Private/Model/DotLottie/DotLottieImageProvider.swift

@@ -55,14 +55,14 @@ class DotLottieImageProvider: AnimationImageProvider {
 
   private func loadImages() {
     for url in filepath.urls {
-      #if os(iOS) || os(tvOS) || os(watchOS) || targetEnvironment(macCatalyst)
+      #if canImport(UIKit)
       if
         let data = try? Data(contentsOf: url),
         let image = UIImage(data: data)?.cgImage
       {
         images[url.lastPathComponent] = image
       }
-      #elseif os(macOS)
+      #elseif canImport(AppKit)
       if
         let data = try? Data(contentsOf: url),
         let image = NSImage(data: data)?.lottie_CGImage

package/Sources/Private/Model/Extensions/Bundle.swift

@@ -1,5 +1,5 @@
 import Foundation
-#if os(iOS) || os(tvOS) || os(watchOS) || targetEnvironment(macCatalyst)
+#if canImport(UIKit)
 import UIKit
 #endif
 

package/Sources/Private/Utility/Extensions/MathKit.swift

@@ -369,7 +369,7 @@ extension CGPoint {
     while foundPoint == false {
       refineIterations = refineIterations + 1
       /// First see if the next point is still less than the projected length.
-      let nextPoint = points[closestPoint + 1]
+      let nextPoint = points[min(closestPoint + 1, points.indices.last!)]
       if nextPoint.distance < accurateDistance {
         point = nextPoint
         closestPoint = closestPoint + 1

package/Sources/Public/Animation/LottieAnimationLayer.swift

@@ -1041,14 +1041,6 @@ public class LottieAnimationLayer: CALayer {
     }
   }
 
-  func updateRasterizationState() {
-    if isAnimationPlaying {
-      animationLayer?.shouldRasterize = false
-    } else {
-      animationLayer?.shouldRasterize = shouldRasterizeWhenIdle
-    }
-  }
-
   /// Updates the animation frame. Does not affect any current animations
   func updateAnimationFrame(_ newFrame: CGFloat) {
     // In performance tests, we have to wrap the animation layer setup
@@ -1098,6 +1090,14 @@ public class LottieAnimationLayer: CALayer {
     addNewAnimationForContext(newContext)
   }
 
+  func updateRasterizationState() {
+    if isAnimationPlaying {
+      animationLayer?.shouldRasterize = false
+    } else {
+      animationLayer?.shouldRasterize = shouldRasterizeWhenIdle
+    }
+  }
+
   func loadAnimation(_ animationSource: LottieAnimationSource?) {
     switch animationSource {
     case .lottieAnimation(let animation):

package/Sources/Public/Animation/LottieAnimationView.swift

@@ -855,7 +855,6 @@ open class LottieAnimationView: LottieAnimationViewBase {
     var shouldForceUpdates = false
 
     if let viewportFrame {
-      setNeedsLayout()
       shouldForceUpdates = contentMode == .redraw
 
       let compAspect = viewportFrame.size.width / viewportFrame.size.height
@@ -995,11 +994,7 @@ open class LottieAnimationView: LottieAnimationViewBase {
   }
 
   func updateRasterizationState() {
-    if lottieAnimationLayer.isAnimationPlaying {
-      lottieAnimationLayer.animationLayer?.shouldRasterize = false
-    } else {
-      lottieAnimationLayer.animationLayer?.shouldRasterize = lottieAnimationLayer.shouldRasterizeWhenIdle
-    }
+    lottieAnimationLayer.updateRasterizationState()
   }
 
   /// Updates the animation frame. Does not affect any current animations

package/Sources/Public/iOS/Compatibility/CompatibleAnimationKeypath.swift

@@ -6,7 +6,7 @@
 //
 
 import Foundation
-#if os(iOS) || os(tvOS) || os(watchOS) || targetEnvironment(macCatalyst)
+#if canImport(UIKit)
 
 /// An Objective-C compatible wrapper around Lottie's AnimationKeypath
 @objc

package/Sources/Public/iOS/Compatibility/CompatibleAnimationView.swift

@@ -6,7 +6,7 @@
 //
 
 import Foundation
-#if os(iOS) || os(tvOS) || os(watchOS) || targetEnvironment(macCatalyst)
+#if canImport(UIKit)
 import UIKit
 
 /// An Objective-C compatible wrapper around Lottie's Animation class.

package/lottie-ios.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'lottie-ios'
-  s.version          = '4.4.0'
+  s.version          = '4.4.1'
   s.summary          = 'A library to render native animations from bodymovin json'
 
   s.description = <<-DESC
@@ -27,10 +27,9 @@ Lottie enables designers to create and ship beautiful animations without an engi
   s.osx.deployment_target = '10.12'
   s.tvos.deployment_target = '11.0'
 
-  s.source_files = 'Sources/**/*'
-  s.exclude_files = 'Sources/**/*.md'
+  s.source_files = 'Sources/**/*.swift'
   s.resource_bundles = {
-    'Lottie_Privacy' => ['Sources/PrivacyInfo.xcprivacy'],
+    'LottiePrivacyInfo' => ['Sources/PrivacyInfo.xcprivacy'],
   }
   s.ios.exclude_files = 'Sources/Public/MacOS/**/*'
   s.tvos.exclude_files = 'Sources/Public/MacOS/**/*'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lottie-ios",
-  "version": "4.4.0",
+  "version": "4.4.1",
   "description": "Lottie is a mobile library for Android and iOS that parses Adobe After Effects animations exported as json with bodymovin and renders the vector animations natively on mobile and through React Native!",
   "main": "index.js",
   "scripts": {