lottie-ios 4.1.2 → 4.2.0

package/Lottie.xcodeproj/xcuserdata/calstephens.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -12,12 +12,12 @@
 		<key>Lottie (macOS).xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>4</integer>
+			<integer>3</integer>
 		</dict>
 		<key>Lottie (tvOS).xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>5</integer>
+			<integer>4</integer>
 		</dict>
 	</dict>
 </dict>

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

@@ -68,5 +68,263 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "F26C2C9A-5A5F-482E-9611-B74F8D65E1D9"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Sources/Private/Utility/Extensions/DataExtension.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "31"
+            endingLineNumber = "31"
+            landmarkName = "init(assetName:in:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "780F4614-9704-4CED-973D-AA8D154C4D4E"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Sources/Private/CoreAnimation/Layers/ShapeLayer.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "241"
+            endingLineNumber = "241"
+            landmarkName = "CALayer"
+            landmarkType = "21">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "7317D33F-83F7-487F-92D8-361AFDC3108F"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Sources/Private/CoreAnimation/Layers/AnimationLayer.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "59"
+            endingLineNumber = "59"
+            landmarkName = "addingKeypathComponent(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "4801815C-7DE8-430B-B7F8-900C71CB5F58"
+            shouldBeEnabled = "No"
+            condition = "customizableProperty.name.map { $0.rawValue } == [&quot;Position&quot;]"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Sources/Private/CoreAnimation/Animations/CALayer+addAnimation.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "105"
+            endingLineNumber = "105"
+            landmarkName = "CALayer"
+            landmarkType = "21">
+            <Locations>
+               <Location
+                  uuid = "4801815C-7DE8-430B-B7F8-900C71CB5F58 - a53351c05a040cfb"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "__C.CALayer.customizedAnimation&lt;&#x3c4;_0_0&gt;(for: Lottie.LayerProperty&lt;&#x3c4;_0_0&gt;, context: Lottie.LayerAnimationContext) throws -&gt; Swift.Optional&lt;__C.CAPropertyAnimation&gt;"
+                  moduleName = "Lottie"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/calstephens/Documents/lottie/Sources/Private/CoreAnimation/Animations/CALayer+addAnimation.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "106"
+                  endingLineNumber = "106"
+                  offsetFromSymbolStart = "156">
+               </Location>
+               <Location
+                  uuid = "4801815C-7DE8-430B-B7F8-900C71CB5F58 - a53351c05a040cfb"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "__C.CALayer.customizedAnimation&lt;&#x3c4;_0_0&gt;(for: Lottie.LayerProperty&lt;&#x3c4;_0_0&gt;, context: Lottie.LayerAnimationContext) throws -&gt; Swift.Optional&lt;__C.CAPropertyAnimation&gt;"
+                  moduleName = "Lottie"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/calstephens/Documents/lottie/Sources/Private/CoreAnimation/Animations/CALayer+addAnimation.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "106"
+                  endingLineNumber = "106"
+                  offsetFromSymbolStart = "220">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "F52F692F-1F08-4469-8EE8-C10D7FC89847"
+            shouldBeEnabled = "No"
+            condition = "context.currentKeypath.fullPath.contains(&quot;Group 1&quot;)"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Sources/Private/CoreAnimation/Layers/ShapeItemLayer.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "342"
+            endingLineNumber = "342"
+            landmarkName = "`for`(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "A8A829E3-8C9D-40A2-96C0-111C9B6F69B9"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Sources/Private/CoreAnimation/Animations/LayerProperty.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "306"
+            endingLineNumber = "306"
+            landmarkName = "rotation"
+            landmarkType = "24">
+            <Locations>
+               <Location
+                  uuid = "A8A829E3-8C9D-40A2-96C0-111C9B6F69B9 - 6c551e311a4aacb0"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "closure #1 (Any) -&gt; Swift.Optional&lt;CoreGraphics.CGFloat&gt; in static Lottie.CustomizableProperty.scaleY.getter : Lottie.CustomizableProperty&lt;CoreGraphics.CGFloat&gt;"
+                  moduleName = "Lottie"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/calstephens/Documents/lottie/Sources/Private/CoreAnimation/Animations/LayerProperty.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "292"
+                  endingLineNumber = "292"
+                  offsetFromSymbolStart = "296">
+               </Location>
+               <Location
+                  uuid = "A8A829E3-8C9D-40A2-96C0-111C9B6F69B9 - 6c551e311a4aacb0"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "closure #1 (Any) -&gt; Swift.Optional&lt;CoreGraphics.CGFloat&gt; in static Lottie.CustomizableProperty.scaleY.getter : Lottie.CustomizableProperty&lt;CoreGraphics.CGFloat&gt;"
+                  moduleName = "Lottie"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/calstephens/Documents/lottie/Sources/Private/CoreAnimation/Animations/LayerProperty.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "292"
+                  endingLineNumber = "292"
+                  offsetFromSymbolStart = "344">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "083F77B7-FF28-4132-ADBB-D0EA9B91C736"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Sources/Private/CoreAnimation/Animations/LayerProperty.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "293"
+            endingLineNumber = "293"
+            landmarkName = "scaleY"
+            landmarkType = "24">
+            <Locations>
+               <Location
+                  uuid = "083F77B7-FF28-4132-ADBB-D0EA9B91C736 - 6c551e311a4ab35d"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "closure #1 (Any) -&gt; Swift.Optional&lt;CoreGraphics.CGFloat&gt; in static Lottie.CustomizableProperty.scaleX.getter : Lottie.CustomizableProperty&lt;CoreGraphics.CGFloat&gt;"
+                  moduleName = "Lottie"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/calstephens/Documents/lottie/Sources/Private/CoreAnimation/Animations/LayerProperty.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "279"
+                  endingLineNumber = "279"
+                  offsetFromSymbolStart = "296">
+               </Location>
+               <Location
+                  uuid = "083F77B7-FF28-4132-ADBB-D0EA9B91C736 - 6c551e311a4ab35d"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "closure #1 (Any) -&gt; Swift.Optional&lt;CoreGraphics.CGFloat&gt; in static Lottie.CustomizableProperty.scaleX.getter : Lottie.CustomizableProperty&lt;CoreGraphics.CGFloat&gt;"
+                  moduleName = "Lottie"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/calstephens/Documents/lottie/Sources/Private/CoreAnimation/Animations/LayerProperty.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "279"
+                  endingLineNumber = "279"
+                  offsetFromSymbolStart = "344">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "232AD61E-2983-4DD6-A6D6-721AA2D12700"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Sources/Private/CoreAnimation/Animations/LayerProperty.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "305"
+            endingLineNumber = "305"
+            landmarkName = "rotation"
+            landmarkType = "24">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "DE9A3966-371D-4974-992F-6F20AF21055B"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Sources/Private/CoreAnimation/Animations/StrokeAnimation.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "73"
+            endingLineNumber = "73"
+            landmarkName = "addStrokeAnimations(for:context:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "B61AB02D-FB91-45DD-BAA4-59D15A088394"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Sources/Private/CoreAnimation/Animations/ShapeAnimation.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "116"
+            endingLineNumber = "116"
+            landmarkName = "Trim"
+            landmarkType = "21">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

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

