lottie-ios 4.5.0 → 4.6.0

package/.claude/settings.local.json

@@ -0,0 +1,10 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(bundle exec rake:*)",
+      "Bash(bundle install:*)",
+      "Bash(bundle config:*)",
+      "Bash(cat:*)"
+    ]
+  }
+}

package/.github/workflows/main.yml

@@ -7,34 +7,17 @@ on:
     branches: [ master ]
 
 jobs:
-  build-package-no-visionOS:
-    name: "Build Package"
-    runs-on: macos-14
-    strategy:
-      fail-fast: false
-      matrix:
-        xcode:
-        - '15.0.1' # Swift 5.9, but no visionOS support
-    steps:
-      - uses: actions/checkout@v2
-      - uses: ./.github/actions/setup
-        with:
-          xcode: ${{ matrix.xcode }}
-      - name: Build Package
-        # Only Xcode 15.2 and later support visionOS, so exclude it on earlier versions.
-        run: SKIP_VISION_OS=true bundle exec rake build:package:all
-
   build-package:
     name: "Build Package"
-    runs-on: macos-14
+    runs-on: macos-15
     strategy:
       fail-fast: false
       matrix:
         xcode:
-        - '15.2' # Swift 5.9
-        - '15.3' # Swift 5.10
+        - '16.4' # Swift 6.1
+        - '26.1.1' # Swift 6.2
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/setup
         with:
           xcode: ${{ matrix.xcode }}
@@ -44,23 +27,23 @@ jobs:
 
   build-example:
     name: "Build Example App"
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/setup
         with:
-          xcode: '15.3' # Swift 5.10
+          xcode: '26.1.1' # Swift 6.2
       - name: Build Example
         run: bundle exec rake build:example:all
 
   test-package:
     name: "Test Package"
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/setup
         with:
-          xcode: '15.3' # Swift 5.10
+          xcode: '16.4' # Swift 6.1
       - name: Test Package
         run: bundle exec rake test:package
       - name: Process test artifacts
@@ -68,16 +51,16 @@ jobs:
         run: bundle exec rake test:process
       - name: Upload artifacts
         if: always()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: TestArtifacts
           path: Tests/Artifacts
 
   emerge-upload:
     name: "Emerge Upload"
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/setup
       - name: Build Package
         run: bundle exec rake emerge:upload
@@ -87,21 +70,14 @@ jobs:
 
   build-xcframework-minimum-supported-version:
     name: "Build XCFramework"
-    runs-on: macos-14
+    runs-on: macos-15
     strategy:
       matrix:
         xcode:
-          # XCFrameworks are forwards-compatible but not backwards-compatible.
-          # The Xcode version we use for this job is that oldest Xcode version that
-          # will be able to use these XCFrameworks and the lottie-spm package.
-          # This should be the minimum Xcode version permitted by the App Store.
-          # As of April 2024, this is Xcode 15.0: https://developer.apple.com/news/?id=fxu2qp7b
-          #  - However, testing in https://github.com/airbnb/lottie-spm/pull/12 shows that
-          #    Xcode 15.0 can use an XCFramework built by Xcode 15.2.
-          - '15.2' # Swift 5.9, first Xcode version with visionOS support.
+          - '16.4' # Swift 6.1
     steps:
-      - uses: actions/checkout@v2
-      - uses: apple-actions/import-codesign-certs@v2
+      - uses: actions/checkout@v4
+      - uses: apple-actions/import-codesign-certs@v3
         continue-on-error: true
         with:
           p12-file-base64: ${{ secrets.SIGNING_CERTIFICATE_BASE_64 }}
@@ -109,23 +85,25 @@ jobs:
       - uses: ./.github/actions/setup
         with:
           xcode: ${{ matrix.xcode }}
-      - name: Build XCFramework
-        run: bundle exec rake build:xcframework[Lottie-Xcode-${{ matrix.xcode }}]
-      - name: Upload XCFramework
-        uses: actions/upload-artifact@v2
+      - name: Build Dynamic XCFramework
+        run: bundle exec rake build:xcframework\['dynamic'\]
+      - name: Build Static XCFramework
+        run: bundle exec rake build:xcframework\['static'\]
+      - name: Upload XCFrameworks
+        uses: actions/upload-artifact@v4
         with:
           name: BuildProducts
