lottie-ios 4.5.0 → 4.5.1

package/.github/workflows/main.yml

@@ -16,7 +16,7 @@ jobs:
         xcode:
         - '15.0.1' # Swift 5.9, but no visionOS support
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/setup
         with:
           xcode: ${{ matrix.xcode }}
@@ -34,7 +34,7 @@ jobs:
         - '15.2' # Swift 5.9
         - '15.3' # Swift 5.10
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/setup
         with:
           xcode: ${{ matrix.xcode }}
@@ -46,7 +46,7 @@ jobs:
     name: "Build Example App"
     runs-on: macos-14
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/setup
         with:
           xcode: '15.3' # Swift 5.10
@@ -57,7 +57,7 @@ jobs:
     name: "Test Package"
     runs-on: macos-14
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/setup
         with:
           xcode: '15.3' # Swift 5.10
@@ -68,7 +68,7 @@ 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
@@ -77,7 +77,7 @@ jobs:
     name: "Emerge Upload"
     runs-on: macos-14
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/setup
       - name: Build Package
         run: bundle exec rake emerge:upload
@@ -100,8 +100,8 @@ jobs:
           #    Xcode 15.0 can use an XCFramework built by Xcode 15.2.
           - '15.2' # Swift 5.9, first Xcode version with visionOS support.
     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 }}
@@ -110,9 +110,9 @@ jobs:
         with:
           xcode: ${{ matrix.xcode }}
       - name: Build XCFramework
-        run: bundle exec rake build:xcframework[Lottie-Xcode-${{ matrix.xcode }}]
+        run: bundle exec rake build:xcframework
       - name: Upload XCFramework
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: BuildProducts
           path: .build/archives
@@ -125,7 +125,7 @@ jobs:
         xcode:
           - '15.3' # Swift 5.10
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/setup
         with:
           install-mint: false
@@ -141,7 +141,7 @@ jobs:
         xcode:
         - '15.3' # Swift 5.10
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/setup
         with:
           install-mint: true
@@ -153,7 +153,7 @@ jobs:
     name: "Test Carthage support"
     runs-on: macos-14
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/setup
         with:
           install-mint: true
@@ -166,7 +166,7 @@ jobs:
     name: "Lint Swift"
     runs-on: macos-14
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/setup
       - name: Lint Swift
         run: bundle exec rake lint:swift
@@ -175,7 +175,7 @@ jobs:
     name: "Lint Embedded Libraries"
     runs-on: macos-14
     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.xcworkspace/xcuserdata/calstephens.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -7,30 +7,17 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "9F6F6DCE-17A1-4400-B8C2-87FC3C2073DF"
-            shouldBeEnabled = "No"
-            condition = "customShape.direction != nil"
+            uuid = "608732A3-8389-4BD4-A600-81DB4BAB3BEB"
+            shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "Sources/Private/CoreAnimation/Animations/ShapeAnimation.swift"
+            filePath = "Sources/Public/Animation/LottieAnimationLayer.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "18"
-            endingLineNumber = "18"
-            landmarkName = "CAShapeLayer"
-            landmarkType = "21">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
-         <BreakpointContent
-            uuid = "CC6852A0-E9B0-4870-9299-A62D4DE8C83A"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            breakpointStackSelectionBehavior = "1"
-            scope = "1"
-            stopOnStyle = "0">
+            startingLineNumber = "689"
+            endingLineNumber = "689"
+            landmarkName = "currentTime"
+            landmarkType = "24">
          </BreakpointContent>
       </BreakpointProxy>
    </Breakpoints>