@@ -105,6 +105,17 @@
       <ContextState
          contextName = "GroupLayer.init(group:items:groupPath:context:):ShapeLayer.swift">
       </ContextState>
+      <ContextState
+         contextName = "RoundedCornersNode.rebuildOutputs(frame:):RoundedCornersNode.swift">
+         <PersistentStrings>
+            <PersistentString
+               value = "path">
+            </PersistentString>
+            <PersistentString
+               value = "UIBezierPath(cgPath: path.roundCorners(radius: 2).paths[0].cgPath())">
+            </PersistentString>
+         </PersistentStrings>
+      </ContextState>
       <ContextState
          contextName = "CALayer.addTransformAnimations(for:context:):TransformAnimations.swift">
       </ContextState>
@@ -118,10 +129,10 @@
          contextName = "CoreAnimationLayer.display():CoreAnimationLayer.swift">
          <PersistentStrings>
             <PersistentString
-               value = "(superlayer!.delegate! as! UIView).superview!">
+               value = "(superlayer!.delegate! as! UIView).window">
             </PersistentString>
             <PersistentString
-               value = "(superlayer!.delegate! as! UIView).window">
+               value = "(superlayer!.delegate! as! UIView).superview!">
             </PersistentString>
          </PersistentStrings>
       </ContextState>

package/Package.swift