-          path: .build/archives
+          path: .build/artifacts
 
   cocoapod:
     name: "Lint CocoaPods podspec"
-    runs-on: macos-14
+    runs-on: macos-15
     strategy:
       matrix:
         xcode:
-          - '15.3' # Swift 5.10
+          - '16.4' # Swift 6.1
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/setup
         with:
           install-mint: false
@@ -135,13 +113,13 @@ jobs:
 
   spm-xcode-15:
     name: "Test Swift Package Manager"
-    runs-on: macos-14
+    runs-on: macos-15
     strategy:
       matrix:
         xcode:
-        - '15.3' # Swift 5.10
+        - '16.4' # Swift 6.1
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/setup
         with:
           install-mint: true
@@ -151,31 +129,31 @@ jobs:
 
   carthage:
     name: "Test Carthage support"
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/setup
         with:
           install-mint: true
           install-carthage: true
-          xcode: '15.3' # Swift 5.10
+          xcode: '26.1.1' # Swift 6.2
       - name: Test Carthage support
         run: bundle exec rake test:carthage
 
   swiftlint:
     name: "Lint Swift"
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/setup
       - name: Lint Swift
         run: bundle exec rake lint:swift
 
   embedded-libraries:
     name: "Lint Embedded Libraries"
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/setup
       - name: Lint Embedded Libraries
         run: bundle exec rake lint:EmbeddedLibraries

package/Lottie.xcodeproj/project.pbxproj

@@ -562,6 +562,8 @@
 		19465F52282F998B00BB2C97 /* CachedImageProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19465F51282F998B00BB2C97 /* CachedImageProvider.swift */; };
 		19465F53282F998B00BB2C97 /* CachedImageProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19465F51282F998B00BB2C97 /* CachedImageProvider.swift */; };
 		19465F54282F998B00BB2C97 /* CachedImageProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19465F51282F998B00BB2C97 /* CachedImageProvider.swift */; };
+		20439AE0516A49FDB3BA8D42 /* LottieURLSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = 135AB552F4524F1D995D3A15 /* LottieURLSession.swift */; };
+		263C0AE32E5CA0D30063205E /* AnimationConfigurationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 263C0AE22E5CA0D30063205E /* AnimationConfigurationTests.swift */; };
 		2E044E272820536800FA773B /* AutomaticEngineTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2E044E262820536800FA773B /* AutomaticEngineTests.swift */; };
 		2E09FA0627B6CEB600BA84E5 /* HardcodedFontProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2E09FA0527B6CEB600BA84E5 /* HardcodedFontProvider.swift */; };
 		2E450DAC283415D500E56D19 /* OpacityAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2E450DAB283415D500E56D19 /* OpacityAnimation.swift */; };
@@ -1076,6 +1078,7 @@
 		2EAF5B0527A0798700E00531 /* AnimationFontProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EAF59F227A0798700E00531 /* AnimationFontProvider.swift */; };
 		2EAF5B0627A0798700E00531 /* AnimationFontProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EAF59F227A0798700E00531 /* AnimationFontProvider.swift */; };
 		36E57EAC28AF7ADF00B7EFDA /* HardcodedTextProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36E57EAB28AF7ADF00B7EFDA /* HardcodedTextProvider.swift */; };
+		3E8B8C645ABC4C98B91F7B66 /* LottieURLSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = 135AB552F4524F1D995D3A15 /* LottieURLSession.swift */; };
 		57210913291073E400169699 /* RoundedCorners.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57210912291073E400169699 /* RoundedCorners.swift */; };
 		57210914291073E400169699 /* RoundedCorners.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57210912291073E400169699 /* RoundedCorners.swift */; };
 		57210915291073E400169699 /* RoundedCorners.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57210912291073E400169699 /* RoundedCorners.swift */; };
@@ -1137,6 +1140,7 @@
 		A404605B2832C52B00ACFEDC /* BlendMode+Filter.swift in Sources */ = {isa = PBXBuildFile; fileRef = A40460582832C52B00ACFEDC /* BlendMode+Filter.swift */; };
 		AB3278132A71BA0400A9C9F1 /* View+ValueChanged.swift in Sources */ = {isa = PBXBuildFile; fileRef = AB3278122A71BA0400A9C9F1 /* View+ValueChanged.swift */; };
 		AB3278142A71BA3500A9C9F1 /* View+ValueChanged.swift in Sources */ = {isa = PBXBuildFile; fileRef = AB3278122A71BA0400A9C9F1 /* View+ValueChanged.swift */; };
