lottie-ios 4.2.0 → 4.3.0

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

@@ -0,0 +1,148 @@
+// Created by eric_horacek on 9/8/22.
+// Copyright © 2022 Airbnb Inc. All rights reserved.
+
+import SwiftUI
+
+// MARK: - SwiftUIView
+
+/// A `UIViewRepresentable` SwiftUI `View` that wraps its `Content` `UIView` within a
+/// `SwiftUIMeasurementContainer`, used to size a UIKit view correctly within a SwiftUI view
+/// hierarchy.
+///
+/// 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
+{
+
+  // MARK: Lifecycle
+
+  /// Creates a SwiftUI representation of the content view with the given storage and the provided
+  /// `makeContent` closure to construct the content whenever `makeUIView(…)` is invoked.
+  init(storage: Storage, makeContent: @escaping () -> Content) {
+    self.storage = storage
+    self.makeContent = makeContent
+  }
+
+  /// Creates a SwiftUI representation of the content view with the provided `makeContent` closure
+  /// to construct it whenever `makeUIView(…)` is invoked.
+  init(makeContent: @escaping () -> Content) where Storage == Void {
+    storage = ()
+    self.makeContent = makeContent
+  }
+
+  // MARK: Internal
+
+  var configurations: [Configuration] = []
+
+  var sizing: SwiftUIMeasurementContainerStrategy = .automatic
+
+  // MARK: Private
+
+  /// The current stored value, with the previous value provided to the configuration closure as
+  /// the `oldStorage`.
+  private var storage: Storage
+
+  /// A closure that's invoked to construct the represented content view.
+  private var makeContent: () -> Content
+}
+
+// MARK: UIViewRepresentable
+
+@available(iOS 13.0, tvOS 13.0, macOS 10.15, *)
+extension SwiftUIView {
+  func makeCoordinator() -> Coordinator {
+    Coordinator(storage: storage)
+  }
+
+  #if os(macOS)
+  func makeNSView(context _: Context) -> SwiftUIMeasurementContainer<Content> {
+    SwiftUIMeasurementContainer(content: makeContent(), strategy: sizing)
+  }
+
+  func updateNSView(_ uiView: SwiftUIMeasurementContainer<Content>, context: Context) {
+    let oldStorage = context.coordinator.storage
+    context.coordinator.storage = storage
+
+    let configurationContext = ConfigurationContext(
+      oldStorage: oldStorage,
+      viewRepresentableContext: context,
+      container: uiView)
+
+    for configuration in configurations {
+      configuration(configurationContext)
+    }
+  }
+  #else
+  func makeUIView(context _: Context) -> SwiftUIMeasurementContainer<Content> {
+    SwiftUIMeasurementContainer(content: makeContent(), strategy: sizing)
+  }
+
+  func updateUIView(_ uiView: SwiftUIMeasurementContainer<Content>, context: Context) {
+    let oldStorage = context.coordinator.storage
+    context.coordinator.storage = storage
+
+    let configurationContext = ConfigurationContext(
+      oldStorage: oldStorage,
+      viewRepresentableContext: context,
+      container: uiView)
+
+    for configuration in configurations {
+      configuration(configurationContext)
+    }
+  }
+  #endif
+}
+
+// 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.
+  struct ConfigurationContext: ViewProviding {
+    /// The previous value for the `Storage` of this `SwiftUIView`, which can be used to store
+    /// values across state changes to prevent redundant view updates.
+    var oldStorage: Storage
+
+    /// The `UIViewRepresentable.Context`, with information about the transaction and environment.
+    var viewRepresentableContext: Context
+
+    /// The backing measurement container that contains the `Content`.
+    var container: SwiftUIMeasurementContainer<Content>
+
+    /// The `UIView` content that's being configured.
+    ///
+    /// Setting this to a new value updates the backing measurement container's `content`.
+    var view: Content {
+      get { container.content }
+      nonmutating set { container.content = newValue }
+    }
+
+    /// A convenience accessor indicating whether this content update should be animated.
+    var animated: Bool {
+      viewRepresentableContext.transaction.animation != nil
+    }
+  }
+}
+
+// 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(…)`.
+  final class Coordinator {
+
+    // MARK: Lifecycle
+
+    fileprivate init(storage: Storage) {
+      self.storage = storage
+    }
+
+    // MARK: Internal
+
+    fileprivate(set) var storage: Storage
+  }
+}

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