@@ -3,7 +3,8 @@ import PackageDescription
 
 let package = Package(
   name: "Lottie",
-  platforms: [.iOS("11.0"), .macOS("10.10"), .tvOS("11.0")],
+  // Minimum platform versions should be kept in sync with the per-platform targets in Lottie.xcodeproj and lottie-ios.podspec
+  platforms: [.iOS("11.0"), .macOS("10.11"), .tvOS("11.0")],
   products: [.library(name: "Lottie", targets: ["Lottie"])],
   targets: [.target(name: "Lottie", path: "Sources")])
 

package/README.md

@@ -8,7 +8,7 @@ Lottie is a cross-platform library for iOS, macOS, tvOS, [Android](https://githu
 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).
 
 Designers can create **and ship** beautiful animations without an engineer painstakingly recreating them by hand.
-Since the animation is backed by JSON they are extremely small in size but can be large in complexity!
+Since the animations are backed by JSON, they are extremely small in size but can be large in complexity!
 Animations can be played, resized, looped, sped up, slowed down, reversed, and even interactively scrubbed.
 Lottie can play or loop just a portion of the animation as well, the possibilities are endless!
 Animations can even be ***changed at runtime*** in various ways! Change the color, position, or any keyframable value!
@@ -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.1.2")
+.package(url: "https://github.com/airbnb/lottie-spm.git", from: "4.2.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. 
@@ -88,7 +88,7 @@ We always appreciate contributions from the community. To make changes to the pr
 
 All pull requests with new features or bug fixes that affect how animations render should include snapshot test cases that validate the included changes. 
   - To add a new sample animation to the snapshot testing suite, you can add the `.json` file to `Tests/Samples`. Re-run the snapshot tests to generate the new snapshot image files.
-  - To update existing snapshots after making changes, you can set `isRecording = true` in `SnapshotTests.swift` and then re-run the snapshot tests.
+  - To update existing snapshots after making changes, you can set `isRecording = true` in `SnapshotTests.swift` `setUp()` method and then re-run the snapshot tests.
 
 The project also includes several helpful commands defined in our [Rakefile](https://github.com/airbnb/lottie-ios/blob/master/Rakefile). To use these, you need to install [Bundler](https://bundler.io/):
 

package/Rakefile

@@ -30,7 +30,7 @@ namespace :build do
 
     desc 'Builds the iOS Lottie Example app'
     task :iOS do
-      xcodebuild('build -scheme "Example (iOS)" -destination "platform=iOS Simulator,name=iPhone 8" -workspace Lottie.xcworkspace')
+      xcodebuild('build -scheme "Example (iOS)" -destination "platform=iOS Simulator,name=iPhone SE (3rd generation)" -workspace Lottie.xcworkspace')
     end
 
     desc 'Builds the macOS Lottie Example app'
@@ -49,6 +49,7 @@ namespace :build do
     sh 'rm -rf .build/archives'
     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')
     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')
+    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')
     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')
     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')
     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')
@@ -57,13 +58,16 @@ namespace :build do
         '-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_macOS.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',
         '-output .build/archives/Lottie.xcframework'
       ].join(" "))
     Dir.chdir('.build/archives') do
-      sh 'zip -r Lottie.xcframework.zip Lottie.xcframework'
+      # 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 Lottie.xcframework.zip Lottie.xcframework'
       sh 'rm -rf Lottie.xcframework'
     end
     sh 'swift package compute-checksum .build/archives/Lottie.xcframework.zip'
@@ -74,7 +78,7 @@ namespace :test do
   desc 'Tests the Lottie package for iOS'
   task :package do
     sh 'rm -rf Tests/Artifacts'
-    xcodebuild('test -scheme "Lottie (iOS)" -destination "platform=iOS Simulator,name=iPhone 8" -resultBundlePath Tests/Artifacts/LottieTests.xcresult')
+    xcodebuild('test -scheme "Lottie (iOS)" -destination "platform=iOS Simulator,name=iPhone SE (3rd generation)" -resultBundlePath Tests/Artifacts/LottieTests.xcresult')
   end
 
   desc 'Processes .xcresult artifacts from the most recent test:package execution'
@@ -99,7 +103,7 @@ namespace :test do
       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 8"')
+      xcodebuild('build -scheme CarthageTest -destination "platform=iOS Simulator,name=iPhone SE (3rd generation)"')
       xcodebuild('build -scheme CarthageTest-macOS')
     end
   end

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