+		AB5FA114D9A847068F233099 /* LottieURLSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = 135AB552F4524F1D995D3A15 /* LottieURLSession.swift */; };
 		AB87F02C2A72F5A80091D7B8 /* View+ValueChanged.swift in Sources */ = {isa = PBXBuildFile; fileRef = AB3278122A71BA0400A9C9F1 /* View+ValueChanged.swift */; };
 		AB87F02E2A72FA3A0091D7B8 /* Binding+Map.swift in Sources */ = {isa = PBXBuildFile; fileRef = AB87F02D2A72FA3A0091D7B8 /* Binding+Map.swift */; };
 		AB87F02F2A72FA3A0091D7B8 /* Binding+Map.swift in Sources */ = {isa = PBXBuildFile; fileRef = AB87F02D2A72FA3A0091D7B8 /* Binding+Map.swift */; };
@@ -1144,6 +1148,7 @@
 		ABF033B42A7B0ABA00F8C228 /* AnyEquatable.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABF033B32A7B0ABA00F8C228 /* AnyEquatable.swift */; };
 		ABF033B52A7B0ABA00F8C228 /* AnyEquatable.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABF033B32A7B0ABA00F8C228 /* AnyEquatable.swift */; };
 		ABF033B62A7B0ABA00F8C228 /* AnyEquatable.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABF033B32A7B0ABA00F8C228 /* AnyEquatable.swift */; };
+		ACC10C5D826649EABEBFB707 /* LottieURLSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = 135AB552F4524F1D995D3A15 /* LottieURLSession.swift */; };
 		D453D8AB28FE6EE300D3F49C /* LottieAnimationCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = D453D8AA28FE6EE300D3F49C /* LottieAnimationCache.swift */; };
 		D453D8AC28FE6EE300D3F49C /* LottieAnimationCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = D453D8AA28FE6EE300D3F49C /* LottieAnimationCache.swift */; };
 		D453D8AD28FE6EE300D3F49C /* LottieAnimationCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = D453D8AA28FE6EE300D3F49C /* LottieAnimationCache.swift */; };
@@ -1273,7 +1278,9 @@
 		08F8B212289990CB00CB5323 /* SnapshotTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SnapshotTests.swift; sourceTree = "<group>"; };
 		08FB47C52B23B86500744478 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = Sources/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		08FE934D28F4CCAC00D3A7E6 /* InfiniteOpaqueAnimationLayer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InfiniteOpaqueAnimationLayer.swift; sourceTree = "<group>"; };
+		135AB552F4524F1D995D3A15 /* LottieURLSession.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LottieURLSession.swift; sourceTree = "<group>"; };
 		19465F51282F998B00BB2C97 /* CachedImageProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CachedImageProvider.swift; sourceTree = "<group>"; };
+		263C0AE22E5CA0D30063205E /* AnimationConfigurationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnimationConfigurationTests.swift; sourceTree = "<group>"; };
 		2E044E262820536800FA773B /* AutomaticEngineTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutomaticEngineTests.swift; sourceTree = "<group>"; };
 		2E09FA0527B6CEB600BA84E5 /* HardcodedFontProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HardcodedFontProvider.swift; sourceTree = "<group>"; };
 		2E450DAB283415D500E56D19 /* OpacityAnimation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpacityAnimation.swift; sourceTree = "<group>"; };
@@ -1564,6 +1571,7 @@
 			children = (
 				2EAF59C727A0798700E00531 /* LottieConfiguration.swift */,
 				08AB05542A61C20400DE86FD /* ReducedMotionOption.swift */,
+				135AB552F4524F1D995D3A15 /* LottieURLSession.swift */,
 				08AB05582A61C5B700DE86FD /* DecodingStrategy.swift */,
 				08AB055C2A61C5CC00DE86FD /* RenderingEngineOption.swift */,
 			);
@@ -1781,6 +1789,7 @@
 				2E044E262820536800FA773B /* AutomaticEngineTests.swift */,
 				6DB3BDB528243FA5002A276D /* ValueProvidersTests.swift */,
 				D453D8AE28FF9BC600D3F49C /* AnimationCacheProviderTests.swift */,
