Update dependencies

.github/workflows/build.yml

@@ -46,7 +46,7 @@ jobs:
       id: set-up-homebrew
       uses: Homebrew/actions/setup-homebrew@main
     - name: Install dependencies
-      run: brew install swift-sh mockolo
+      run: brew install mockolo
     - name: Setup config and TSL files
       run: |
         export RESOURCES_DIRECTORY="Modules/ConfigLib/Sources/ConfigLib/Resources"
@@ -73,12 +73,12 @@ jobs:
 
         if [ -f "$TSL_FILES_DIRECTORY/eu-lotl.xml" ]; then
           echo "Getting TSL (local LOTL)"
-          python3 scripts/TSLXMLDownloader.py --tslFile="$TSL_FILES_DIRECTORY/eu-lotl.xml" --tslTestFile="$TSL_FILES_DIRECTORY/$(basename 'https://ec.europa.eu/tools/lotl/eu-lotl.xml')" --countries="EE" --isDevBuild="False"
+          python3 scripts/tsl_xml_downloader.py --tslFile="$TSL_FILES_DIRECTORY/eu-lotl.xml" --tslTestFile="$TSL_FILES_DIRECTORY/$(basename 'https://ec.europa.eu/tools/lotl/eu-lotl.xml')" --countries="EE" --isDevBuild="False"
 
           echo "Finished downloading TSL"
         else
           echo "Getting TSL (remote LOTL)"
-          python3 scripts/TSLXMLDownloader.py --tslTestFile="$TSL_FILES_DIRECTORY/$(basename 'https://ec.europa.eu/tools/lotl/eu-lotl.xml')" --countries="EE" --isDevBuild="False"
+          python3 scripts/tsl_xml_downloader.py --tslTestFile="$TSL_FILES_DIRECTORY/$(basename 'https://ec.europa.eu/tools/lotl/eu-lotl.xml')" --countries="EE" --isDevBuild="False"
           echo "Finished downloading TSL"
         fi
 
@@ -100,10 +100,8 @@ jobs:
         echo APP_VERSION=$(xcodebuild -project ${{ github.workspace }}/RIADigiDoc.xcodeproj -showBuildSettings | grep MARKETING_VERSION | tr -d 'MARKETING_VERSION =') >> $GITHUB_ENV
     - name: Fetch default configuration
       run: |
-        echo "Cleaning swift-sh cache"
-        swift-sh --clean-cache
         echo "Fetching default configuration"
-        swift-sh SetupConfiguration/Sources/main.swift
+        python3 scripts/setup_configuration.py
     - name: Run tests
       run: |
         cd ${{ github.workspace }}
@@ -112,6 +110,7 @@ jobs:
 
         xcodebuild test \
           -project RIADigiDoc.xcodeproj \
+          -skipPackagePluginValidation \
           -scheme AllTests \
           -destination 'platform=iOS Simulator,name=iPhone 17' \
           -resultBundlePath TestResults.xcresult \
@@ -142,6 +141,7 @@ jobs:
 
         xcodebuild clean build \
           -project RIADigiDoc.xcodeproj \
+          -skipPackagePluginValidation \
           -scheme RIADigiDoc \
           -destination 'platform=iOS Simulator,name=iPhone 17' \
           -derivedDataPath "${{ github.workspace }}/build" \

.swiftlint.yml

@@ -2,7 +2,6 @@ excluded:
   - RIADigiDocTests/Mocks/*/*.swift
   - Modules/**/Mocks/*/*.swift
   - Extensions/**/Mocks/*/*.swift
-  - SetupConfiguration/**/*.swift
   - build
   - SourcePackages
   - .build

Extensions/FileImportShareExtension/UI/ShareViewController.swift