@@ -12,7 +12,7 @@ extension CALayer {
   @nonobjc
   func addAnimation<KeyframeValue, ValueRepresentation>(
     for property: LayerProperty<ValueRepresentation>,
-    keyframes: ContiguousArray<Keyframe<KeyframeValue>>,
+    keyframes: KeyframeGroup<KeyframeValue>,
     value keyframeValueMapping: (KeyframeValue) throws -> ValueRepresentation,
     context: LayerAnimationContext)
     throws
@@ -41,13 +41,27 @@ extension CALayer {
   @nonobjc
   private func defaultAnimation<KeyframeValue, ValueRepresentation>(
     for property: LayerProperty<ValueRepresentation>,
-    keyframes: ContiguousArray<Keyframe<KeyframeValue>>,
+    keyframes keyframeGroup: KeyframeGroup<KeyframeValue>,
     value keyframeValueMapping: (KeyframeValue) throws -> ValueRepresentation,
     context: LayerAnimationContext)
     throws -> CAAnimation?
   {
+    let keyframes = keyframeGroup.keyframes
     guard !keyframes.isEmpty else { return nil }
 
+    // Check if this set of keyframes uses After Effects expressions, which aren't supported.
+    if let unsupportedAfterEffectsExpression = keyframeGroup.unsupportedAfterEffectsExpression {
+      context.logger.info("""
+        `\(property.caLayerKeypath)` animation for "\(context.currentKeypath.fullPath)" \
+        includes an After Effects expression (https://helpx.adobe.com/after-effects/using/expression-language.html), \
+        which is not supported by lottie-ios (expressions are only supported by lottie-web). \
+        This animation may not play correctly.
+
+          \(unsupportedAfterEffectsExpression.replacingOccurrences(of: "\n", with: "\n  "))
+
+        """)
+    }
+
     // 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`.

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

@@ -14,7 +14,7 @@ extension CAShapeLayer {
   {
     try addAnimation(
       for: .path,
-      keyframes: combinedShapes.shapes.keyframes,
+      keyframes: combinedShapes.shapes,
       value: { paths in
         let combinedPath = CGMutablePath()
         for path in paths {

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

@@ -20,7 +20,7 @@ extension CAShapeLayer {
 
     try addAnimation(
       for: .path,
-      keyframes: combinedKeyframes.keyframes,
+      keyframes: combinedKeyframes,
       value: { pathKeyframe in
         var path = pathKeyframe.path
         if let cornerRadius = pathKeyframe.cornerRadius {

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

@@ -14,7 +14,7 @@ extension CAShapeLayer {
   {
     try addAnimation(
       for: .path,
-      keyframes: ellipse.combinedKeyframes().keyframes,
+      keyframes: ellipse.combinedKeyframes(),
       value: { keyframe in
         BezierPath.ellipse(
           size: keyframe.size.sizeValue,

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

@@ -57,7 +57,7 @@ extension GradientRenderLayer {
 
     try addAnimation(
       for: .colors,
-      keyframes: gradient.colors.keyframes,
+      keyframes: gradient.colors,
       value: { colorComponents in
         gradient.colorConfiguration(from: colorComponents, type: type).map { $0.color }
       },
@@ -65,7 +65,7 @@ extension GradientRenderLayer {
 
     try addAnimation(
       for: .locations,
-      keyframes: gradient.colors.keyframes,
+      keyframes: gradient.colors,
       value: { colorComponents in
         gradient.colorConfiguration(from: colorComponents, type: type).map { $0.location }
       },
@@ -94,7 +94,7 @@ extension GradientRenderLayer {
 
     try addAnimation(
       for: .startPoint,
-      keyframes: gradient.startPoint.keyframes,
+      keyframes: gradient.startPoint,
       value: { absoluteStartPoint in
         percentBasedPointInBounds(from: absoluteStartPoint.pointValue)
       },
@@ -102,7 +102,7 @@ extension GradientRenderLayer {
 
     try addAnimation(
       for: .endPoint,
-      keyframes: gradient.endPoint.keyframes,
+      keyframes: gradient.endPoint,
       value: { absoluteEndPoint in
         percentBasedPointInBounds(from: absoluteEndPoint.pointValue)
       },
@@ -128,13 +128,13 @@ extension GradientRenderLayer {
 
     try addAnimation(
       for: .startPoint,
-      keyframes: combinedKeyframes.keyframes,
+      keyframes: combinedKeyframes,
       value: \.startPoint,
       context: context)
 
     try addAnimation(
       for: .endPoint,
-      keyframes: combinedKeyframes.keyframes,
+      keyframes: combinedKeyframes,
       value: \.endPoint,
       context: context)
   }