@@ -0,0 +1,40 @@
+// Created by eric_horacek on 3/3/22.
+// Copyright © 2022 Airbnb Inc. All rights reserved.
+
+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.
+  ///
+  /// To perform additional configuration of the `UIView` instance, call `configure` on the
+  /// returned SwiftUI `View`:
+  /// ```
+  /// MyUIView.swiftUIView(…)
+  ///   .configure { context in
+  ///     context.view.doSomething()
+  ///   }
+  /// ```
+  ///
+  /// To configure the sizing behavior of the `UIView` instance, call `sizing` on the returned
+  /// SwiftUI `View`:
+  /// ```
+  /// MyView.swiftUIView(…).sizing(.intrinsicSize)
+  /// ```
+  /// The sizing defaults to `.automatic`.
+  static func swiftUIView(makeView: @escaping () -> Self) -> SwiftUIView<Self, Void> {
+    SwiftUIView(makeContent: makeView)
+  }
+}
+
+// MARK: - ViewTypeProtocol
+
+/// A protocol that all `UIView`s conform to, enabling extensions that have a `Self` reference.
+protocol ViewTypeProtocol: ViewType { }
+
+// MARK: - ViewType + ViewTypeProtocol
+
+extension ViewType: ViewTypeProtocol { }

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

@@ -0,0 +1,43 @@
+// Created by eric_horacek on 3/4/22.
+// Copyright © 2022 Airbnb Inc. All rights reserved.
+
+import SwiftUI
+
+// MARK: - UIViewConfiguringSwiftUIView
+
+/// 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.
+  associatedtype ConfigurationContext: ViewProviding
+
+  /// A closure that is invoked to configure the represented content view.
+  typealias Configuration = (ConfigurationContext) -> Void
+
+  /// A mutable array of configuration closures that should each be invoked with the
+  /// `ConfigurationContext` whenever `updateUIView` is called in a `UIViewRepresentable`.
+  var configurations: [Configuration] { get set }
+}
+
+// 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.
+  func configure(_ configure: @escaping Configuration) -> Self {
+    var copy = self
+    copy.configurations.append(configure)
+    return copy
+  }
+
+  /// Returns a copy of this view updated to have the given closures applied to its represented view
+  /// whenever it is updated via the `updateUIView(…)` method.
+  func configurations(_ configurations: [Configuration]) -> Self {
+    var copy = self
+    copy.configurations.append(contentsOf: configurations)
+    return copy
+  }
+}

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

