Fix CocoaPods installation issue by removing .swift-version file (#…

…1674)
airbnb · Jul 28, 2022 · 6d308e5 · 6d308e5
1 parent 9708cbf
commit 6d308e5
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 74 deletions.
diff --git a/.swift-version b/.swift-version
diff --git a/Package.resolved b/Package.resolved
@@ -1,85 +1,22 @@
 {
   "object": {
     "pins": [
-      {
-        "package": "SourceKitten",
-        "repositoryURL": "https://github.com/jpsim/SourceKitten.git",
-        "state": {
-          "branch": null,
-          "revision": "817dfa6f2e09b0476f3a6c9dbc035991f02f0241",
-          "version": "0.32.0"
-        }
-      },
       {
         "package": "AirbnbSwift",
         "repositoryURL": "https://github.com/airbnb/swift",
-        "state": {
-          "branch": "master",
-          "revision": "b844956fd69f05e550038469a5d498462176f87a",
-          "version": null
-        }
-      },
-      {
-        "package": "swift-argument-parser",
-        "repositoryURL": "https://github.com/apple/swift-argument-parser.git",
         "state": {
           "branch": null,
-          "revision": "e394bf350e38cb100b6bc4172834770ede1b7232",
-          "version": "1.0.3"
+          "revision": "1bf961396cc9c690db37936bfbdc8b5f29e844af",
+          "version": "1.0.1"
         }
       },
       {
-        "package": "SwiftSyntax",
-        "repositoryURL": "https://github.com/apple/swift-syntax.git",
-        "state": {
-          "branch": null,
-          "revision": "0b6c22b97f8e9320bca62e82cdbee601cf37ad3f",
-          "version": "0.50600.1"
-        }
-      },
-      {
-        "package": "SwiftFormat",
-        "repositoryURL": "https://github.com/calda/SwiftFormat",
-        "state": {
-          "branch": null,
-          "revision": "2a9ed335450d3b3f66b2699d65124b9089195f5d",
-          "version": "0.49.11-beta-2"
-        }
-      },
-      {
-        "package": "SwiftLint",
-        "repositoryURL": "https://github.com/realm/SwiftLint",
-        "state": {
-          "branch": "e497f1f",
-          "revision": "e497f1f5b161af96ba439049d21970c6204d06c6",
-          "version": null
-        }
-      },
-      {
-        "package": "SwiftyTextTable",
-        "repositoryURL": "https://github.com/scottrhoyt/SwiftyTextTable.git",
-        "state": {
-          "branch": null,
-          "revision": "c6df6cf533d120716bff38f8ff9885e1ce2a4ac3",
-          "version": "0.9.0"
-        }
-      },
-      {
-        "package": "SWXMLHash",
-        "repositoryURL": "https://github.com/drmohundro/SWXMLHash.git",
-        "state": {
-          "branch": null,
-          "revision": "6469881a3f30417c5bb02404ea4b69207f297592",
-          "version": "6.0.0"
-        }
-      },
-      {
-        "package": "Yams",
-        "repositoryURL": "https://github.com/jpsim/Yams.git",
+        "package": "swift-argument-parser",
+        "repositoryURL": "https://github.com/apple/swift-argument-parser",
         "state": {
           "branch": null,
-          "revision": "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa",
-          "version": "4.0.6"
+          "revision": "df9ee6676cd5b3bf5b330ec7568a5644f547201b",
+          "version": "1.1.3"
         }
       }
     ]

diff --git a/Package.swift b/Package.swift
@@ -9,5 +9,5 @@ let package = Package(
 
 #if swift(>=5.6)
 // Add the Airbnb Swift formatting plugin if possible
-package.dependencies.append(.package(url: "https://github.com/airbnb/swift", .branch("master")))
+package.dependencies.append(.package(url: "https://github.com/airbnb/swift", .upToNextMajor(from: "1.0.1")))
 #endif
diff --git a/Sources/Private/CoreAnimation/Layers/MaskCompositionLayer.swift b/Sources/Private/CoreAnimation/Layers/MaskCompositionLayer.swift
@@ -74,7 +74,7 @@ extension MaskCompositionLayer: AnimationLayer {
   }
 }
 
-// MARK: - MaskLayer
+// MARK: MaskCompositionLayer.MaskLayer
 
 extension MaskCompositionLayer {
   final class MaskLayer: CAShapeLayer {

diff --git a/lottie-ios.podspec b/lottie-ios.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'lottie-ios'
-  s.version          = '3.4.1'
+  s.version          = '3.4.2'
   s.summary          = 'A library to render native animations from bodymovin json'
 
   s.description = <<-DESC
@@ -22,6 +22,7 @@ Lottie enables designers to create and ship beautiful animations without an engi
   s.author           = { 'Brandon Withrow' => '[email protected]' }
   s.source           = { :git => 'https://github.com/airbnb/lottie-ios.git', :tag => s.version.to_s }
 
+  s.swift_version = '5.3'
   s.ios.deployment_target = '11.0'
   s.osx.deployment_target = '10.10'
   s.tvos.deployment_target = '11.0'

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lottie-ios",
-  "version": "3.4.1",
+  "version": "3.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": {