+				263C0AE22E5CA0D30063205E /* AnimationConfigurationTests.swift */,
 				08CB2680291ED2B700B4F071 /* AnimationViewTests.swift */,
 				2E70F79E295BB6D30089A0EF /* CompatibleAnimationViewTests.swift */,
 				080F5FDB2AB1075000ADC32C /* TextProviderTests.swift */,
@@ -2812,6 +2821,7 @@
 				080DF0792A95717F00BE2D96 /* KeyframeExtensions.swift in Sources */,
 				080DF0062A95712D00BE2D96 /* ShapeCompositionLayer.swift in Sources */,
 				080DEF702A95709700BE2D96 /* ReducedMotionOption.swift in Sources */,
+				20439AE0516A49FDB3BA8D42 /* LottieURLSession.swift in Sources */,
 				080DEFCF2A95711400BE2D96 /* URL+ZIP.swift in Sources */,
 				080DEFEE2A95711E00BE2D96 /* TransformLayer.swift in Sources */,
 				080DEFC52A95710F00BE2D96 /* ViewType.swift in Sources */,
@@ -3051,6 +3061,7 @@
 				2EAF5A9B27A0798700E00531 /* BundleImageProvider.macOS.swift in Sources */,
 				2E9C969F2822F43100677516 /* TextAnimatorNode.swift in Sources */,
 				08AB05552A61C20400DE86FD /* ReducedMotionOption.swift in Sources */,
+				3E8B8C645ABC4C98B91F7B66 /* LottieURLSession.swift in Sources */,
 				2EAF5AFB27A0798700E00531 /* SizeValueProvider.swift in Sources */,
 				2E9C97562822F43100677516 /* MathKit.swift in Sources */,
 				2E9C96902822F43100677516 /* EllipseNode.swift in Sources */,
@@ -3289,6 +3300,7 @@
 				080F5FDC2AB1075000ADC32C /* TextProviderTests.swift in Sources */,
 				6DB3BDB628243FA5002A276D /* ValueProvidersTests.swift in Sources */,
 				2E72128327BB329C0027BC56 /* AnimationKeypathTests.swift in Sources */,
+				263C0AE32E5CA0D30063205E /* AnimationConfigurationTests.swift in Sources */,
 				2E044E272820536800FA773B /* AutomaticEngineTests.swift in Sources */,
 				D453D8AF28FF9BC600D3F49C /* AnimationCacheProviderTests.swift in Sources */,
 			);
@@ -3545,6 +3557,7 @@
 				2E9C96E82822F43100677516 /* ImageLayer.swift in Sources */,
 				2E9C972D2822F43100677516 /* StarAnimation.swift in Sources */,
 				08AB05562A61C20400DE86FD /* ReducedMotionOption.swift in Sources */,
+				AB5FA114D9A847068F233099 /* LottieURLSession.swift in Sources */,
 				2E9C96E22822F43100677516 /* LayerModel+makeAnimationLayer.swift in Sources */,
 				08E207372A56014E002DCE17 /* MakeViewProviding.swift in Sources */,
 				2E9C96A92822F43100677516 /* FillNode.swift in Sources */,
@@ -3655,6 +3668,7 @@
 				2E9C96A12822F43100677516 /* TextAnimatorNode.swift in Sources */,
 				2EAF5AFD27A0798700E00531 /* SizeValueProvider.swift in Sources */,
 				08AB05572A61C20400DE86FD /* ReducedMotionOption.swift in Sources */,
+				ACC10C5D826649EABEBFB707 /* LottieURLSession.swift in Sources */,
 				2E9C97582822F43100677516 /* MathKit.swift in Sources */,
 				2E9C96922822F43100677516 /* EllipseNode.swift in Sources */,
 				2E9C975B2822F43100677516 /* BezierPath.swift in Sources */,

