lottie-ios 4.4.1 → 4.4.2

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

@@ -12,7 +12,6 @@ import SwiftUI
 ///
 /// Includes an optional generic `Storage` value, which can be used to compare old and new values
 /// across state changes to prevent redundant view updates.
-@available(iOS 13.0, tvOS 13.0, macOS 10.15, *)
 struct SwiftUIView<Content: ViewType, Storage>: MeasuringViewRepresentable,
   UIViewConfiguringSwiftUIView
 {
@@ -51,7 +50,6 @@ struct SwiftUIView<Content: ViewType, Storage>: MeasuringViewRepresentable,
 
 // MARK: UIViewRepresentable
 
-@available(iOS 13.0, tvOS 13.0, macOS 10.15, *)
 extension SwiftUIView {
   func makeCoordinator() -> Coordinator {
     Coordinator(storage: storage)
@@ -98,7 +96,6 @@ extension SwiftUIView {
 
 // MARK: SwiftUIView.ConfigurationContext
 
-@available(iOS 13.0, tvOS 13.0, macOS 10.15, *)
 extension SwiftUIView {
   /// The configuration context that's available to configure the `Content` view whenever the
   /// `updateUIView()` method is invoked via a configuration closure.
@@ -130,7 +127,6 @@ extension SwiftUIView {
 
 // MARK: SwiftUIView.Coordinator
 
-@available(iOS 13.0, tvOS 13.0, macOS 10.15, *)
 extension SwiftUIView {
   /// A coordinator that stores the `storage` associated with this view, enabling the old storage
   /// value to be accessed during the `updateUIView(…)`.

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

@@ -6,7 +6,6 @@ import SwiftUI
 
 // MARK: - ViewTypeProtocol + swiftUIView
 
-@available(iOS 13.0, tvOS 13.0, macOS 10.15, *)
 extension ViewTypeProtocol {
   /// Returns a SwiftUI `View` representing this `UIView`, constructed with the given `makeView`
   /// closure and sized with the given sizing configuration.

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

@@ -8,7 +8,6 @@ import SwiftUI
 
 /// A protocol describing a SwiftUI `View` that can configure its `UIView` content via an array of
 /// `configuration` closures.
-@available(iOS 13.0, tvOS 13.0, macOS 10.15, *)
 protocol UIViewConfiguringSwiftUIView: View {
   /// The context available to this configuration, which provides the `UIView` instance at a minimum
   /// but can include additional context as needed.
@@ -24,7 +23,6 @@ protocol UIViewConfiguringSwiftUIView: View {
 
 // MARK: Extensions
 
-@available(iOS 13.0, tvOS 13.0, macOS 10.15, *)
 extension UIViewConfiguringSwiftUIView {
   /// Returns a copy of this view updated to have the given closure applied to its represented view
   /// whenever it is updated via the `updateUIView(…)` method.

package/Sources/Private/EmbeddedLibraries/EpoxyCore/Views/ViewType.swift

@@ -12,14 +12,12 @@ typealias ViewType = UIView
 
 /// The platform's SwiftUI view representable type.
 /// Either `UIViewRepresentable` on iOS/tvOS or `NSViewRepresentable` on macOS.
-@available(iOS 13.0, tvOS 13.0, *)
 typealias ViewRepresentableType = UIViewRepresentable
 
 /// The platform's layout constraint priority type.
 /// Either `UILayoutPriority` on iOS/tvOS or `NSLayoutConstraint.Priority` on macOS.
 typealias LayoutPriorityType = UILayoutPriority
 
-@available(iOS 13.0, tvOS 13.0, *)
 extension ViewRepresentableType {
   /// The platform's view type for `ViewRepresentableType`.
   /// Either `UIViewType` on iOS/tvOS or `NSViewType` on macOS.
@@ -35,14 +33,12 @@ typealias ViewType = NSView
 
 /// The platform's SwiftUI view representable type.
 /// Either `UIViewRepresentable` on iOS/tvOS, or `NSViewRepresentable` on macOS.
-@available(macOS 10.15, *)
 typealias ViewRepresentableType = NSViewRepresentable
 
 /// The platform's layout constraint priority type.
 /// Either `UILayoutPriority` on iOS/tvOS, or `NSLayoutConstraint.Priority` on macOS.
 typealias LayoutPriorityType = NSLayoutConstraint.Priority
 
-@available(macOS 10.15, *)
 extension ViewRepresentableType {
   /// The platform's view type for `ViewRepresentableType`.
   /// Either `UIViewType` on iOS/tvOS or `NSViewType` on macOS.

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

@@ -184,7 +184,6 @@ final class CoreTextRenderLayer: CALayer {
   private var needsContentUpdate = false
 
   // Draws Debug colors for the font alignment.
-  @available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
   private func drawDebug(_ ctx: CGContext) {
     if let font {
       let ascent = CTFontGetAscent(font)

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

@@ -15,10 +15,7 @@ enum DotLottieUtils {
 
   /// Temp folder to app directory
   static var tempDirectoryURL: URL {
-    if #available(iOS 10.0, macOS 10.12, *) {
-      return FileManager.default.temporaryDirectory
-    }
-    return URL(fileURLWithPath: NSTemporaryDirectory())
+    FileManager.default.temporaryDirectory
   }
 }
 
@@ -56,7 +53,8 @@ public enum DotLottieError: Error {
   case noDataLoaded
   /// Asset with this name was not found in the provided bundle.
   case assetNotFound(name: String, bundle: Bundle?)
-  /// Animation loading from asset is not supported on macOS 10.10.
+  /// Animation loading from asset was not supported on macOS 10.10,
+  /// but this error is no longer used.
   case loadingFromAssetNotSupported
 
   @available(*, deprecated, message: "Unused")

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

@@ -22,15 +22,12 @@ extension Data {
       throw DotLottieError.assetNotFound(name: assetName, bundle: bundle)
     }
     #else
-    if #available(macOS 10.11, *) {
-      if let asset = NSDataAsset(name: assetName, bundle: bundle) {
-        self = asset.data
-        return
-      } else {
-        throw DotLottieError.assetNotFound(name: assetName, bundle: bundle)
-      }
+    if let asset = NSDataAsset(name: assetName, bundle: bundle) {
+      self = asset.data
+      return
+    } else {
+      throw DotLottieError.assetNotFound(name: assetName, bundle: bundle)
     }
-    throw DotLottieError.loadingFromAssetNotSupported
     #endif
   }
 }

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

@@ -272,12 +272,12 @@ extension CGPoint {
 
   /// Operator convenience to divide points with /
   static func / (lhs: CGPoint, rhs: CGFloat) -> CGPoint {
-    CGPoint(x: lhs.x / CGFloat(rhs), y: lhs.y / CGFloat(rhs))
+    CGPoint(x: lhs.x / rhs, y: lhs.y / rhs)
   }
 
   /// Operator convenience to multiply points with *
   static func * (lhs: CGPoint, rhs: CGFloat) -> CGPoint {
-    CGPoint(x: lhs.x * CGFloat(rhs), y: lhs.y * CGFloat(rhs))
+    CGPoint(x: lhs.x * rhs, y: lhs.y * rhs)
   }
 
   /// Operator convenience to add points with +

package/Sources/Private/Utility/Helpers/Binding+Map.swift

@@ -4,7 +4,6 @@
 #if canImport(SwiftUI)
 import SwiftUI
 
-@available(iOS 13.0, tvOS 13.0, macOS 10.15, *)
 extension Binding {
 
   /// Helper to transform a `Binding` from one `Value` type to another.

package/Sources/Private/Utility/Helpers/View+ValueChanged.swift

@@ -5,18 +5,31 @@
 import Combine
 import SwiftUI
 
-@available(iOS 13.0, tvOS 13.0, macOS 10.15, *)
 extension View {
   /// A backwards compatible wrapper for iOS 14 `onChange`
   @ViewBuilder
   func valueChanged<T: Equatable>(value: T, onChange: @escaping (T) -> Void) -> some View {
-    if #available(iOS 14.0, *, macOS 11.0, tvOS 14.0) {
+    #if compiler(>=5.9)
+    if #available(iOS 17.0, macOS 14.0, tvOS 17.0, visionOS 1.0, *) {
+      self.onChange(of: value) { _, newValue in
+        onChange(newValue)
+      }
+    } else if #available(iOS 14.0, macOS 11.0, tvOS 14.0, *) {
+      self.onChange(of: value, perform: onChange)
+    } else {
+      onReceive(Just(value)) { value in
+        onChange(value)
+      }
+    }
+    #else
+    if #available(iOS 14.0, macOS 11.0, tvOS 14.0, *) {
       self.onChange(of: value, perform: onChange)
     } else {
       onReceive(Just(value)) { value in
         onChange(value)
       }
     }
+    #endif
   }
 }
 #endif

package/Sources/Public/Animation/LottieAnimationHelpers.swift

@@ -171,7 +171,6 @@ extension LottieAnimation {
   /// - Parameter url: The url to load the animation from.
   /// - Parameter animationCache: A cache for holding loaded animations. Defaults to `LottieAnimationCache.shared`. Optional.
   ///
-  @available(iOS 13.0, macOS 10.15, tvOS 13.0, *)
   public static func loadedFrom(
     url: URL,
     session: URLSession = .shared,

package/Sources/Public/Animation/LottieView.swift

@@ -7,14 +7,13 @@ import SwiftUI
 // MARK: - LottieView
 
 /// A wrapper which exposes Lottie's `LottieAnimationView` to SwiftUI
-@available(iOS 13.0, tvOS 13.0, macOS 10.15, *)
 public struct LottieView<Placeholder: View>: UIViewConfiguringSwiftUIView {
 
   // MARK: Lifecycle
 
   /// Creates a `LottieView` that displays the given animation
   public init(animation: LottieAnimation?) where Placeholder == EmptyView {
-    _animationSource = State(initialValue: animation.map(LottieAnimationSource.lottieAnimation))
+    localAnimation = animation.map(LottieAnimationSource.lottieAnimation)
     placeholder = nil
   }
 
@@ -29,7 +28,7 @@ public struct LottieView<Placeholder: View>: UIViewConfiguringSwiftUIView {
   /// }
   /// ```
   public init(dotLottieFile: DotLottieFile?) where Placeholder == EmptyView {
-    _animationSource = State(initialValue: dotLottieFile.map(LottieAnimationSource.dotLottieFile))
+    localAnimation = dotLottieFile.map(LottieAnimationSource.dotLottieFile)
     placeholder = nil
   }
 
@@ -107,9 +106,9 @@ public struct LottieView<Placeholder: View>: UIViewConfiguringSwiftUIView {
     _ loadAnimation: @escaping () async throws -> LottieAnimationSource?,
     @ViewBuilder placeholder: @escaping () -> Placeholder)
   {
+    localAnimation = nil
     self.loadAnimation = loadAnimation
     self.placeholder = placeholder
-    _animationSource = State(initialValue: nil)
   }
 
   // MARK: Public
@@ -454,7 +453,8 @@ public struct LottieView<Placeholder: View>: UIViewConfiguringSwiftUIView {
 
   // MARK: Private
 
-  @State private var animationSource: LottieAnimationSource?
+  private let localAnimation: LottieAnimationSource?
+  @State private var remoteAnimation: LottieAnimationSource?
   private var playbackMode: LottiePlaybackMode?
   private var animationSpeed: Double?
   private var reloadAnimationTrigger: AnyEquatable?
@@ -474,12 +474,16 @@ public struct LottieView<Placeholder: View>: UIViewConfiguringSwiftUIView {
     imageProvider: AnimationImageProvider,
     imageProvidersAreEqual: (AnimationImageProvider, AnimationImageProvider) -> Bool)?
 
+  private var animationSource: LottieAnimationSource? {
+    localAnimation ?? remoteAnimation
+  }
+
   private func loadAnimationIfNecessary() {
     guard let loadAnimation else { return }
 
     Task {
       do {
-        animationSource = try await loadAnimation()
+        remoteAnimation = try await loadAnimation()
       } catch {
         logger.warn("Failed to load asynchronous Lottie animation with error: \(error)")
       }
@@ -490,7 +494,7 @@ public struct LottieView<Placeholder: View>: UIViewConfiguringSwiftUIView {
     guard loadAnimation != nil else { return }
 
     if showPlaceholderWhileReloading {
-      animationSource = nil
+      remoteAnimation = nil
     }
 
     loadAnimationIfNecessary()
@@ -564,7 +568,6 @@ public struct LottieView<Placeholder: View>: UIViewConfiguringSwiftUIView {
   }
 }
 
-@available(iOS 13.0, tvOS 13.0, macOS 10.15, *)
 extension View {
 
   /// The `.overlay` modifier that uses a `ViewBuilder` is available in iOS 15+, this helper function helps us to use the same API in older OSs

package/Sources/Public/Controls/LottieButton.swift

@@ -5,7 +5,6 @@
 import SwiftUI
 
 /// A wrapper which exposes Lottie's `AnimatedButton` to SwiftUI
-@available(iOS 13.0, tvOS 13.0, macOS 10.15, *)
 public struct LottieButton: UIViewConfiguringSwiftUIView {
 
   // MARK: Lifecycle

package/Sources/Public/Controls/LottieSwitch.swift

@@ -5,7 +5,6 @@
 import SwiftUI
 
 /// A wrapper which exposes Lottie's `AnimatedSwitch` to SwiftUI
-@available(iOS 13.0, tvOS 13.0, macOS 10.15, *)
 public struct LottieSwitch: UIViewConfiguringSwiftUIView {
 
   // MARK: Lifecycle

package/Sources/Public/Controls/LottieViewType.swift

@@ -44,7 +44,7 @@ public enum LottieNSControlState: UInt, RawRepresentable {
 ///  - `UIControl.Event` on iOS / tvOS and `LottieNSControlEvent` on macOS.
 public typealias LottieControlEvent = LottieNSControlEvent
 
-public struct LottieNSControlEvent: Equatable {
+public struct LottieNSControlEvent: Equatable, Sendable {
 
   // MARK: Lifecycle
 

package/Sources/Public/DotLottie/DotLottieFileHelpers.swift

@@ -118,7 +118,6 @@ extension DotLottieFile {
   /// - Parameter bundle: The bundle in which the lottie is located. Defaults to `Bundle.main`
   /// - Parameter subdirectory: A subdirectory in the bundle in which the lottie is located. Optional.
   /// - Parameter dotLottieCache: A cache for holding loaded lotties. Defaults to `LRUDotLottieCache.sharedCache`. Optional.
-  @available(iOS 13.0, macOS 10.15, tvOS 13.0, *)
   public static func named(
     _ name: String,
     bundle: Bundle = Bundle.main,
@@ -165,7 +164,6 @@ extension DotLottieFile {
   /// Loads an DotLottie from a specific filepath.
   /// - Parameter filepath: The absolute filepath of the lottie to load. EG "/User/Me/starAnimation.lottie"
   /// - Parameter dotLottieCache: A cache for holding loaded lotties. Defaults to `LRUDotLottieCache.sharedCache`. Optional.
-  @available(iOS 13.0, macOS 10.15, tvOS 13.0, *)
   public static func loadedFrom(
     filepath: String,
     dotLottieCache: DotLottieCacheProvider? = DotLottieCache.sharedCache)
@@ -204,7 +202,6 @@ extension DotLottieFile {
   /// - Parameter name: The name of the lottie file in the asset catalog. EG "StarAnimation"
   /// - Parameter bundle: The bundle in which the lottie is located. Defaults to `Bundle.main`
   /// - Parameter dotLottieCache: A cache for holding loaded lottie files. Defaults to `LRUDotLottieCache.sharedCache` Optional.
-  @available(iOS 13.0, macOS 10.15, tvOS 13.0, *)
   public static func asset(
     named name: String,
     bundle: Bundle = Bundle.main,
@@ -270,7 +267,6 @@ extension DotLottieFile {
   ///
   /// - Parameter url: The url to load the animation from.
   /// - Parameter animationCache: A cache for holding loaded animations. Defaults to `LRUAnimationCache.sharedCache`. Optional.
-  @available(iOS 13.0, macOS 10.15, tvOS 13.0, *)
   public static func loadedFrom(
     url: URL,
     session: URLSession = .shared,
@@ -354,7 +350,6 @@ extension DotLottieFile {
   ///   - data: The data(`Foundation.Data`) object to load DotLottie from
   ///   - filename: The name of the lottie file without the lottie extension. eg. "StarAnimation"
   ///   - dispatchQueue: A dispatch queue used to load animations. Defaults to `DispatchQueue.global()`. Optional.
-  @available(iOS 13.0, macOS 10.15, tvOS 13.0, *)
   public static func loadedFrom(
     data: Data,
     filename: String,

package/Sources/Public/iOS/LottieAnimationViewBase.swift

@@ -39,11 +39,7 @@ open class LottieAnimationViewBase: UIView {
 
   var screenScale: CGFloat {
     #if os(iOS) || os(tvOS)
-    if #available(iOS 13.0, tvOS 13.0, *) {
-      return max(UITraitCollection.current.displayScale, 1)
-    } else {
-      return UIScreen.main.scale
-    }
+    max(UITraitCollection.current.displayScale, 1)
     #else // if os(visionOS)
     // We intentionally don't check `#if os(visionOS)`, because that emits
     // a warning when building on Xcode 14 and earlier.

package/Version.xcconfig

@@ -0,0 +1,6 @@
+// Created by Cal Stephens on 3/12/24.
+// Copyright © 2024 Airbnb Inc. All rights reserved.
+
+// The version numbers used when building Lottie.xcframework
+MARKETING_VERSION = 4.4.2
+CURRENT_PROJECT_VERSION = 442 // a three-digit representation of the marketing version, without dots.

package/lottie-ios.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'lottie-ios'
-  s.version          = '4.4.1'
+  s.version          = '4.4.2'
   s.summary          = 'A library to render native animations from bodymovin json'
 
   s.description = <<-DESC
@@ -23,9 +23,10 @@ Lottie enables designers to create and ship beautiful animations without an engi
   s.source           = { :git => 'https://github.com/airbnb/lottie-ios.git', :tag => s.version.to_s }
 
   s.swift_version = '5.7'
-  s.ios.deployment_target = '11.0'
-  s.osx.deployment_target = '10.12'
-  s.tvos.deployment_target = '11.0'
+  s.ios.deployment_target = '13.0'
+  s.osx.deployment_target = '10.15'
+  s.tvos.deployment_target = '13.0'
+  s.visionos.deployment_target = "1.0"
 
   s.source_files = 'Sources/**/*.swift'
   s.resource_bundles = {

package/package.json

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

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

@@ -1,46 +0,0 @@
-// Created by eric_horacek on 10/8/21.
-// Copyright © 2021 Airbnb Inc. All rights reserved.
-
-#if canImport(SwiftUI) && !os(macOS)
-import SwiftUI
-
-// MARK: - EpoxySwiftUIUIHostingController
-
-/// A `UIHostingController` that hosts SwiftUI views within an Epoxy container, e.g. an Epoxy
-/// `CollectionView`.
-///
-/// Exposed internally to allow consumers to reason about these view controllers, e.g. to opt
-/// collection view cells out of automated view controller impression tracking.
-///
-/// - SeeAlso: `EpoxySwiftUIHostingView`
-@available(iOS 13.0, tvOS 13.0, *)
-open class EpoxySwiftUIHostingController<Content: View>: UIHostingController<Content> {
-
-  // MARK: Lifecycle
-
-  /// Creates a `UIHostingController` that optionally ignores the `safeAreaInsets` when laying out
-  /// its contained `RootView`.
-  convenience init(rootView: Content, ignoreSafeArea: Bool) {
-    self.init(rootView: rootView)
-
-    // We unfortunately need to call a private API to disable the safe area. We can also accomplish
-    // this by dynamically subclassing this view controller's view at runtime and overriding its
-    // `safeAreaInsets` property and returning `.zero`. An implementation of that logic is
-    // available in this file in the `2d28b3181cca50b89618b54836f7a9b6e36ea78e` commit if this API
-    // no longer functions in future SwiftUI versions.
-    _disableSafeArea = ignoreSafeArea
-  }
-
-  // MARK: Open
-
-  open override func viewDidLoad() {
-    super.viewDidLoad()
-
-    // A `UIHostingController` has a system background color by default as it's typically used in
-    // full-screen use cases. Since we're using this view controller to place SwiftUI views within
-    // other view controllers we default the background color to clear so we can see the views
-    // below, e.g. to draw highlight states in a `CollectionView`.
-    view.backgroundColor = .clear
-  }
-}
-#endif