@@ -33,10 +33,10 @@ class ShareViewController: UIViewController, Sendable, Loggable {
         viewModel.status = .processing
 
         let shareView = ShareView(
-            statusChanged: {
-                Task { [weak self] in
-                    guard let self else { return }
+            statusChanged: { [weak self] in
+                guard let self else { return }
 
+                Task {
                     let sharedItems = await self.extractSharedFileItems()
                     await self.viewModel.importFiles(sharedItems)
                 }
@@ -70,12 +70,7 @@ class ShareViewController: UIViewController, Sendable, Loggable {
                         )
                 } else if item != nil {
                     if let itemData = item as? Data {
-                        Task { [weak self] in
-                            guard let self = self else {
-                                continuation.resume(throwing: FileImportError.dataConversionFailed)
-                                return
-                            }
-
+                        Task {
                             do {
                                 let url = try await self.viewModel.convertNSDataToURL(data: itemData)
                                 continuation.resume(returning: url)

Modules/CommonsLib/Package.swift

@@ -15,7 +15,7 @@ let package = Package(
         .library(name: "CommonsLibMocks", targets: ["CommonsLibMocks"])
     ],
     dependencies: [
-        .package(url: "https://github.com/hmlongco/Factory", exact: .init(2, 5, 3))
+        .package(url: "https://github.com/hmlongco/Factory", exact: .init(3, 2, 1))
     ],
     targets: [
         // Targets are the basic building blocks of a package, defining a module or a test suite.

Modules/ConfigLib/Package.swift

@@ -15,9 +15,8 @@ let package = Package(
         .library(name: "ConfigLibMocks", targets: ["ConfigLibMocks"])
     ],
     dependencies: [
-        .package(url: "https://github.com/hmlongco/Factory", exact: .init(2, 5, 3)),
-        .package(url: "https://github.com/Alamofire/Alamofire.git", exact: .init(5, 11, 2)),
-        .package(url: "https://github.com/TakeScoop/SwiftyRSA", exact: .init(1, 8, 0)),
+        .package(url: "https://github.com/hmlongco/Factory", exact: .init(3, 2, 1)),
+        .package(url: "https://github.com/Alamofire/Alamofire.git", exact: .init(5, 12, 0)),
         .package(path: "../CommonsLib"),
         .package(path: "../UtilsLib"),
         .package(path: "../Test/CommonsTestShared")
@@ -30,7 +29,6 @@ let package = Package(
             dependencies: [
                 "Alamofire",
                 "CommonsLib",
-                "SwiftyRSA",
                 "UtilsLib",
                 .product(name: "FactoryKit", package: "Factory")
             ],

Modules/ConfigLib/Sources/ConfigLib/Configuration/Loader/ConfigurationLoader.swift

@@ -390,8 +390,8 @@ public actor ConfigurationLoader: ConfigurationLoaderProtocol, Loggable {
                 continuation.yield(config)
             }
 
-            continuation.onTermination = { @Sendable _ in
-                Task { [weak self] in
+            continuation.onTermination = { @Sendable [weak self] _ in
+                Task {
                     await self?.removeContinuation(token)
                 }
             }

Modules/CryptoLib/Package.swift

@@ -17,8 +17,8 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/filom/ASN1Decoder", exact: .init(1, 10, 0)),
-        .package(url: "https://github.com/leif-ibsen/BigInt.git", exact: .init(1, 23, 0)),
-        .package(url: "https://github.com/hmlongco/Factory", exact: .init(2, 5, 3)),
+        .package(url: "https://github.com/leif-ibsen/BigInt.git", exact: .init(1, 24, 0)),
+        .package(url: "https://github.com/hmlongco/Factory", exact: .init(3, 2, 1)),
         .package(path: "../ConfigLib"),
         .package(path: "../CommonsLib"),
         .package(path: "../IdCardLib"),

Modules/IdCardLib/Package.swift

@@ -11,7 +11,7 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(url: "https://github.com/leif-ibsen/BigInt.git", exact: .init(1, 23, 0))
+        .package(url: "https://github.com/leif-ibsen/BigInt.git", exact: .init(1, 24, 0))
     ],
     targets: [
         .binaryTarget(