@@ -0,0 +1,45 @@
+// Created by Tyler Hedrick on 5/26/20.
+// Copyright © 2020 Airbnb Inc. All rights reserved.
+
+// MARK: - BehaviorsConfigurableView
+
+/// A view that can be configured with a `Behaviors` instance that contains the view's non-
+/// `Equatable` properties that can be updated on view instances after initialization, e.g. callback
+/// closures or delegates.
+///
+/// Since it is not possible to establish the equality of two `Behaviors` instances, `Behaviors`
+/// will be set more often than `ContentConfigurableView.Content`, needing to be updated every time
+/// the view's corresponding `EpoxyModeled` instance is updated. As such, setting behaviors should
+/// be as lightweight as possible.
+///
+/// Properties of `Behaviors` should be mutually exclusive with the properties in the
+/// `StyledView.Style` and `ContentConfigurableView.Content`.
+///
+/// - SeeAlso: `ContentConfigurableView`
+/// - SeeAlso: `StyledView`
+/// - SeeAlso: `EpoxyableView`
+protocol BehaviorsConfigurableView: ViewType {
+  /// The non-`Equatable` properties that can be changed over of the lifecycle this View's
+  /// instances, e.g. callback closures or delegates.
+  ///
+  /// Defaults to `Never` for views that do not have `Behaviors`.
+  associatedtype Behaviors = Never
+
+  /// Updates the behaviors of this view to those in the given `behaviors`, else resets the
+  /// behaviors if `nil`.
+  ///
+  /// Behaviors are optional as they must be "resettable" in order for Epoxy to reset the behaviors
+  /// on your view when no behaviors are provided.
+  func setBehaviors(_ behaviors: Self.Behaviors?)
+}
+
+// MARK: Defaults
+
+extension BehaviorsConfigurableView where Behaviors == Never {
+  func setBehaviors(_ behaviors: Never?) {
+    switch behaviors {
+    case nil:
+      break
+    }
+  }
+}

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

@@ -0,0 +1,36 @@
+//  Created by Laura Skelton on 5/30/17.
+//  Copyright © 2017 Airbnb. All rights reserved.
+
+// MARK: - ContentConfigurableView
+
+/// A view that can be configured with a `Content` instance that contains the view's `Equatable`
+/// properties that can be updated on existing view instances, e.g. text `String`s or image `URL`s.
+///
+/// For performance, it is generally expected that `Content` is only set when it is not equal to the
+/// previous `Content` instance that has been set on a view instance. As a further optimization,
+/// this view can guard updates on the equality of each property of the `Content` against the
+/// current property value when set.
+///
+/// Properties of `Content` should be mutually exclusive with the properties of the
+/// `StyledView.Style` and `BehaviorsConfigurableView.Behaviors`.
+///
+/// - SeeAlso: `BehaviorsConfigurableView`
+/// - SeeAlso: `StyledView`
+/// - SeeAlso: `EpoxyableView`
+protocol ContentConfigurableView: ViewType {
+  /// The `Equatable` properties that can be updated on instances of this view, e.g. text `String`s
+  /// or image `URL`s.
+  ///
+  /// Defaults to `Never` for views that do not have `Content`.
+  associatedtype Content: Equatable = Never
+
+  /// Updates the content of this view to the properties of the given `content`, optionally
+  /// animating the updates.
+  func setContent(_ content: Self.Content, animated: Bool)
+}
+
+// MARK: Defaults
+
+extension ContentConfigurableView where Content == Never {
+  func setContent(_: Never, animated _: Bool) { }
+}

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

@@ -0,0 +1,5 @@
+// Created by eric_horacek on 1/13/21.
+// Copyright © 2021 Airbnb Inc. All rights reserved.
+
+/// A `UIView` that can be declaratively configured via a concrete `EpoxyableModel` instance.
+typealias EpoxyableView = BehaviorsConfigurableView & ContentConfigurableView & StyledView

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

