lottie-ios 4.3.3 → 4.4.0

package/Package.resolved

@@ -1,25 +1,23 @@
 {
-  "object": {
-    "pins": [
-      {
-        "package": "AirbnbSwift",
-        "repositoryURL": "https://github.com/airbnb/swift",
-        "state": {
-          "branch": null,
-          "revision": "b408d36b4f5e73ea75441fb9791b849b0a40f58b",
-          "version": "1.0.5"
-        }
-      },
-      {
-        "package": "swift-argument-parser",
-        "repositoryURL": "https://github.com/apple/swift-argument-parser",
-        "state": {
-          "branch": null,
-          "revision": "df9ee6676cd5b3bf5b330ec7568a5644f547201b",
-          "version": "1.1.3"
-        }
+  "pins" : [
+    {
+      "identity" : "swift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/airbnb/swift",
+      "state" : {
+        "revision" : "bc6aa7c3e21b6ab951ce75afc0a6e6d16fd6caef",
+        "version" : "1.0.6"
       }
-    ]
-  },
-  "version": 1
+    },
+    {
+      "identity" : "swift-argument-parser",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-argument-parser",
+      "state" : {
+        "revision" : "df9ee6676cd5b3bf5b330ec7568a5644f547201b",
+        "version" : "1.1.3"
+      }
+    }
+  ],
+  "version" : 2
 }

package/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.6
+// swift-tools-version:5.7
 import PackageDescription
 
 let package = Package(
@@ -17,5 +17,7 @@ let package = Package(
         "Private/EmbeddedLibraries/README.md",
         "Private/EmbeddedLibraries/ZipFoundation/README.md",
         "Private/EmbeddedLibraries/EpoxyCore/README.md",
-      ]),
+        "Private/EmbeddedLibraries/LRUCache/README.md",
+      ],
+      resources: [.copy("PrivacyInfo.xcprivacy")]),
   ])

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.3.3")
+.package(url: "https://github.com/airbnb/lottie-spm.git", from: "4.4.0")
 ```
 
 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. 
@@ -75,9 +75,27 @@ carthage update
 ```
 In your application targets “General” tab under the “Linked Frameworks and Libraries” section, drag and drop lottie-ios.framework from the Carthage/Build/iOS directory that `carthage update` produced.
 
-### Data collection
+## Swift Version Support
 
