Update some third-party libraries

dogo · Jan 20, 2024 · 1e69b68 · 1e69b68
1 parent 46726b2
commit 1e69b68
Show file tree

Hide file tree

Showing 12 changed files with 61 additions and 48 deletions.
diff --git a/SWDestinyTrades/Classes/AddToDeck/Presenter/AddToDeckPresenter.swift b/SWDestinyTrades/Classes/AddToDeck/Presenter/AddToDeckPresenter.swift
@@ -49,7 +49,11 @@ final class AddToDeckPresenter: AddToDeckPresenterProtocol {
             let deckDataDict: [String: DeckDTO] = ["deckDTO": deck]
             NotificationCenter.default.post(name: NotificationKey.reloadTableViewNotification, object: nil, userInfo: deckDataDict)
         } else {
-            ToastMessages.showInfoMessage(title: "", message: L10n.alreadyAdded)
+            Task {
+                await MainActor.run {
+                    ToastMessages.showInfoMessage(title: "", message: L10n.alreadyAdded)
+                }
+            }
         }
     }
 }

diff --git a/SWDestinyTrades/Classes/DeckGraph/View/CardCostLineChartCell.swift b/SWDestinyTrades/Classes/DeckGraph/View/CardCostLineChartCell.swift
@@ -8,7 +8,7 @@
 
 import UIKit
 