@@ -0,0 +1,42 @@
+//  Created by Laura Skelton on 4/14/16.
+//  Copyright © 2016 Airbnb. All rights reserved.
+
+// MARK: - StyledView
+
+/// A view that can be initialized with a `Style` instance that contains the view's invariant
+/// configuration parameters, e.g. the `UIButton.ButtonType` of a `UIButton`.
+///
+/// A `Style` is expected to be invariant over the lifecycle of the view; it should not possible to
+/// change the `Style` of a view after it is created. All variant properties of the view should
+/// either be included in the `ContentConfigurableView.Content` if they are `Equatable` (e.g. a
+/// title `String`) or the `BehaviorsConfigurableView.Behaviors` if they are not (e.g. a callback
+/// closure).
+///
+/// A `Style` is `Hashable` to allow views of the same type with equal `Style`s to be reused by
+/// establishing whether their invariant `Style` instances are equal.
+///
+/// Properties of `Style` should be mutually exclusive with the properties of the
+/// `ContentConfigurableView.Content` and `BehaviorsConfigurableView.Behaviors`.
+///
+/// - SeeAlso: `ContentConfigurableView`
+/// - SeeAlso: `BehaviorsConfigurableView`
+/// - SeeAlso: `EpoxyableView`
+protocol StyledView: ViewType {
+  /// The style type of this view, passed into its initializer to configure the resulting instance.
+  ///
+  /// Defaults to `Never` for views that do not have a `Style`.
+  associatedtype Style: Hashable = Never
+
+  /// Creates an instance of this view configured with the given `Style` instance.
+  init(style: Style)
+}
+
+// MARK: Defaults
+
+extension StyledView where Style == Never {
+  init(style: Never) {
+    // An empty switch is required to silence the "'self.init' isn't called on all paths before
+    // returning from initializer" error.
+    switch style { }
+  }
+}

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

@@ -0,0 +1,51 @@
+// Created by Cal Stephens on 6/26/23.
+// Copyright © 2023 Airbnb Inc. All rights reserved.
+
+import SwiftUI
+
+#if canImport(UIKit)
+import UIKit
+
+/// The platform's main view type.
+/// Either `UIView` on iOS/tvOS or `NSView` on macOS.
+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.
+  typealias RepresentableViewType = UIViewType
+}
+
+#elseif canImport(AppKit)
+import AppKit
+
+/// The platform's main view type.
+/// Either `UIView` on iOS/tvOS, or `NSView` on macOS.
+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.
+  typealias RepresentableViewType = NSViewType
+}
+#endif

package/Sources/Private/EmbeddedLibraries/README.md