-The Lottie SDK does not collect any data. We provide this notice to help you fill out [App Privacy Details](https://developer.apple.com/app-store/app-privacy-details/).
+Lottie supports Swift / Xcode versions back to the minimum version that is permited by Apple for submissions to the App Store. You can see the most up-to-date information for which Swift versions Lottie supports on [Swift Package Index](https://swiftpackageindex.com/airbnb/lottie-ios):
+
+[![Swift Versions](https://img.shields.io/endpoint?url=https%3A%2F%2Fswiftpackageindex.com%2Fapi%2Fpackages%2Fairbnb%2Flottie-ios%2Fbadge%3Ftype%3Dswift-versions)](https://swiftpackageindex.com/airbnb/lottie-ios)
+
+## Privacy
+
+Lottie does not collect any data. We provide this notice to help you fill out [App Privacy Details](https://developer.apple.com/app-store/app-privacy-details/). We additionally provide a [privacy manifest](https://github.com/airbnb/lottie-ios/blob/master/Sources/PrivacyInfo.xcprivacy) which can be included in your app.
+
+## Security
+
+We distribute XCFramework bundles for each release on [GitHub](https://github.com/airbnb/lottie-ios/releases/latest). In Lottie 4.4.0 and later, these XCFramework bundles include a [code signature](https://developer.apple.com/documentation/xcode/verifying-the-origin-of-your-xcframeworks). These bundles are self-signed under the name "Lottie iOS" and have the following fingerprint:
+
+```
+89 2F 1B 43 04 7B 50 53 8F 2F 46 EA D9 29 00 DD 3D 48 11 F358 21 78 C0 61 A5 FB 20 F1 11 CB 26
+```
+
+In Xcode you can verify this by selecting `Lottie.xcframework` and confirming that it shows the following information:
+
+![Code Signature in Xcode](_Gifs/code_signature.png)
 
 ## Contributing
 

package/Rakefile

@@ -68,45 +68,60 @@ namespace :build do
     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')
-    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')
-    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')
-    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')
-    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')
-    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')
+    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')
-      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')
+      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')
     }
 
     # Combine all of the platforms into a single XCFramework
     xcframeworkInvocation = [
       '-create-xcframework',
-      '-framework .build/archives/Lottie_iOS.xcarchive/Products/Library/Frameworks/Lottie.framework',
-      '-framework .build/archives/Lottie_iOS_Simulator.xcarchive/Products/Library/Frameworks/Lottie.framework',
-      '-framework .build/archives/Lottie_Mac_Catalyst.xcarchive/Products/Library/Frameworks/Lottie.framework',
-      '-framework .build/archives/Lottie_tvOS.xcarchive/Products/Library/Frameworks/Lottie.framework',
-      '-framework .build/archives/Lottie_tvOS_Simulator.xcarchive/Products/Library/Frameworks/Lottie.framework',
-      '-framework .build/archives/Lottie_macOS.xcarchive/Products/Library/Frameworks/Lottie.framework',
+      '-archive .build/archives/Lottie_iOS.xcarchive -framework Lottie.framework',
+      '-archive .build/archives/Lottie_iOS_Simulator.xcarchive -framework Lottie.framework',
+      '-archive .build/archives/Lottie_Mac_Catalyst.xcarchive -framework Lottie.framework',
+      '-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',
     ]
 
     ifVisionOSEnabled {
-      xcframeworkInvocation.push('-framework .build/archives/Lottie_visionOS.xcarchive/Products/Library/Frameworks/Lottie.framework')
-      xcframeworkInvocation.push('-framework .build/archives/Lottie_visionOS_Simulator.xcarchive/Products/Library/Frameworks/Lottie.framework')
+      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(" "))
 
-    # Archive the XCFramework into a zip file
     Dir.chdir('.build/archives') 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,
+      #    so PR jobs from external contributors won't have access to this certificate.
+      #    In that case we skip codesigning so the job doesn't fail.
+      puts "Checking if signing certificate is installed..."
+      `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'
+      else
+        puts "Signing certificate is not installed. Lottie.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'
     end
+
     sh "swift package compute-checksum .build/archives/#{args[:zip_archive_name]}.xcframework.zip"
   end
 end
@@ -131,7 +146,9 @@ namespace :test do
     sh 'cp -R [^script]* script/test-carthage/Carthage/Checkouts/lottie-ios'
 
     Dir.chdir('script/test-carthage') do
-      # Build the LottieCarthage framework scheme
+      installVisionOSIfNecessary()
+
+      # Build the Lottie framework scheme
       sh 'carthage build --use-xcframeworks'
 
       # Delete Carthage's derived data to verify that the built .xcframework doesn't depend on any
@@ -139,9 +156,11 @@ namespace :test do
       # https://github.com/airbnb/lottie-ios/issues/1492
       sh 'rm -rf ~/Library/Caches/org.carthage.CarthageKit/DerivedData'
 
-      # Build a test app that imports and uses the LottieCarthage framework
-      xcodebuild('build -scheme CarthageTest -destination "platform=iOS Simulator,name=iPhone SE (3rd generation)"')
-      xcodebuild('build -scheme CarthageTest-macOS')
+      # Build a test app that imports and uses the Lottie framework built via Carthage
+      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"')
     end
   end
 
@@ -232,16 +251,21 @@ def xcodebuild(command)
 end
 
 # Runs the given code block, unless `SKIP_VISION_OS=true`.
-# This can be removed once CI only uses Xcode 15+.
+# TODO: Remove this once CI only uses Xcode 15.2+.
 def ifVisionOSEnabled
   if ENV["SKIP_VISION_OS"] == "true"
     puts "Skipping visionOS build"
   else
-    # As of 9/5/23 the GitHub Actions runner doesn't include the visionOS SDK by default,
-    # so we have to download it manually. Following the suggested workaround from
-    # https://github.com/actions/runner-images/issues/8144#issuecomment-1702786388
-    `brew install xcodesorg/made/xcodes`
-    `xcodes runtimes install 'visionOS 1.0-beta3'`
+    installVisionOSIfNecessary()
     yield
   end
-end
+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/PrivacyInfo.xcprivacy

@@ -0,0 +1,23 @@
+<?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>NSPrivacyTracking</key>
+	<false/>
+	<key>NSPrivacyTrackingDomains</key>
+	<array/>
+	<key>NSPrivacyCollectedDataTypes</key>
+	<array/>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>3B52.1</string>
+			</array>
+		</dict>
+	</array>
+</dict>
+</plist>

package/Sources/Private/CoreAnimation/Animations/CAAnimation+TimingConfiguration.swift

@@ -21,7 +21,7 @@ extension CAAnimation {
     //  0%                                100%
     //
     let baseAnimation = self
-    baseAnimation.duration = context.animation.duration
+    baseAnimation.duration = context.animationDuration
     baseAnimation.speed = (context.endFrame < context.startFrame) ? -1 : 1
 
     // To select the subrange of the `baseAnimation` that should be played,

package/Sources/Private/CoreAnimation/Animations/CALayer+addAnimation.swift

@@ -10,7 +10,7 @@ extension CALayer {
   /// Constructs a `CAKeyframeAnimation` that reflects the given keyframes,
   /// and adds it to this `CALayer`.
   @nonobjc
-  func addAnimation<KeyframeValue, ValueRepresentation>(
+  func addAnimation<KeyframeValue: AnyInterpolatable, ValueRepresentation>(
     for property: LayerProperty<ValueRepresentation>,
     keyframes: KeyframeGroup<KeyframeValue>,
     value keyframeValueMapping: (KeyframeValue) throws -> ValueRepresentation,
@@ -39,7 +39,7 @@ extension CALayer {
   ///  - If the value can be applied directly to the CALayer using KVC,
   ///    then no `CAAnimation` will be created and the value will be applied directly.
   @nonobjc
-  private func defaultAnimation<KeyframeValue, ValueRepresentation>(
+  private func defaultAnimation<KeyframeValue: AnyInterpolatable, ValueRepresentation>(
     for property: LayerProperty<ValueRepresentation>,
     keyframes keyframeGroup: KeyframeGroup<KeyframeValue>,
     value keyframeValueMapping: (KeyframeValue) throws -> ValueRepresentation,
@@ -61,9 +61,9 @@ extension CALayer {
         """)
     }
 
-    // If there is exactly one keyframe value, we can improve performance
-    // by applying that value directly to the layer instead of creating
-    // a relatively expensive `CAKeyframeAnimation`.
+    // If there is exactly one keyframe value that doesn't animate,
+    // we can improve performance by applying that value directly to the layer
+    // instead of creating a relatively expensive `CAKeyframeAnimation`.
     if keyframes.count == 1 {
       return singleKeyframeAnimation(
         for: property,
@@ -71,6 +71,16 @@ extension CALayer {
         writeDirectlyToPropertyIfPossible: true)
     }
 
+    /// If we're required to use the `complexTimeRemapping` from some parent `PreCompLayer`,
+    /// we have to manually interpolate the keyframes with the time remapping applied.
+    if context.mustUseComplexTimeRemapping {
+      return try defaultAnimation(
+        for: property,
+        keyframes: Keyframes.manuallyInterpolatedWithTimeRemapping(keyframeGroup, context: context),
+        value: keyframeValueMapping,
+        context: context.withoutTimeRemapping())
+    }
+
     // Split the keyframes into segments with the same `CAAnimationCalculationMode` value
     //  - Each of these segments will become their own `CAKeyframeAnimation`
     let animationSegments = keyframes.segmentsSplitByCalculationMode()
@@ -179,8 +189,8 @@ extension CALayer {
     //    all of which have a non-zero number of keyframes.
     let segmentAnimations: [CAKeyframeAnimation] = try animationSegments.indices.map { index in
       let animationSegment = animationSegments[index]
-      var segmentStartTime = context.time(for: animationSegment.first!.time)
-      var segmentEndTime = context.time(for: animationSegment.last!.time)
+      var segmentStartTime = try context.time(forFrame: animationSegment.first!.time)
+      var segmentEndTime = try context.time(forFrame: animationSegment.last!.time)
 
       // Every portion of the animation timeline has to be covered by a `CAKeyframeAnimation`,
       // so if this is the first or last segment then the start/end time should be exactly
@@ -190,13 +200,13 @@ extension CALayer {
 
       if isFirstSegment {
         segmentStartTime = min(
-          context.time(for: context.animation.startFrame),
+          try context.time(forFrame: context.animation.startFrame),
           segmentStartTime)
       }
 
       if isLastSegment {
         segmentEndTime = max(
-          context.time(for: context.animation.endFrame),
+          try context.time(forFrame: context.animation.endFrame),
           segmentEndTime)
       }
 
@@ -206,8 +216,8 @@ extension CALayer {
       // relative to 0 (`segmentStartTime`) and 1 (`segmentEndTime`). This is different
       // from the default behavior of the `keyframeAnimation` method, where times
       // are expressed relative to the entire animation duration.
-      let customKeyTimes = animationSegment.map { keyframeModel -> NSNumber in
-        let keyframeTime = context.time(for: keyframeModel.time)
+      let customKeyTimes = try animationSegment.map { keyframeModel -> NSNumber in
+        let keyframeTime = try context.time(forFrame: keyframeModel.time)
         let segmentProgressTime = ((keyframeTime - segmentStartTime) / segmentDuration)
         return segmentProgressTime as NSNumber
       }
@@ -241,8 +251,8 @@ extension CALayer {
   {
     // Convert the list of `Keyframe<T>` into
     // the representation used by `CAKeyframeAnimation`
-    var keyTimes = customKeyTimes ?? keyframes.map { keyframeModel -> NSNumber in
-      NSNumber(value: Float(context.progressTime(for: keyframeModel.time)))
+    var keyTimes = try customKeyTimes ?? keyframes.map { keyframeModel -> NSNumber in
+      NSNumber(value: Float(try context.progressTime(for: keyframeModel.time)))
     }
 
     var timingFunctions = timingFunctions(for: keyframes)

package/Sources/Private/CoreAnimation/Animations/CustomPathAnimation.swift

@@ -53,7 +53,7 @@ extension CGPath {
 // MARK: - BezierPathKeyframe
 
 /// Data that represents how to render a bezier path at a specific point in time
-struct BezierPathKeyframe {
+struct BezierPathKeyframe: Interpolatable {
   let path: BezierPath
   let cornerRadius: LottieVector1D?
 
@@ -65,7 +65,7 @@ struct BezierPathKeyframe {
     -> KeyframeGroup<BezierPathKeyframe>
   {
     guard
-      let cornerRadius = cornerRadius,
+      let cornerRadius,
       cornerRadius.keyframes.contains(where: { $0.value.cgFloatValue > 0 })
     else {
       return path.map { path in
@@ -77,4 +77,10 @@ struct BezierPathKeyframe {
       path, cornerRadius,
       makeCombinedResult: BezierPathKeyframe.init)
   }
+
+  func interpolate(to: BezierPathKeyframe, amount: CGFloat) -> BezierPathKeyframe {
+    BezierPathKeyframe(
+      path: path.interpolate(to: to.path, amount: amount),
+      cornerRadius: cornerRadius.interpolate(to: to.cornerRadius, amount: amount))
+  }
 }

package/Sources/Private/CoreAnimation/Animations/EllipseAnimation.swift

@@ -29,9 +29,15 @@ extension CAShapeLayer {
 
 extension Ellipse {
   /// Data that represents how to render an ellipse at a specific point in time
-  struct Keyframe {
+  struct Keyframe: Interpolatable {
     let size: LottieVector3D
     let position: LottieVector3D
+
+    func interpolate(to: Ellipse.Keyframe, amount: CGFloat) -> Ellipse.Keyframe {
+      Keyframe(
+        size: size.interpolate(to: to.size, amount: amount),
+        position: position.interpolate(to: to.position, amount: amount))
+    }
   }
 
   /// Creates a single array of animatable keyframes from the separate arrays of keyframes in this Ellipse

package/Sources/Private/CoreAnimation/Animations/GradientAnimations.swift

@@ -114,7 +114,7 @@ extension GradientRenderLayer {
 
     let combinedKeyframes = Keyframes.combined(
       gradient.startPoint, gradient.endPoint,
-      makeCombinedResult: { absoluteStartPoint, absoluteEndPoint -> (startPoint: CGPoint, endPoint: CGPoint) in
+      makeCombinedResult: { absoluteStartPoint, absoluteEndPoint -> RadialGradientKeyframes in
         // Convert the absolute start / end points to the relative structure used by Core Animation
         let relativeStartPoint = percentBasedPointInBounds(from: absoluteStartPoint.pointValue)
         let radius = absoluteStartPoint.pointValue.distanceTo(absoluteEndPoint.pointValue)
@@ -123,7 +123,7 @@ extension GradientRenderLayer {
             x: absoluteStartPoint.x + radius,
             y: absoluteStartPoint.y + radius))
 
-        return (startPoint: relativeStartPoint, endPoint: relativeEndPoint)
+        return RadialGradientKeyframes(startPoint: relativeStartPoint, endPoint: relativeEndPoint)
       })
 
     try addAnimation(
@@ -140,6 +140,19 @@ extension GradientRenderLayer {
   }
 }
 
+// MARK: - RadialGradientKeyframes
+
+private struct RadialGradientKeyframes: Interpolatable {
+  let startPoint: CGPoint
+  let endPoint: CGPoint
+
+  func interpolate(to: RadialGradientKeyframes, amount: CGFloat) -> RadialGradientKeyframes {
+    RadialGradientKeyframes(
+      startPoint: startPoint.interpolate(to: to.startPoint, amount: amount),
+      endPoint: endPoint.interpolate(to: to.endPoint, amount: amount))
+  }
+}
+
 // MARK: - GradientContentType
 
 /// Each type of gradient that can be constructed from a `GradientShapeItem`

package/Sources/Private/CoreAnimation/Animations/LayerProperty.swift

@@ -165,11 +165,18 @@ extension LayerProperty {
       customizableProperty: .opacity)
   }
 
+  static var isHidden: LayerProperty<Bool> {
+    .init(
+      caLayerKeypath: #keyPath(CALayer.isHidden),
+      defaultValue: false,
+      customizableProperty: nil /* unsupported */ )
+  }
+
   static var transform: LayerProperty<CATransform3D> {
     .init(
       caLayerKeypath: #keyPath(CALayer.transform),
       isDefaultValue: { transform in
-        guard let transform = transform else { return false }
+        guard let transform else { return false }
         return CATransform3DIsIdentity(transform)
       },
       customizableProperty: nil /* currently unsupported */ )

package/Sources/Private/CoreAnimation/Animations/RectangleAnimation.swift

@@ -31,10 +31,17 @@ extension CAShapeLayer {
 
 extension Rectangle {
   /// Data that represents how to render a rectangle at a specific point in time
-  struct Keyframe {
+  struct Keyframe: Interpolatable {
     let size: LottieVector3D
     let position: LottieVector3D
     let cornerRadius: LottieVector1D
+
+    func interpolate(to: Rectangle.Keyframe, amount: CGFloat) -> Rectangle.Keyframe {
+      Rectangle.Keyframe(
+        size: size.interpolate(to: to.size, amount: amount),
+        position: position.interpolate(to: to.position, amount: amount),
+        cornerRadius: cornerRadius.interpolate(to: to.cornerRadius, amount: amount))
+    }
   }
 
   /// Creates a single array of animatable keyframes from the separate arrays of keyframes in this Rectangle

package/Sources/Private/CoreAnimation/Animations/StarAnimation.swift

@@ -80,7 +80,7 @@ extension CAShapeLayer {
 
 extension Star {
   /// Data that represents how to render a star at a specific point in time
-  struct Keyframe {
+  struct Keyframe: Interpolatable {
     let position: LottieVector3D
     let outerRadius: LottieVector1D
     let innerRadius: LottieVector1D
@@ -88,6 +88,17 @@ extension Star {
     let innerRoundness: LottieVector1D
     let points: LottieVector1D
     let rotation: LottieVector1D
+
+    func interpolate(to: Star.Keyframe, amount: CGFloat) -> Star.Keyframe {
+      Star.Keyframe(
+        position: position.interpolate(to: to.position, amount: amount),
+        outerRadius: outerRadius.interpolate(to: to.outerRadius, amount: amount),
+        innerRadius: innerRadius.interpolate(to: to.innerRadius, amount: amount),
+        outerRoundness: outerRoundness.interpolate(to: to.outerRoundness, amount: amount),
+        innerRoundness: innerRoundness.interpolate(to: to.innerRoundness, amount: amount),
+        points: points.interpolate(to: to.points, amount: amount),
+        rotation: rotation.interpolate(to: to.rotation, amount: amount))
+    }
   }
 
   /// Creates a single array of animatable keyframes from the separate arrays of keyframes in this star/polygon

package/Sources/Private/CoreAnimation/Animations/StrokeAnimation.swift

@@ -1,7 +1,6 @@
 // Created by Cal Stephens on 2/10/22.
 // Copyright © 2022 Airbnb Inc. All rights reserved.
 
-import Foundation
 import QuartzCore
 
 // MARK: - StrokeShapeItem

package/Sources/Private/CoreAnimation/Animations/TransformAnimations.swift

@@ -253,10 +253,16 @@ extension CALayer {
     context: LayerAnimationContext)
     throws
   {
-    // Core Animation doesn't animate skew changes properly. If the skew value
-    // changes over the course of the animation then we have to manually
-    // compute the `CATransform3D` for each frame individually.
-    let requiresManualInterpolation = transformModel.hasSkewAnimation
+    let requiresManualInterpolation =
+      // Core Animation doesn't animate skew changes properly. If the skew value
+      // changes over the course of the animation then we have to manually
+      // compute the `CATransform3D` for each frame individually.
+      transformModel.hasSkewAnimation
+      // `addAnimation` requires that we use an `Interpolatable` value, but we can't interpolate a `CATransform3D`.
+      // Since this is only necessary when using `complexTimeRemapping`, we can avoid this by manually interpolating
+      // when `context.mustUseComplexTimeRemapping` is true and just returning a `Hold` container.
+      // Since our keyframes are already manually interpolated, they won't need to be interpolated again.
+      || context.mustUseComplexTimeRemapping
 
     let combinedTransformKeyframes = Keyframes.combined(
       transformModel.anchorPoint,
@@ -272,7 +278,7 @@ extension CALayer {
       requiresManualInterpolation: requiresManualInterpolation,
       makeCombinedResult: {
         anchor, position, positionX, positionY, scale, rotationX, rotationY, rotationZ, skew, skewAxis
-          -> CATransform3D in
+          -> Hold<CATransform3D> in
 
         let transformPosition: CGPoint
         if transformModel._positionX != nil, transformModel._positionY != nil {
@@ -281,7 +287,7 @@ extension CALayer {
           transformPosition = position.pointValue
         }
 
-        return CATransform3D.makeTransform(
+        let transform = CATransform3D.makeTransform(
           anchor: anchor.pointValue,
           position: transformPosition,
           scale: scale.sizeValue,
@@ -290,12 +296,14 @@ extension CALayer {
           rotationZ: rotationZ.cgFloatValue,
           skew: skew.cgFloatValue,
           skewAxis: skewAxis.cgFloatValue)
+
+        return Hold(value: transform)
       })
 
     try addAnimation(
       for: .transform,
       keyframes: combinedTransformKeyframes,
-      value: { $0 },
+      value: { $0.value },
       context: context)
   }
 
@@ -305,8 +313,8 @@ extension TransformModel {
   /// Whether or not this transform has a non-zero skew value
   var hasSkew: Bool {
     guard
-      let _skew = _skew,
-      let _skewAxis = _skewAxis,
+      let _skew,
+      let _skewAxis,
       !_skew.keyframes.isEmpty,
       !_skewAxis.keyframes.isEmpty
     else {
@@ -320,8 +328,8 @@ extension TransformModel {
   var hasSkewAnimation: Bool {
     guard
       hasSkew,
-      let _skew = _skew,
-      let _skewAxis = _skewAxis
+      let _skew,
+      let _skewAxis
     else { return false }
 
     return _skew.keyframes.count > 1