-import Charts
+import DGCharts
 
 final class CardCostLineChartCell: UICollectionViewCell, Identifiable {
     let cardCostChartView: LineChartView = {

diff --git a/SWDestinyTrades/Classes/DeckGraph/View/CardTypeBarChartCell.swift b/SWDestinyTrades/Classes/DeckGraph/View/CardTypeBarChartCell.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2017 Diogo Autilio. All rights reserved.
 //
 
-import Charts
+import DGCharts
 import UIKit
 
 final class CardTypeBarChartCell: UICollectionViewCell, Identifiable {

diff --git a/SWDestinyTrades/Classes/DeckGraph/View/DiceRadarChartCell.swift b/SWDestinyTrades/Classes/DeckGraph/View/DiceRadarChartCell.swift
@@ -8,7 +8,7 @@
 
 import UIKit
 
-import Charts
+import DGCharts
 
 final class DiceRadarChartCell: UICollectionViewCell, Identifiable {
     let dieFaces = ["Special", "Blank", "Melee", "Ranged", "Focus",

diff --git a/SWDestinyTrades/Classes/DeckGraph/View/GraphMarker/BalloonMarker.swift b/SWDestinyTrades/Classes/DeckGraph/View/GraphMarker/BalloonMarker.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2017 Diogo Autilio. All rights reserved.
 //
 
-import Charts
+import DGCharts
 import Foundation
 import UIKit
 

diff --git a/SWDestinyTrades/Classes/DeckGraph/View/GraphMarker/RadarMarkerView.swift b/SWDestinyTrades/Classes/DeckGraph/View/GraphMarker/RadarMarkerView.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2017 Diogo Autilio. All rights reserved.
 //
 
-import Charts
+import DGCharts
 import Foundation
 import UIKit
 

diff --git a/SWDestinyTrades/Classes/DeckGraph/View/GraphMarker/XYMarkerView.swift b/SWDestinyTrades/Classes/DeckGraph/View/GraphMarker/XYMarkerView.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2017 Diogo Autilio. All rights reserved.
 //
 
-import Charts
+import DGCharts
 import Foundation
 import UIKit
 

diff --git a/SWDestinyTrades/Classes/Utils/ToastMessages.swift b/SWDestinyTrades/Classes/Utils/ToastMessages.swift
@@ -11,6 +11,8 @@ import SwiftMessages
 import UIKit
 
 enum ToastMessages {
+
+    @MainActor
     static func showNetworkErrorMessage() {
         let errorView = MessageView.viewFromNib(layout: .cardView)
         var config = SwiftMessages.defaultConfig
@@ -30,6 +32,7 @@ enum ToastMessages {
         SwiftMessages.show(config: config, view: errorView)
     }
 
+    @MainActor
     static func showInfoMessage(title: String, message: String) {
         let infoView = MessageView.viewFromNib(layout: .cardView)
         var config = SwiftMessages.defaultConfig

diff --git a/Tuist/Package.resolved b/Tuist/Package.resolved
@@ -27,58 +27,67 @@
         "version" : "4.3.0"
       }
     },
+    {
+      "identity" : "app-check",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/app-check.git",
+      "state" : {
+        "revision" : "3e464dad87dad2d29bb29a97836789bf0f8f67d2",
+        "version" : "10.18.1"
+      }
+    },
     {
       "identity" : "charts",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/danielgindi/Charts",
       "state" : {
-        "revision" : "07b23476ad52b926be772f317d8f1d4511ee8d02",
-        "version" : "4.1.0"
+        "revision" : "0a229f8c914b0ec93798cee058cf75b339297513",
+        "version" : "5.0.0"
       }
     },
     {
       "identity" : "firebase-ios-sdk",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/firebase/firebase-ios-sdk",
       "state" : {
-        "revision" : "8872dbd7d947acf757abab933da10e83c1842280",
-        "version" : "10.17.0"
+        "revision" : "b880ec8ec927a838c51c12862c6222c30d7097d7",
+        "version" : "10.20.0"
       }
     },
     {
       "identity" : "ftpopovermenu_swift",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/liufengting/FTPopOverMenu_Swift",
       "state" : {
-        "revision" : "69c156afc761127a8842b0bea6a7de6e673cd863",
-        "version" : "0.4.4"
+        "revision" : "3ace7adc009b39ad0cc9dd5e1df256264828d115",
+        "version" : "0.4.5"
       }
     },
     {
       "identity" : "googleappmeasurement",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/GoogleAppMeasurement.git",
       "state" : {
-        "revision" : "6b332152355c372ace9966d8ee76ed191f97025e",
-        "version" : "10.17.0"
+        "revision" : "ceec9f28dea12b7cf3dabf18b5ed7621c88fd4aa",
+        "version" : "10.20.0"
       }
     },
     {
       "identity" : "googledatatransport",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/GoogleDataTransport.git",
       "state" : {
-        "revision" : "aae45a320fd0d11811820335b1eabc8753902a40",
-        "version" : "9.2.5"
+        "revision" : "a732a4b47f59e4f725a2ea10f0c77e93a7131117",
+        "version" : "9.3.0"
       }
     },
     {
       "identity" : "googleutilities",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/GoogleUtilities.git",
       "state" : {
-        "revision" : "1cd556b33550982ec17f80e358253d905e756f0f",
-        "version" : "7.11.6"
+        "revision" : "bc27fad73504f3d4af235de451f02ee22586ebd3",
+        "version" : "7.12.1"
       }
     },
     {
@@ -189,24 +198,6 @@
         "version" : "2.0.0"
       }
     },
-    {
-      "identity" : "swift-algorithms",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-algorithms",
-      "state" : {
-        "revision" : "bcd4f369ac962bc3e5244c9df778739f8f5bdbf1",
-        "version" : "1.1.0"
-      }
-    },
-    {
-      "identity" : "swift-numerics",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-numerics.git",
-      "state" : {
-        "revision" : "0a5bc04095a675662cf24757cc0640aa2204253b",
-        "version" : "1.0.2"
-      }
-    },
     {
       "identity" : "swift-protobuf",
       "kind" : "remoteSourceControl",
@@ -221,8 +212,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/SwiftKickMobile/SwiftMessages",
       "state" : {
-        "revision" : "c2bcb351434ae044a486803ad1751b0e10f0d4e1",
-        "version" : "9.0.8"
+        "revision" : "e70fb07baae07e3dca3da2ce7a8d497bfd472b20",
+        "version" : "9.0.10"
       }
     }
   ],

diff --git a/Tuist/Package.swift b/Tuist/Package.swift
@@ -5,13 +5,13 @@ let package = Package(
     name: "PackageName",
     dependencies: [
         .package(url: "https://github.com/dogo/SketchKit", from: "2.0.0"),
-        .package(url: "https://github.com/danielgindi/Charts", from: "4.1.0"),
+        .package(url: "https://github.com/danielgindi/Charts", from: "5.0.0"),
         .package(url: "https://github.com/onevcat/Kingfisher", from: "5.15.8"),
         .package(url: "https://github.com/dogo/PKHUD", branch: "fix/spm-resource"),
-        .package(url: "https://github.com/liufengting/FTPopOverMenu_Swift", from: "0.4.4"),
+        .package(url: "https://github.com/liufengting/FTPopOverMenu_Swift", from: "0.4.5"),
         .package(url: "https://github.com/zvonicek/ImageSlideshow", from: "1.9.1"),
-        .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "10.1.0"),
-        .package(url: "https://github.com/SwiftKickMobile/SwiftMessages", from: "9.0.6"),
-        .package(url: "https://github.com/uber/ios-snapshot-test-case.git", from: "8.0.0")
+        .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "10.20.0"),
+        .package(url: "https://github.com/SwiftKickMobile/SwiftMessages", from: "9.0.10"),
+        .package(url: "https://github.com/uber/ios-snapshot-test-case", from: "8.0.0")
     ]
 )
diff --git a/Tuist/ProjectDescriptionHelpers/Script.swift b/Tuist/ProjectDescriptionHelpers/Script.swift
@@ -10,17 +10,32 @@ public extension Project {
     static func targetScripts() -> [TargetScript] {
         return [
             TargetScript.pre(
-                script: "asdf exec swiftgen",
+                script:
+                """
+                # Add Mise to the PATH
+                export PATH="$HOME/.local/share/mise/shims:$PATH"
+                swiftgen
+                """,
                 name: "[SwiftGen] Run Script",
                 basedOnDependencyAnalysis: false
             ),
             TargetScript.pre(
-                script: "asdf exec swiftformat --config .swiftformat .",
+                script:
+                """
+                # Add Mise to the PATH
+                export PATH="$HOME/.local/share/mise/shims:$PATH"
+                swiftformat --config .swiftformat .
+                """,
                 name: "[SwiftFormat] Run Script",
                 basedOnDependencyAnalysis: false
             ),
             TargetScript.pre(
-                script: "asdf exec swiftlint",
+                script:
+                """
+                # Add Mise to the PATH
+                export PATH="$HOME/.local/share/mise/shims:$PATH"
+                swiftlint
+                """,
                 name: "[SwiftLint] Run Script",
                 basedOnDependencyAnalysis: false
             ),

diff --git a/Tuist/ProjectDescriptionHelpers/Target.swift b/Tuist/ProjectDescriptionHelpers/Target.swift
@@ -25,7 +25,7 @@ public extension Project {
                 ],
                 scripts: Project.targetScripts(),
                 dependencies: [
-                    .external(name: "Charts"),
+                    .external(name: "DGCharts"),
                     .external(name: "FirebaseAnalytics"),
                     .external(name: "FirebaseCrashlytics"),
                     .external(name: "FTPopOverMenu"),