@@ -0,0 +1,27 @@
+## ZipFoundation
+
+This directory includes the source code of libraries that are embedded within lottie-ios.
+
+This includes:
+ - ZipFoundation (https://github.com/weichsel/ZIPFoundation)
+ - EpoxyCore (https://github.com/airbnb/epoxy-ios)
+
+Lottie is distributed via multiple package managers (SPM, Cocoapods, Carthage, and NPM),
+each with different packaging and compilation requirements. 
+
+Due to limitations of these package managers, we can't depend on / import 
+a separates modules / libraries. Instead, we include the source
+directly within the Lottie library and compile everything as a single unit.
+
+### Update instructions
+
+From time to time we may need to update to a more recent version of one of these libraries.
+When doing this, follow these steps:
+
+ 1. Download the latest release of the library and replace the source code in 
+    the corresponding directory with the updated code.
+    
+ 2. Update the URL in the directory's README.md to indicate what release is being used.
+ 
+ 3. Change all of the `public` symbols defined in the module to instead be `internal`
+    to prevent Lottie from exposing any APIs from other libraries.

package/Sources/Private/{Model/DotLottie → EmbeddedLibraries}/ZipFoundation/Archive+BackingConfiguration.swift

@@ -54,8 +54,8 @@ extension Archive {
       let fileSystemRepresentation = fileManager.fileSystemRepresentation(withPath: url.path)
       guard
         let archiveFile = fopen(fileSystemRepresentation, "rb"),
-        let (eocdRecord, zip64EOCD) = Archive.scanForEndOfCentralDirectoryRecord(in: archiveFile) else
-      {
+        let (eocdRecord, zip64EOCD) = Archive.scanForEndOfCentralDirectoryRecord(in: archiveFile)
+      else {
         return nil
       }
       return BackingConfiguration(
@@ -80,8 +80,8 @@ extension Archive {
       let fileSystemRepresentation = fileManager.fileSystemRepresentation(withPath: url.path)
       guard
         let archiveFile = fopen(fileSystemRepresentation, "rb+"),
-        let (eocdRecord, zip64EOCD) = Archive.scanForEndOfCentralDirectoryRecord(in: archiveFile) else
-      {
+        let (eocdRecord, zip64EOCD) = Archive.scanForEndOfCentralDirectoryRecord(in: archiveFile)
+      else {
         return nil
       }
       fseeko(archiveFile, 0, SEEK_SET)

package/Sources/Private/{Model/DotLottie → EmbeddedLibraries}/ZipFoundation/Archive+MemoryFile.swift

@@ -37,7 +37,7 @@ class MemoryFile {
     let cookie = Unmanaged.passRetained(self)
     let writable = mode.count > 0 && (mode.first! != "r" || mode.last! == "+")
     let append = mode.count > 0 && mode.first! == "a"
-    #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS) || os(Android)
+    #if os(macOS) || canImport(UIKit) || os(Android)
     let result = writable
       ? funopen(cookie.toOpaque(), readStub, writeStub, seekStub, closeStub)
       : funopen(cookie.toOpaque(), readStub, nil, seekStub, closeStub)
@@ -108,7 +108,7 @@ private func closeStub(_ cookie: UnsafeMutableRawPointer?) -> Int32 {
   return 0
 }
 
-#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS) || os(Android)
+#if os(macOS) || canImport(UIKit) || os(Android)
 private func readStub(
   _ cookie: UnsafeMutableRawPointer?,
   _ bytePtr: UnsafeMutablePointer<Int8>?,

package/Sources/Private/{Model/DotLottie → EmbeddedLibraries}/ZipFoundation/Archive+Writing.swift

@@ -281,8 +281,8 @@ extension Archive {
       #if swift(>=5.0)
       guard
         let data = archive.data,
-        let config = Archive.makeBackingConfiguration(for: data, mode: .update) else
-      {
+        let config = Archive.makeBackingConfiguration(for: data, mode: .update)
+      else {
         throw ArchiveError.unwritableArchive
       }
       archiveFile = config.file
@@ -360,8 +360,8 @@ extension Archive {
         let tempArchive = Archive(
           data: Data(),
           accessMode: .create,
-          preferredEncoding: preferredEncoding) else
-      {
+          preferredEncoding: preferredEncoding)
+      else {
         throw ArchiveError.unwritableArchive
       }
       archive = tempArchive

package/Sources/Private/{Model/DotLottie → EmbeddedLibraries}/ZipFoundation/Archive.swift

@@ -206,8 +206,8 @@ final class Archive: Sequence {
   init?(data: Data = Data(), accessMode mode: AccessMode, preferredEncoding: String.Encoding? = nil) {
     guard
       let url = URL(string: "\(memoryURLScheme)://"),
-      let config = Archive.makeBackingConfiguration(for: data, mode: mode) else
-    {
+      let config = Archive.makeBackingConfiguration(for: data, mode: mode)
+    else {
       return nil
     }
 
@@ -256,15 +256,16 @@ final class Archive: Sequence {
       guard
         let centralDirStruct: CentralDirectoryStructure = Data.readStruct(
           from: self.archiveFile,
-          at: directoryIndex) else
-      {
+          at: directoryIndex)
+      else {
         return nil
       }
       let offset = UInt64(centralDirStruct.effectiveRelativeOffsetOfLocalHeader)
       guard
         let localFileHeader: LocalFileHeader = Data.readStruct(
           from: self.archiveFile,
-          at: offset) else { return nil }
+          at: offset)
+      else { return nil }
       var dataDescriptor: DataDescriptor?
       var zip64DataDescriptor: ZIP64DataDescriptor?
       if centralDirStruct.usesDataDescriptor {
@@ -326,8 +327,8 @@ final class Archive: Sequence {
     let recordOffset = locatorOffset - UInt64(ZIP64EndOfCentralDirectoryRecord.size)
     guard
       let locator: ZIP64EndOfCentralDirectoryLocator = Data.readStruct(from: file, at: locatorOffset),
-      let record: ZIP64EndOfCentralDirectoryRecord = Data.readStruct(from: file, at: recordOffset) else
-    {
+      let record: ZIP64EndOfCentralDirectoryRecord = Data.readStruct(from: file, at: recordOffset)
+    else {
       return nil
     }
     return ZIP64EndOfCentralDirectory(record: record, locator: locator)

package/Sources/Private/{Model/DotLottie → EmbeddedLibraries}/ZipFoundation/Data+Compression.swift

@@ -53,7 +53,7 @@ extension Data {
   ///   - consumer: A closure that processes the result of the compress operation.
   /// - Returns: The checksum of the processed content.
   static func compress(size: Int64, bufferSize: Int, provider: Provider, consumer: Consumer) throws -> CRC32 {
-    #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
+    #if os(macOS) || canImport(UIKit)
     return try process(
       operation: COMPRESSION_STREAM_ENCODE,
       size: size,
@@ -81,7 +81,7 @@ extension Data {
     consumer: Consumer)
     throws -> CRC32
   {
-    #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
+    #if os(macOS) || canImport(UIKit)
     return try process(
       operation: COMPRESSION_STREAM_DECODE,
       size: size,
@@ -113,7 +113,7 @@ extension Data {
 
 // MARK: - Apple Platforms
 
-#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
+#if os(macOS) || canImport(UIKit)
 import Compression
 
 extension Data {
@@ -277,8 +277,8 @@ extension Data {
               guard
                 result != Z_NEED_DICT,
                 result != Z_DATA_ERROR,
-                result != Z_MEM_ERROR else
-              {
+                result != Z_MEM_ERROR
+              else {
                 throw CompressionError.corruptedData
               }
             }

package/Sources/Private/{Model/DotLottie → EmbeddedLibraries}/ZipFoundation/FileManager+ZIP.swift

@@ -81,7 +81,7 @@ extension FileManager {
     let entryFileSystemRepresentation = fileManager.fileSystemRepresentation(withPath: url.path)
     var fileStat = stat()
     lstat(entryFileSystemRepresentation, &fileStat)
-    #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
+    #if os(macOS) || canImport(UIKit)
     let modTimeSpec = fileStat.st_mtimespec
     #else
     let modTimeSpec = fileStat.st_mtim
@@ -307,7 +307,7 @@ extension Date {
   // MARK: Internal
 
   var fileModificationDateTime: (UInt16, UInt16) {
-    return (self.fileModificationDate, self.fileModificationTime)
+    (self.fileModificationDate, self.fileModificationTime)
   }
 
   var fileModificationDate: UInt16 {
@@ -321,7 +321,7 @@ extension Date {
     year = year <= 2099 ? year : 2099
     let month = unixTime.pointee.tm_mon + 1 // UNIX time struct month entries are zero based.
     let day = unixTime.pointee.tm_mday
-    return (UInt16)(day + (month * 32) + ((year - 1980) * 512))
+    return UInt16(day + (month * 32) + ((year - 1980) * 512))
   }
 
   var fileModificationTime: UInt16 {
@@ -332,7 +332,7 @@ extension Date {
     let hour = unixTime.pointee.tm_hour
     let minute = unixTime.pointee.tm_min
     let second = unixTime.pointee.tm_sec
-    return (UInt16)((second / 2) + (minute * 32) + (hour * 2048))
+    return UInt16((second / 2) + (minute * 32) + (hour * 2048))
   }
 }
 

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

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

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

@@ -73,7 +73,9 @@ final class MaskContainerLayer: CALayer {
   // MARK: Internal
 
   func updateWithFrame(frame: CGFloat, forceUpdates: Bool) {
-    maskLayers.forEach { $0.updateWithFrame(frame: frame, forceUpdates: forceUpdates) }
+    for maskLayer in maskLayers {
+      maskLayer.updateWithFrame(frame: frame, forceUpdates: forceUpdates)
+    }
   }
 
   // MARK: Fileprivate