package/Lottie.xcworkspace/xcuserdata/calstephens.xcuserdatad/xcdebugger/Expressions.xcexplist

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VariablesViewState
+   version = "1.0">
+   <ContextStates>
+      <ContextState
+         contextName = "CoreAnimationLayer.init(animation:imageProvider:textProvider:fontProvider:maskAnimationToBounds:compatibilityTrackerMode:logger:):CoreAnimationLayer.swift">
+      </ContextState>
+      <ContextState
+         contextName = "CAShapeLayer.addAnimations(for:context:pathMultiplier:transformPath:roundedCorners:):CustomPathAnimation.swift">
+      </ContextState>
+      <ContextState
+         contextName = "closure #1 in CAShapeLayer.addAnimations(for:context:pathMultiplier:transformPath:roundedCorners:):CustomPathAnimation.swift">
+      </ContextState>
+   </ContextStates>
+</VariablesViewState>

package/Package.resolved

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

package/Package.swift

@@ -5,7 +5,12 @@ 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"])],
+  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/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

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

@@ -82,3 +82,10 @@ extension CombinedShapeItem {
       name: name)
   }
 }
+
+// MARK: Sendable
+
+/// `CombinedShapeItem` inherits `@unchecked Sendable` from `ShapeItem` and
+/// we need to restate that here to avoid a warning in Xcode 16
+// swiftlint:disable:next no_unchecked_sendable
+extension CombinedShapeItem: @unchecked Sendable { }

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

