Update to latest version of Airbnb style guide / formatter

Example/Example/AnimationPreviewView.swift

@@ -110,19 +110,19 @@ struct AnimationPreviewView: View {
 
   // MARK: Private
 
-  /// Used for remote animations only, when more than one URL is provided we loop over the urls every 2 seconds.
-  private let timer = Timer.publish(every: 2, on: .main, in: .common).autoconnect()
-  private let urls: [URL]
-
   @State private var animationPlaying = true
   @State private var sliderValue: AnimationProgressTime = 0
   @State private var currentURLIndex: Int
-  @State private var renderingEngine: RenderingEngineOption = .automatic
-  @State private var loopMode: LottieLoopMode = .loop
+  @State private var renderingEngine = RenderingEngineOption.automatic
+  @State private var loopMode = LottieLoopMode.loop
   @State private var playFromProgress: AnimationProgressTime = 0
   @State private var playToProgress: AnimationProgressTime = 1
   @State private var currentRenderingEngine: RenderingEngine?
 
+  /// Used for remote animations only, when more than one URL is provided we loop over the urls every 2 seconds.
+  private let timer = Timer.publish(every: 2, on: .main, in: .common).autoconnect()
+  private let urls: [URL]
+
   private var playbackMode: LottiePlaybackMode {
     if animationPlaying {
       .playing(.fromProgress(playFromProgress, toProgress: playToProgress, loopMode: loopMode))

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"
       }
     },
     {

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,

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
   }

Sources/Private/CoreAnimation/CoreAnimationLayer.swift

@@ -594,7 +594,7 @@ extension CALayer {
     var numberOfSublayersWithTimeRemapping = 0
 
     for sublayer in sublayers ?? [] {
-      if 
+      if
         let preCompLayer = sublayer as? PreCompLayer,
         preCompLayer.preCompLayer.timeRemapping != nil
       {

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()

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

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
 

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
 

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)) }

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)

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(

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

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 {

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)

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
     }

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)
   }

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) {

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) {

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]()

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

@@ -217,43 +217,6 @@ final class CoreTextRenderLayer: CALayer {
   private var strokeFrameSetter: CTFramesetter?
   private var needsContentUpdate = false
 
-  /// Draws Debug colors for the font alignment.
-  private func drawDebug(_ ctx: CGContext) {
-    if let font {
-      let ascent = CTFontGetAscent(font)
-      let descent = CTFontGetDescent(font)
-      let capHeight = CTFontGetCapHeight(font)
-      let leading = CTFontGetLeading(font)
-
-      // Ascent Red
-      ctx.setFillColor(CGColor(srgbRed: 1, green: 0, blue: 0, alpha: 0.5))
-      ctx.fill(CGRect(x: 0, y: 0, width: drawingRect.width, height: ascent))
-
-      // Descent Blue
-      ctx.setFillColor(CGColor(srgbRed: 0, green: 0, blue: 1, alpha: 0.5))
-      ctx.fill(CGRect(x: 0, y: ascent, width: drawingRect.width, height: descent))
-
-      // Leading Yellow
-      ctx.setFillColor(CGColor(srgbRed: 1, green: 1, blue: 0, alpha: 0.5))
-      ctx.fill(CGRect(x: 0, y: ascent + descent, width: drawingRect.width, height: leading))
-
-      // Cap height Green
-      ctx.setFillColor(CGColor(srgbRed: 0, green: 1, blue: 0, alpha: 0.5))
-      ctx.fill(CGRect(x: 0, y: ascent - capHeight, width: drawingRect.width, height: capHeight))
-
-      if drawingRect.height - ascent + descent + leading > 0 {
-        // Remainder
-        ctx.setFillColor(CGColor(srgbRed: 0, green: 1, blue: 1, alpha: 0.5))
-        ctx
-          .fill(CGRect(
-            x: 0,
-            y: ascent + descent + leading,
-            width: drawingRect.width,
-            height: drawingRect.height - ascent + descent + leading))
-      }
-    }
-  }
-
   private func updateTextContent() {
     guard needsContentUpdate else { return }
     needsContentUpdate = false

Sources/Private/MainThread/LayerContainers/Utility/LayerTransformNode.swift

@@ -22,13 +22,13 @@ final class LayerTransformProperties: NodePropertyMap, KeypathSearchable {
     opacity = NodeProperty(provider: KeyframeInterpolator(keyframes: transform.opacity.keyframes))
 
     var propertyMap: [String: AnyNodeProperty] = [
-      "Anchor Point" : anchor,
-      PropertyName.scale.rawValue : scale,
+      "Anchor Point": anchor,
+      PropertyName.scale.rawValue: scale,
       PropertyName.rotation.rawValue: rotationZ,
-      "Rotation X" : rotationX,
-      "Rotation Y" : rotationY,
-      "Rotation Z" : rotationZ,
-      PropertyName.opacity.rawValue : opacity,
+      "Rotation X": rotationX,
+      "Rotation Y": rotationY,
+      "Rotation Z": rotationZ,
+      PropertyName.opacity.rawValue: opacity,
     ]
 
     if