package/Lottie.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -14,8 +14,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/airbnb/swift",
       "state" : {
-        "revision" : "6900f5ab7ab7394ac85eb9da52b2528ee329b206",
-        "version" : "1.0.4"
+        "revision" : "6c09dd57c2254b14bb48c15e209ed6e93058104f",
+        "version" : "1.2.0"
       }
     },
     {

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

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   uuid = "556BBD44-725D-4E33-8C4A-B856B64FA389"
+   type = "0"
+   version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "DC0FA7C6-C142-48E0-BF38-CF4CBB46B0F7"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Sources/Public/Animation/LottieAnimationView.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "365"
+            endingLineNumber = "365"
+            landmarkName = "setPlaybackMode(_:completion:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "874695D5-65F4-4004-AD94-7756EF6E265E"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Sources/Private/CoreAnimation/CoreAnimationLayer.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "177"
+            endingLineNumber = "177"
+            landmarkName = "display()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
+</Bucket>

package/Package.resolved

@@ -5,8 +5,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/airbnb/swift",
       "state" : {
-        "revision" : "fa3ae574d0b9c93a1655424bd4381044274c5cb4",
-        "version" : "1.0.7"
+        "revision" : "6c09dd57c2254b14bb48c15e209ed6e93058104f",
+        "version" : "1.2.0"
       }
     },
     {

package/Package.swift

@@ -1,13 +1,18 @@
-// swift-tools-version:5.9
+// swift-tools-version:6.0
 import PackageDescription
 
 let package = Package(
   name: "Lottie",
   // Minimum platform versions should be kept in sync with the per-platform targets in Lottie.xcodeproj, lottie-ios.podspec, and lottie-spm's Package.swift
-  platforms: [.iOS("13.0"), .macOS("10.15"), .tvOS("13.0"), .custom("visionOS", versionString: "1.0")],
-  products: [.library(name: "Lottie", targets: ["Lottie"])],
+  platforms: [.iOS("13.0"), .macOS("10.15"), .tvOS("13.0"), .visionOS("1.0")],
+  products: [
+    .library(name: "Lottie", targets: ["Lottie"]),
+    // Product for dynamic linking, as SPM builds libraries statically by default.
+    // This product should be used in a modular project structure with multiple packages using Lottie to avoid duplicate symbols.
+    .library(name: "Lottie-Dynamic", type: .dynamic, targets: ["Lottie"]),
+  ],
   dependencies: [
-    .package(url: "https://github.com/airbnb/swift", .upToNextMajor(from: "1.0.1")),
+    .package(url: "https://github.com/airbnb/swift", .upToNextMajor(from: "1.2.0"))
   ],
   targets: [
     .target(
@@ -19,5 +24,8 @@ let package = Package(
         "Private/EmbeddedLibraries/EpoxyCore/README.md",
         "Private/EmbeddedLibraries/LRUCache/README.md",
       ],
-      resources: [.copy("PrivacyInfo.xcprivacy")]),
-  ])
+      resources: [.copy("PrivacyInfo.xcprivacy")],
+      swiftSettings: [.swiftLanguageMode(.v5)]
+    )
+  ]
+)

package/README.md