@@ -61,8 +61,8 @@ struct BezierPathKeyframe: Interpolatable {
   /// that can have different counts / timing parameters
   static func combining(
     path: KeyframeGroup<BezierPath>,
-    cornerRadius: KeyframeGroup<LottieVector1D>?) throws
-    -> KeyframeGroup<BezierPathKeyframe>
+    cornerRadius: KeyframeGroup<LottieVector1D>?)
+    throws -> KeyframeGroup<BezierPathKeyframe>
   {
     guard
       let cornerRadius,

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

@@ -23,6 +23,7 @@ extension Stroke: StrokeShapeItem {
 
   func copy(width: KeyframeGroup<LottieVector1D>) -> StrokeShapeItem {
     // Type-erase the copy from `Stroke` to `StrokeShapeItem`
+    // swiftformat:disable:next redundantProperty
     let copy: Stroke = copy(width: width)
     return copy
   }
@@ -35,6 +36,7 @@ extension GradientStroke: StrokeShapeItem {
 
   func copy(width: KeyframeGroup<LottieVector1D>) -> StrokeShapeItem {
     // Type-erase the copy from `GradientStroke` to `StrokeShapeItem`
+    // swiftformat:disable:next redundantProperty
     let copy: GradientStroke = copy(width: width)
     return copy
   }

package/Sources/Private/CoreAnimation/CoreAnimationLayer.swift

@@ -424,9 +424,11 @@ extension CoreAnimationLayer: RootAnimationLayer {
   var respectAnimationFrameRate: Bool {
     get { false }
     set {
-      logger.assertionFailure("""
-        The Core Animation rendering engine currently doesn't support `respectAnimationFrameRate`)
-        """)
+      if newValue {
+        logger.assertionFailure("""
+          The Core Animation rendering engine currently doesn't support `respectAnimationFrameRate`)
+          """)
+      }
     }
   }
 
@@ -495,6 +497,14 @@ extension CoreAnimationLayer: RootAnimationLayer {
     rebuildCurrentAnimation()
   }
 
+  func removeValueProvider(for keypath: AnimationKeypath) {
+    valueProviderStore.removeValueProvider(for: keypath)
+
+    // We need to rebuild the current animation after removing a value provider,
+    // since any existing `CAAnimation`s could now be out of date.
+    rebuildCurrentAnimation()
+  }
+
   func getValue(for _: AnimationKeypath, atFrame _: AnimationFrameTime?) -> Any? {
     logger.assertionFailure("""
       The Core Animation rendering engine doesn't support querying values for individual frames
@@ -584,7 +594,7 @@ extension CALayer {
     var numberOfSublayersWithTimeRemapping = 0
 
     for sublayer in sublayers ?? [] {
-      if 
+      if
         let preCompLayer = sublayer as? PreCompLayer,
         preCompLayer.preCompLayer.timeRemapping != nil
       {

package/Sources/Private/CoreAnimation/Layers/GradientRenderLayer.swift

@@ -25,7 +25,7 @@ final class GradientRenderLayer: CAGradientLayer {
 
   /// The reference bounds within this layer that the gradient's
   /// `startPoint` and `endPoint` should be calculated relative to
-  var gradientReferenceBounds: CGRect = .zero {
+  var gradientReferenceBounds = CGRect.zero {
     didSet {
       if oldValue != gradientReferenceBounds {
         updateLayout()

package/Sources/Private/CoreAnimation/ValueProviderStore.swift

@@ -40,6 +40,11 @@ final class ValueProviderStore {
     valueProviders.append((keypath: keypath, valueProvider: valueProvider))
   }
 
+  /// Removes all ValueProviders for the given `AnimationKeypath`
+  func removeValueProvider(for keypath: AnimationKeypath) {
+    valueProviders.removeAll(where: { $0.keypath.matches(keypath) })
+  }
+
   /// Retrieves the custom value keyframes for the given property,
   /// if an `AnyValueProvider` was registered for the given keypath.
   func customKeyframes<Value>(

package/Sources/Private/EmbeddedLibraries/EpoxyCore/Diffing/Collection+Diff.swift

@@ -203,7 +203,7 @@ extension Collection where Element: DiffableSection, Index == Int {
 
 // MARK: - EpoxyEntry
 
-/// A bookkeeping refrence type for the diffing algorithm.
+/// A bookkeeping reference type for the diffing algorithm.
 private final class EpoxyEntry {
 
   // MARK: Internal

package/Sources/Private/EmbeddedLibraries/EpoxyCore/Diffing/IndexChangeset.swift

@@ -116,7 +116,7 @@ struct IndexPathChangeset {
     inserts.isEmpty && deletes.isEmpty && updates.isEmpty && moves.isEmpty
   }
 
-  static func += (left: inout IndexPathChangeset, right: IndexPathChangeset) {
+  static func +=(left: inout IndexPathChangeset, right: IndexPathChangeset) {
     left.inserts += right.inserts
     left.deletes += right.deletes
     left.updates += right.updates

package/Sources/Private/EmbeddedLibraries/EpoxyCore/Logging/EpoxyLogger.swift

@@ -11,14 +11,14 @@ final class EpoxyLogger {
     assert: @escaping Assert = { condition, message, file, line in
       // If we default to `Swift.assert` directly with `assert: Assert = Swift.assert`,
       // the call will unexpectedly not respect the -O flag and will crash in release
-      // https://github.com/apple/swift/issues/60249
+      // https://github.com/swiftlang/swift/issues/60249
       Swift.assert(condition(), message(), file: file, line: line)
     },
     assertionFailure: @escaping AssertionFailure = { message, file, line in
       // If we default to `Swift.assertionFailure` directly with
       // `assertionFailure: AssertionFailure = Swift.assertionFailure`,
       // the call will unexpectedly not respect the -O flag and will crash in release
-      // https://github.com/apple/swift/issues/60249
+      // https://github.com/swiftlang/swift/issues/60249
       Swift.assertionFailure(message(), file: file, line: line)
     },
     warn: @escaping Warn = { message, _, _ in

package/Sources/Private/EmbeddedLibraries/EpoxyCore/SwiftUI/SwiftUIView.swift

@@ -36,7 +36,7 @@ struct SwiftUIView<Content: ViewType, Storage>: MeasuringViewRepresentable,
 
   var configurations: [Configuration] = []
 
-  var sizing: SwiftUIMeasurementContainerStrategy = .automatic
+  var sizing = SwiftUIMeasurementContainerStrategy.automatic
 
   // MARK: Private
 

package/Sources/Private/EmbeddedLibraries/LRUCache/LRUCache.swift

@@ -43,8 +43,8 @@ let LRUCacheMemoryWarningNotification: NSNotification.Name =
 #else
 
 /// Notification that cache should be cleared
-let LRUCacheMemoryWarningNotification: NSNotification.Name =
-  .init("LRUCacheMemoryWarningNotification")
+let LRUCacheMemoryWarningNotification =
+  NSNotification.Name("LRUCacheMemoryWarningNotification")
 
 #endif
 
@@ -99,7 +99,7 @@ final class LRUCache<Key: Hashable, Value> {
   private var values: [Key: Container] = [:]
   private unowned(unsafe) var head: Container?
   private unowned(unsafe) var tail: Container?
-  private let lock: NSLock = .init()
+  private let lock = NSLock()
   private var token: AnyObject?
   private let notificationCenter: NotificationCenter
 

package/Sources/Private/EmbeddedLibraries/ZipFoundation/Archive+Helpers.swift

@@ -70,7 +70,8 @@ extension Archive {
     compressionMethod: CompressionMethod,
     bufferSize: Int,
     progress: Progress? = nil,
-    provider: Provider) throws -> (sizeWritten: Int64, crc32: CRC32)
+    provider: Provider)
+    throws -> (sizeWritten: Int64, crc32: CRC32)
   {
     var checksum = CRC32(0)
     var sizeWritten = Int64(0)
@@ -266,7 +267,8 @@ extension Archive {
     size: Int64,
     bufferSize: Int,
     progress: Progress? = nil,
-    provider: Provider) throws -> (sizeWritten: Int64, checksum: CRC32)
+    provider: Provider)
+    throws -> (sizeWritten: Int64, checksum: CRC32)
   {
     var position: Int64 = 0
     var sizeWritten: Int64 = 0
@@ -287,7 +289,8 @@ extension Archive {
     size: Int64,
     bufferSize: Int,
     progress: Progress? = nil,
-    provider: Provider) throws -> (sizeWritten: Int64, checksum: CRC32)
+    provider: Provider)
+    throws -> (sizeWritten: Int64, checksum: CRC32)
   {
     var sizeWritten: Int64 = 0
     let consumer: Consumer = { data in sizeWritten += Int64(try Data.write(chunk: data, to: self.archiveFile)) }

package/Sources/Private/EmbeddedLibraries/ZipFoundation/Archive.swift

@@ -171,21 +171,6 @@ final class Archive: Sequence {
   var zip64EndOfCentralDirectory: ZIP64EndOfCentralDirectory?
   var preferredEncoding: String.Encoding?
 
-  var totalNumberOfEntriesInCentralDirectory: UInt64 {
-    zip64EndOfCentralDirectory?.record.totalNumberOfEntriesInCentralDirectory
-      ?? UInt64(endOfCentralDirectoryRecord.totalNumberOfEntriesInCentralDirectory)
-  }
-
-  var sizeOfCentralDirectory: UInt64 {
-    zip64EndOfCentralDirectory?.record.sizeOfCentralDirectory
-      ?? UInt64(endOfCentralDirectoryRecord.sizeOfCentralDirectory)
-  }
-
-  var offsetToStartOfCentralDirectory: UInt64 {
-    zip64EndOfCentralDirectory?.record.offsetToStartOfCentralDirectory
-      ?? UInt64(endOfCentralDirectoryRecord.offsetToStartOfCentralDirectory)
-  }
-
   #if swift(>=5.0)
   var memoryFile: MemoryFile?
 
@@ -221,6 +206,21 @@ final class Archive: Sequence {
   }
   #endif
 
+  var totalNumberOfEntriesInCentralDirectory: UInt64 {
+    zip64EndOfCentralDirectory?.record.totalNumberOfEntriesInCentralDirectory
+      ?? UInt64(endOfCentralDirectoryRecord.totalNumberOfEntriesInCentralDirectory)
+  }
+
+  var sizeOfCentralDirectory: UInt64 {
+    zip64EndOfCentralDirectory?.record.sizeOfCentralDirectory
+      ?? UInt64(endOfCentralDirectoryRecord.sizeOfCentralDirectory)
+  }
+
+  var offsetToStartOfCentralDirectory: UInt64 {
+    zip64EndOfCentralDirectory?.record.offsetToStartOfCentralDirectory
+      ?? UInt64(endOfCentralDirectoryRecord.offsetToStartOfCentralDirectory)
+  }
+
   // MARK: - Helpers
 
   static func scanForEndOfCentralDirectoryRecord(in file: FILEPointer)

package/Sources/Private/EmbeddedLibraries/ZipFoundation/Data+Serialization.swift

@@ -38,10 +38,9 @@ extension Data {
     guard let data = try? readChunk(of: T.size, from: file) else {
       return nil
     }
-    let structure = T(data: data, additionalDataProvider: { additionalDataSize -> Data in
+    return T(data: data, additionalDataProvider: { additionalDataSize -> Data in
       try self.readChunk(of: additionalDataSize, from: file)
     })
-    return structure
   }
 
   static func consumePart(

package/Sources/Private/EmbeddedLibraries/ZipFoundation/Entry.swift

@@ -237,7 +237,7 @@ struct Entry: Equatable {
     return dataOffset
   }
 
-  static func == (lhs: Entry, rhs: Entry) -> Bool {
+  static func ==(lhs: Entry, rhs: Entry) -> Bool {
     lhs.path == rhs.path
       && lhs.localFileHeader.crc32 == rhs.localFileHeader.crc32
       && lhs.centralDirectoryStructure.effectiveRelativeOffsetOfLocalHeader

package/Sources/Private/EmbeddedLibraries/ZipFoundation/FileManager+ZIP.swift

@@ -89,8 +89,7 @@ extension FileManager {
     #endif
 
     let timeStamp = TimeInterval(modTimeSpec.tv_sec) + TimeInterval(modTimeSpec.tv_nsec) / 1000000000.0
-    let modDate = Date(timeIntervalSince1970: timeStamp)
-    return modDate
+    return Date(timeIntervalSince1970: timeStamp)
   }
 
   class func fileSizeForItem(at url: URL) throws -> Int64 {
@@ -308,7 +307,7 @@ extension Date {
   // MARK: Internal
 
   var fileModificationDateTime: (UInt16, UInt16) {
-    (self.fileModificationDate, self.fileModificationTime)
+    (fileModificationDate, fileModificationTime)
   }
 
   var fileModificationDate: UInt16 {

package/Sources/Private/MainThread/LayerContainers/CompLayers/CompositionLayer.swift

@@ -31,26 +31,26 @@ class CompositionLayer: CALayer, KeypathSearchable {
     super.init()
     anchorPoint = .zero
     actions = [
-      "opacity" : NSNull(),
-      "transform" : NSNull(),
-      "bounds" : NSNull(),
-      "anchorPoint" : NSNull(),
-      "sublayerTransform" : NSNull(),
-      "shadowOpacity" : NSNull(),
-      "shadowOffset" : NSNull(),
-      "shadowColor" : NSNull(),
-      "shadowRadius" : NSNull(),
+      "opacity": NSNull(),
+      "transform": NSNull(),
+      "bounds": NSNull(),
+      "anchorPoint": NSNull(),
+      "sublayerTransform": NSNull(),
+      "shadowOpacity": NSNull(),
+      "shadowOffset": NSNull(),
+      "shadowColor": NSNull(),
+      "shadowRadius": NSNull(),
     ]
 
     contentsLayer.anchorPoint = .zero
     contentsLayer.bounds = CGRect(origin: .zero, size: size)
     contentsLayer.actions = [
-      "opacity" : NSNull(),
-      "transform" : NSNull(),
-      "bounds" : NSNull(),
-      "anchorPoint" : NSNull(),
-      "sublayerTransform" : NSNull(),
-      "hidden" : NSNull(),
+      "opacity": NSNull(),
+      "transform": NSNull(),
+      "bounds": NSNull(),
+      "anchorPoint": NSNull(),
+      "sublayerTransform": NSNull(),
+      "hidden": NSNull(),
     ]
     compositingFilter = layer.blendMode.filterName
     addSublayer(contentsLayer)

package/Sources/Private/MainThread/LayerContainers/CompLayers/ImageCompositionLayer.swift

@@ -46,7 +46,7 @@ final class ImageCompositionLayer: CompositionLayer {
     }
   }
 
-  var imageContentsGravity: CALayerContentsGravity = .resize {
+  var imageContentsGravity = CALayerContentsGravity.resize {
     didSet {
       contentsLayer.contentsGravity = imageContentsGravity
     }

package/Sources/Private/MainThread/LayerContainers/CompLayers/MaskContainerLayer.swift

@@ -108,7 +108,7 @@ private class MaskLayer: CALayer {
       : .rgb(0, 1, 0)
     maskLayer.fillRule = CAShapeLayerFillRule.evenOdd
     actions = [
-      "opacity" : NSNull(),
+      "opacity": NSNull(),
     ]
   }
 
@@ -168,9 +168,9 @@ private class MaskNodeProperties: NodePropertyMap {
     shape = NodeProperty(provider: KeyframeInterpolator(keyframes: mask.shape.keyframes))
     expansion = NodeProperty(provider: KeyframeInterpolator(keyframes: mask.expansion.keyframes))
     propertyMap = [
-      PropertyName.opacity.rawValue : opacity,
-      "Shape" : shape,
-      "Expansion" : expansion,
+      PropertyName.opacity.rawValue: opacity,
+      "Shape": shape,
+      "Expansion": expansion,
     ]
     properties = Array(propertyMap.values)
   }

package/Sources/Private/MainThread/LayerContainers/CompLayers/PreCompositionLayer.swift

@@ -107,7 +107,7 @@ final class PreCompositionLayer: CompositionLayer {
     guard let remappingNode else {
       return super.keypathProperties
     }
-    return ["Time Remap" : remappingNode]
+    return ["Time Remap": remappingNode]
   }
 
   override func displayContentsWithFrame(frame: CGFloat, forceUpdates: Bool) {

package/Sources/Private/MainThread/LayerContainers/CompLayers/SolidCompositionLayer.swift

@@ -45,7 +45,7 @@ final class SolidCompositionLayer: CompositionLayer {
 
   override var keypathProperties: [String: AnyNodeProperty] {
     guard let colorProperty else { return super.keypathProperties }
-    return [PropertyName.color.rawValue : colorProperty]
+    return [PropertyName.color.rawValue: colorProperty]
   }
 
   override func displayContentsWithFrame(frame: CGFloat, forceUpdates _: Bool) {

package/Sources/Private/MainThread/LayerContainers/MainThreadAnimationLayer.swift

@@ -241,6 +241,17 @@ final class MainThreadAnimationLayer: CALayer, RootAnimationLayer {
     }
   }
 
+  func removeValueProvider(for keypath: AnimationKeypath) {
+    for layer in animationLayers {
+      if let foundProperties = layer.nodeProperties(for: keypath) {
+        for property in foundProperties {
+          property.removeProvider()
+        }
+        layer.displayWithFrame(frame: presentation()?.currentFrame ?? currentFrame, forceUpdates: true)
+      }
+    }
+  }
+
   func getValue(for keypath: AnimationKeypath, atFrame: CGFloat?) -> Any? {
     for layer in animationLayers {
       if

package/Sources/Private/MainThread/LayerContainers/Utility/CompositionLayersInitializer.swift

@@ -22,7 +22,7 @@ extension [LayerModel] {
     -> [CompositionLayer]
   {
     var compositionLayers = [CompositionLayer]()
-    var layerMap = [Int : CompositionLayer]()
+    var layerMap = [Int: CompositionLayer]()
 
     /// Organize the assets into a dictionary of [ID : ImageAsset]
     var childLayers = [LayerModel]()