Merge pull request #21 from teufelaudio/swift6

Swift 6 Migration
teufelaudio · Sep 27, 2024 · 2e894cb · 2e894cb
2 parents 0ec0b05 + 43ee868
commit 2e894cb
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 17 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -6,44 +6,44 @@
         "repositoryURL": "https://github.com/teufelaudio/FoundationExtensions.git",
         "state": {
           "branch": null,
-          "revision": "c441f8fa10ee6c93ce4d4d3939a8bd683987e48f",
-          "version": "0.6.2"
+          "revision": "f664fd15bf661193b2595bdcf8d7fc6eadb94fe2",
+          "version": "1.0.0"
         }
       },
       {
         "package": "Lottie",
         "repositoryURL": "https://github.com/airbnb/lottie-ios.git",
         "state": {
           "branch": null,
-          "revision": "769b88d83a42ca8d5572b020c96f47e3690b3796",
-          "version": "4.4.3"
+          "revision": "fe4c6fe3a0aa66cdeb51d549623c82ca9704b9a5",
+          "version": "4.5.0"
         }
       },
       {
         "package": "swift-snapshot-testing",
         "repositoryURL": "https://github.com/pointfreeco/swift-snapshot-testing.git",
         "state": {
           "branch": null,
-          "revision": "625ccca8570773dd84a34ee51a81aa2bc5a4f97a",
-          "version": "1.16.0"
+          "revision": "7b0bbbae90c41f848f90ac7b4df6c4f50068256d",
+          "version": "1.17.5"
         }
       },
       {
         "package": "swift-syntax",
-        "repositoryURL": "https://github.com/apple/swift-syntax",
+        "repositoryURL": "https://github.com/swiftlang/swift-syntax",
         "state": {
           "branch": null,
-          "revision": "fa8f95c2d536d6620cc2f504ebe8a6167c9fc2dd",
-          "version": "510.0.1"
+          "revision": "0687f71944021d616d34d922343dcef086855920",
+          "version": "600.0.1"
         }
       },
       {
         "package": "UIExtensions",
         "repositoryURL": "https://github.com/teufelaudio/UIExtensions.git",
         "state": {
           "branch": null,
-          "revision": "2d16f0db9b3629b670dad9e32d5fe54fef885d05",
-          "version": "1.2.2"
+          "revision": "9126dcbd0bde4d83c5dcf73920e82d6ce313bf0a",
+          "version": "2.0.0"
         }
       }
     ]

diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.2
+// swift-tools-version:6.0
 import PackageDescription
 
 let package = Package(
@@ -8,10 +8,15 @@ let package = Package(
         .library(name: "LottieExtensions", targets: ["LottieExtensions"]),
     ],
     dependencies: [
-        .package(name: "Lottie", url: "https://github.com/airbnb/lottie-ios.git", from: "4.4.0"),
-        .package(name: "UIExtensions", url: "https://github.com/teufelaudio/UIExtensions.git", from: "1.2.0")
+        .package(url: "https://github.com/airbnb/lottie-ios.git", from: "4.4.0"),
+        .package(url: "https://github.com/teufelaudio/UIExtensions.git", from: "2.0.0")
     ],
     targets: [
-        .target(name: "LottieExtensions", dependencies: ["Lottie", "UIExtensions"]),
+        .target(
+            name: "LottieExtensions",
+            dependencies: [
+                .product(name: "Lottie", package: "lottie-ios"),
+                .product(name: "UIExtensions", package: "UIExtensions"),
+            ]),
     ]
 )
diff --git a/Sources/LottieExtensions/LottieView.swift b/Sources/LottieExtensions/LottieView.swift
@@ -58,8 +58,9 @@ extension LottieView {
 
 // MARK: - Configurations
 // MARK: LottieAnimationConfiguration
-public struct LottieAnimationConfigurationKey: EnvironmentKey {
-    public static var defaultValue: (LottieAnimationView) -> Void = {
+@MainActor
+public struct LottieAnimationConfigurationKey: @preconcurrency EnvironmentKey {
+    public static let defaultValue: (LottieAnimationView) -> Void = {
         $0.loopMode = .playOnce
         $0.contentMode = .scaleAspectFit
         $0.backgroundBehavior = .pauseAndRestore