@@ -5,7 +5,7 @@
 
 Lottie is a cross-platform library for iOS, macOS, tvOS, visionOS, [Android](https://github.com/airbnb/lottie-android), and [Web](https://github.com/airbnb/lottie-web) that natively renders vector-based animations and art in realtime with minimal code.
 
-Lottie loads and renders animations and vectors exported in the bodymovin JSON format. Bodymovin JSON can be created and exported from After Effects with [bodymovin](https://github.com/bodymovin/bodymovin), Sketch with [Lottie Sketch Export](https://github.com/buba447/Lottie-Sketch-Export), and from [Haiku](https://www.haiku.ai).
+Lottie loads and renders animations and vectors exported in the bodymovin JSON format. Bodymovin JSON can be created and exported from After Effects with [bodymovin](https://github.com/bodymovin/bodymovin), Sketch with [Lottie Sketch Export](https://github.com/buba447/Lottie-Sketch-Export), and from [Haiku](https://www.haikuanimator.com).
 
 Designers can create **and ship** beautiful animations without an engineer painstakingly recreating them by hand.
 Since the animations are backed by JSON, they are extremely small in size but can be large in complexity!
@@ -33,7 +33,7 @@ You can pull the [Lottie Github Repo](https://github.com/airbnb/lottie-ios/) and
 
 ### Swift Package Manager
 
-To install Lottie using [Swift Package Manager](https://github.com/apple/swift-package-manager) you can follow the [tutorial published by Apple](https://developer.apple.com/documentation/xcode/adding_package_dependencies_to_your_app) using the URL for the Lottie repo with the current version:
+To install Lottie using [Swift Package Manager](https://github.com/swiftlang/swift-package-manager) you can follow the [tutorial published by Apple](https://developer.apple.com/documentation/xcode/adding_package_dependencies_to_your_app) using the URL for the Lottie repo with the current version:
 
 1. In Xcode, select “File” → “Add Packages...”
 1. Enter https://github.com/airbnb/lottie-spm.git
@@ -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.5.0")
+.package(url: "https://github.com/airbnb/lottie-spm.git", from: "4.5.2")
 ```
 
 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

@@ -27,9 +27,7 @@ namespace :build do
 
     desc 'Builds the Lottie package for visionOS'
     task :visionOS do
-      ifVisionOSEnabled {
-        xcodebuild('build -scheme "Lottie (visionOS)" -destination generic/platform=visionOS -workspace Lottie.xcworkspace OTHER_SWIFT_FLAGS="-warnings-as-errors"')
-      }
+      xcodebuild('build -scheme "Lottie (visionOS)" -destination generic/platform=visionOS -workspace Lottie.xcworkspace OTHER_SWIFT_FLAGS="-warnings-as-errors"')
     end
   end
 
@@ -55,30 +53,34 @@ namespace :build do
 
     desc 'Builds the visionOS Lottie Example app'
     task :visionOS do
-      ifVisionOSEnabled {
-        xcodebuild('build -scheme "Example (Multiplatform)" -destination "platform=visionOS Simulator,name=Apple Vision Pro" -workspace Lottie.xcworkspace')
-      }
+      xcodebuild('build -scheme "Example (Multiplatform)" -destination "platform=visionOS Simulator,OS=26.1,name=Apple Vision Pro" -workspace Lottie.xcworkspace')
     end
   end
 
   desc 'Builds an xcframework for all supported platforms'
-  task :xcframework, [:zip_archive_name] do |_t, args|
-    args.with_defaults(:zip_archive_name => 'Lottie')
+  task :xcframework, [:framework_type] do |_t, args|
+    args.with_defaults(:framework_type => 'dynamic')
+ 
+    case args[:framework_type]
+    when 'dynamic'
+      mach_o_type = 'mh_dylib'
+      xcframework_name = 'Lottie' # Backward compatibility
+    when 'static'
+      mach_o_type = 'staticlib'
+      xcframework_name = 'Lottie-Static'
+    end
 
     sh 'rm -rf .build/archives'
 
     # Build the framework for each supported platform, including simulators
-    xcodebuild('archive -workspace Lottie.xcworkspace -scheme "Lottie (iOS)" -destination generic/platform=iOS -archivePath ".build/archives/Lottie_iOS" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES ENABLE_BITCODE=NO SWIFT_SERIALIZE_DEBUGGING_OPTIONS=NO')
-    xcodebuild('archive -workspace Lottie.xcworkspace -scheme "Lottie (iOS)" -destination "generic/platform=iOS Simulator" -archivePath ".build/archives/Lottie_iOS_Simulator" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES ENABLE_BITCODE=NO SWIFT_SERIALIZE_DEBUGGING_OPTIONS=NO')
-    xcodebuild('archive -workspace Lottie.xcworkspace -scheme "Lottie (iOS)" -destination "generic/platform=macOS,variant=Mac Catalyst" -archivePath ".build/archives/Lottie_Mac_Catalyst" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES ENABLE_BITCODE=NO SWIFT_SERIALIZE_DEBUGGING_OPTIONS=NO')
-    xcodebuild('archive -workspace Lottie.xcworkspace -scheme "Lottie (macOS)" -destination generic/platform=macOS -archivePath ".build/archives/Lottie_macOS" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES ENABLE_BITCODE=NO SWIFT_SERIALIZE_DEBUGGING_OPTIONS=NO')
-    xcodebuild('archive -workspace Lottie.xcworkspace -scheme "Lottie (tvOS)" -destination generic/platform=tvOS -archivePath ".build/archives/Lottie_tvOS" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES ENABLE_BITCODE=NO SWIFT_SERIALIZE_DEBUGGING_OPTIONS=NO')
-    xcodebuild('archive -workspace Lottie.xcworkspace -scheme "Lottie (tvOS)" -destination "generic/platform=tvOS Simulator" -archivePath ".build/archives/Lottie_tvOS_Simulator" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES ENABLE_BITCODE=NO SWIFT_SERIALIZE_DEBUGGING_OPTIONS=NO')
-
-    ifVisionOSEnabled {
-      xcodebuild('archive -workspace Lottie.xcworkspace -scheme "Lottie (visionOS)" -destination generic/platform=visionOS -archivePath ".build/archives/Lottie_visionOS" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES ENABLE_BITCODE=NO SWIFT_SERIALIZE_DEBUGGING_OPTIONS=NO')
-      xcodebuild('archive -workspace Lottie.xcworkspace -scheme "Lottie (visionOS)" -destination "generic/platform=visionOS Simulator" -archivePath ".build/archives/Lottie_visionOS_Simulator" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES ENABLE_BITCODE=NO SWIFT_SERIALIZE_DEBUGGING_OPTIONS=NO')
-    }
+    xcodebuild("archive -workspace Lottie.xcworkspace -scheme \"Lottie (iOS)\" -destination generic/platform=iOS -archivePath \".build/archives/Lottie_iOS\" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES ENABLE_BITCODE=NO SWIFT_SERIALIZE_DEBUGGING_OPTIONS=NO MACH_O_TYPE=\"#{mach_o_type}\"")
+    xcodebuild("archive -workspace Lottie.xcworkspace -scheme \"Lottie (iOS)\" -destination \"generic/platform=iOS Simulator\" -archivePath \".build/archives/Lottie_iOS_Simulator\" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES ENABLE_BITCODE=NO SWIFT_SERIALIZE_DEBUGGING_OPTIONS=NO MACH_O_TYPE=\"#{mach_o_type}\"")
+    xcodebuild("archive -workspace Lottie.xcworkspace -scheme \"Lottie (iOS)\" -destination \"generic/platform=macOS,variant=Mac Catalyst\" -archivePath \".build/archives/Lottie_Mac_Catalyst\" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES ENABLE_BITCODE=NO SWIFT_SERIALIZE_DEBUGGING_OPTIONS=NO MACH_O_TYPE=\"#{mach_o_type}\"")
+    xcodebuild("archive -workspace Lottie.xcworkspace -scheme \"Lottie (macOS)\" -destination generic/platform=macOS -archivePath \".build/archives/Lottie_macOS\" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES ENABLE_BITCODE=NO SWIFT_SERIALIZE_DEBUGGING_OPTIONS=NO MACH_O_TYPE=\"#{mach_o_type}\"")
+    xcodebuild("archive -workspace Lottie.xcworkspace -scheme \"Lottie (tvOS)\" -destination generic/platform=tvOS -archivePath \".build/archives/Lottie_tvOS\" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES ENABLE_BITCODE=NO SWIFT_SERIALIZE_DEBUGGING_OPTIONS=NO MACH_O_TYPE=\"#{mach_o_type}\"")
+    xcodebuild("archive -workspace Lottie.xcworkspace -scheme \"Lottie (tvOS)\" -destination \"generic/platform=tvOS Simulator\" -archivePath \".build/archives/Lottie_tvOS_Simulator\" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES ENABLE_BITCODE=NO SWIFT_SERIALIZE_DEBUGGING_OPTIONS=NO MACH_O_TYPE=\"#{mach_o_type}\"")
+    xcodebuild("archive -workspace Lottie.xcworkspace -scheme \"Lottie (visionOS)\" -destination generic/platform=visionOS -archivePath \".build/archives/Lottie_visionOS\" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES ENABLE_BITCODE=NO SWIFT_SERIALIZE_DEBUGGING_OPTIONS=NO MACH_O_TYPE=\"#{mach_o_type}\"")
+    xcodebuild("archive -workspace Lottie.xcworkspace -scheme \"Lottie (visionOS)\" -destination \"generic/platform=visionOS Simulator\" -archivePath \".build/archives/Lottie_visionOS_Simulator\" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES ENABLE_BITCODE=NO SWIFT_SERIALIZE_DEBUGGING_OPTIONS=NO MACH_O_TYPE=\"#{mach_o_type}\"")
 
     # Combine all of the platforms into a single XCFramework
     xcframeworkInvocation = [
@@ -89,18 +91,14 @@ namespace :build do
       '-archive .build/archives/Lottie_tvOS.xcarchive -framework Lottie.framework',
       '-archive .build/archives/Lottie_tvOS_Simulator.xcarchive -framework Lottie.framework',
       '-archive .build/archives/Lottie_macOS.xcarchive -framework Lottie.framework',
+      '-archive .build/archives/Lottie_visionOS.xcarchive -framework Lottie.framework',
+      '-archive .build/archives/Lottie_visionOS_Simulator.xcarchive -framework Lottie.framework',
+      "-output .build/artifacts/#{xcframework_name}.xcframework",
     ]
 
-    ifVisionOSEnabled {
-      xcframeworkInvocation.push('-archive .build/archives/Lottie_visionOS.xcarchive -framework Lottie.framework')
-      xcframeworkInvocation.push('-archive .build/archives/Lottie_visionOS_Simulator.xcarchive -framework Lottie.framework')
-    }
-
-    xcframeworkInvocation.push('-output .build/archives/Lottie.xcframework')
-
     xcodebuild(xcframeworkInvocation.join(" "))
 
-    Dir.chdir('.build/archives') do
+    Dir.chdir('.build/artifacts') do
       # Codesign the XCFramework using the "Lottie iOS" certificate, which should be installed in the keychain.
       #  - Check to make sure the certificate is installed before attemtping to codesign.
       #  - In GitHub actions CI, only jobs run by contibutors have access to repo secrets,
@@ -110,19 +108,19 @@ namespace :build do
       `security find-certificate -c 'Lottie iOS'`
       if $?.success?
         puts "Signing certificate is installed. Code signing Lottie.xcframework."
-        sh 'codesign --timestamp -v --sign "Lottie iOS" Lottie.xcframework'
+        sh "codesign --timestamp -v --sign \"Lottie iOS\" #{xcframework_name}.xcframework"
       else
-        puts "Signing certificate is not installed. Lottie.xcframework will not be code signed."
+        puts "Signing certificate is not installed. #{xcframework_name}.xcframework will not be code signed."
       end
 
       # Archive the XCFramework into a zip file
       # Use --symlinks to avoid "Multiple binaries share the same codesign path. This can happen if your build process copies frameworks by following symlinks." 
       # error when validating macOS apps (#1948)
-      sh "zip -r --symlinks #{args[:zip_archive_name]}.xcframework.zip Lottie.xcframework"
-      sh 'rm -rf Lottie.xcframework'
+      sh "zip -r --symlinks #{xcframework_name}.xcframework.zip #{xcframework_name}.xcframework"
+      sh "rm -rf #{xcframework_name}.xcframework"
     end
 
-    sh "swift package compute-checksum .build/archives/#{args[:zip_archive_name]}.xcframework.zip"
+    sh "swift package compute-checksum .build/artifacts/#{xcframework_name}.xcframework.zip"
   end
 end
 
@@ -158,7 +156,7 @@ namespace :test do
       xcodebuild('build -scheme CarthageTest  -destination "platform=iOS Simulator,name=iPhone SE (3rd generation)"')
       xcodebuild('build -scheme CarthageTest -destination generic/platform=macOS')
       xcodebuild('build -scheme CarthageTest -destination "platform=tvOS Simulator,name=Apple TV"')
-      xcodebuild('build -scheme CarthageTest -destination "platform=visionOS Simulator,name=Apple Vision Pro"')
+      xcodebuild('build -scheme CarthageTest -destination "platform=visionOS Simulator,OS=26.1,name=Apple Vision Pro"')
     end
   end
 
@@ -169,10 +167,7 @@ namespace :test do
       xcodebuild('build -scheme "Lottie" -destination generic/platform=iOS')
       xcodebuild('build -scheme "Lottie" -destination generic/platform=macOS')
       xcodebuild('build -scheme "Lottie" -destination generic/platform=tvOS')
-
-      ifVisionOSEnabled {
-        xcodebuild('build -scheme "Lottie" -destination generic/platform=visionOS')
-      }
+      xcodebuild('build -scheme "Lottie" -destination generic/platform=visionOS')
     end
   end
 end
@@ -247,13 +242,3 @@ def xcodebuild(command)
     sh "xcodebuild #{command}"
   end
 end
-
-# Runs the given code block, unless `SKIP_VISION_OS=true`.
-# TODO: Remove this once Lottie only supports Xcode 15.2+.
-def ifVisionOSEnabled
-  if ENV["SKIP_VISION_OS"] == "true"
-    puts "Skipping visionOS build"
-  else
-    yield
-  end
-end