support xcode 15.3 (swift 5.10 changes)

App/MutaroDev/MutaroDev.xcodeproj/project.pbxproj

@@ -195,7 +195,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nif [ $CI ]; then\n    export PATH=\"$PATH:/usr/local/bin\"\nelse\n    export PATH=\"$PATH:/opt/homebrew/bin\"    \nfi\n\nif which needle; then\n    echo \"Mins: Create Needle\"\n    if [ $CI ]; then\n        NEEDLE_SWIFT_FILE_PATH=${CI_PRIMARY_REPOSITORY_PATH}/MutaroModule/Sources/App/Development/DI/NeedleGenerated.swift\n        COMPONENT_PATH=${CI_PRIMARY_REPOSITORY_PATH}/MutaroModule/Sources/\n    else\n        NEEDLE_SWIFT_FILE_PATH=../../MutaroModule/Sources/App/Development/DI/NeedleGenerated.swift\n        COMPONENT_PATH=../../MutaroModule/Sources/\n    fi\n    \n    needle generate $NEEDLE_SWIFT_FILE_PATH $COMPONENT_PATH --exclude-paths /Production\nelse\n    echo \"warning: Needle not installed\"\nfi\n";
+			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nif [ $CI ]; then\n    export PATH=\"$PATH:/usr/local/bin\"\nelse\n    export PATH=\"$PATH:/opt/homebrew/bin\"    \nfi\n\nif which needle; then\n    echo \"Mins: Create Needle\"\n    if [ $CI ]; then\n        NEEDLE_SWIFT_FILE_PATH=${CI_PRIMARY_REPOSITORY_PATH}/MutaroModule/Sources/App/Development/DI/NeedleGenerated.swift\n        COMPONENT_PATH=${CI_PRIMARY_REPOSITORY_PATH}/MutaroModule/Sources/\n    else\n        NEEDLE_SWIFT_FILE_PATH=../../MutaroModule/Sources/App/Development/DI/NeedleGenerated.swift\n        COMPONENT_PATH=../../MutaroModule/Sources/\n    fi\n    rm -rf $NEEDLE_SWIFT_FILE_PATH\n    needle generate $NEEDLE_SWIFT_FILE_PATH $COMPONENT_PATH --exclude-paths /Production\nelse\n    echo \"warning: Needle not installed\"\nfi\n";
 		};
 		71D24CCC2A318EC300092101 /* [NEED FIRST RUN] register env */ = {
 			isa = PBXShellScriptBuildPhase;

BuildTools/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.7
+// swift-tools-version: 5.10
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -21,8 +21,8 @@ let package = Package(
         ),
         .binaryTarget(
             name: "LicensePlistBinary",
-            url: "https://github.com/mono0926/LicensePlist/releases/download/3.24.9/LicensePlistBinary-macos.artifactbundle.zip",
-            checksum: "57bc9aad97510ee73af979bb3a8dc63653e522dce71a505c13059ab54d6fc990"
+            url: "https://github.com/mono0926/LicensePlist/releases/download/3.25.1/LicensePlistBinary-macos.artifactbundle.zip",
+            checksum: "a80181eeed49396dae5d3ce6fc339f33a510299b068fd6b4f507483db78f7f30"
         )
     ]
 )

MutaroModule/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.8
+// swift-tools-version: 5.10
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -36,7 +36,7 @@ let firebaseAnalyticsDependencies: [Target.Dependency] = [
 
 let debugSwiftSettings: [PackageDescription.SwiftSetting] = [
     .define("DEV", .when(configuration: .debug)),
-    .unsafeFlags(["-strict-concurrency=complete"]),
+    .unsafeFlags(["-strict-concurrency=complete", "-warn-concurrency", "-enable-actor-data-race-checks"]),
     .forwardTrailingClosures,
     .existentialAny,
     .bareSlashRegexLiterals,
@@ -244,7 +244,9 @@ let package = Package(
         ),
         .target(
             name: "KeychainStore",
-            dependencies: [],
+            dependencies: [
+                .core
+            ],
             path: "./Sources/Modules/KeychainStore"
         ),
         .target(

MutaroModule/Sources/App/Development/DI/DevRootComponent.swift

@@ -8,6 +8,7 @@
 import Client
 import Core
 import ImageLoader
+import KeychainStore
 import NeedleFoundation
 
 import AppIntroductionFeature
@@ -71,4 +72,10 @@ public final class DevRootComponent: BootstrapComponent {
             ImageDownloadServiceImp()
         }
     }
+
+    public var keychainDataStore: any KeychainDataStoreProtocol {
+        shared {
+            KeychainDataStore()
+        }
+    }
 }

MutaroModule/Sources/App/Development/DI/NeedleGenerated.swift

@@ -6,6 +6,7 @@ import Core
 import Foundation
 import HomeFeature
 import ImageLoader
+import KeychainStore
 import MyAppToolsFeature
 import MyAppsFeature
 import NeedleFoundation
@@ -41,6 +42,9 @@ private class MyAppToolsFeatureDependency8819cdcb20ff8ed502dcProvider: MyAppTool
     var client: any Providable {
         return devRootComponent.client
     }
+    var keychainDataStore: any KeychainDataStoreProtocol {
+        return devRootComponent.keychainDataStore
+    }
     private let devRootComponent: DevRootComponent
     init(devRootComponent: DevRootComponent) {
         self.devRootComponent = devRootComponent
@@ -51,15 +55,17 @@ private func factory1cd9013174eed344cbd4295202051d8ff8d8a13a(_ component: Needle
     return MyAppToolsFeatureDependency8819cdcb20ff8ed502dcProvider(devRootComponent: parent1(component) as! DevRootComponent)
 }
 private class RegisterJWTFeatureDependencyb8fd3e5e6507e3cea0d9Provider: RegisterJWTFeatureDependency {
-
-
-    init() {
-
+    var keychainDataStore: any KeychainDataStoreProtocol {
+        return devRootComponent.keychainDataStore
+    }
+    private let devRootComponent: DevRootComponent
+    init(devRootComponent: DevRootComponent) {
+        self.devRootComponent = devRootComponent
     }
 }
 /// ^->DevRootComponent->RegisterJWTFeatureBuilderComponent
-private func factory3027719ba7197de4dae7e3b0c44298fc1c149afb(_ component: NeedleFoundation.Scope) -> AnyObject {
-    return RegisterJWTFeatureDependencyb8fd3e5e6507e3cea0d9Provider()
+private func factory3027719ba7197de4dae7295202051d8ff8d8a13a(_ component: NeedleFoundation.Scope) -> AnyObject {
+    return RegisterJWTFeatureDependencyb8fd3e5e6507e3cea0d9Provider(devRootComponent: parent1(component) as! DevRootComponent)
 }
 private class MyAppsFeatureDependency6e3d99de62d490ee639fProvider: MyAppsFeatureDependency {
     var client: any Providable {
@@ -68,6 +74,9 @@ private class MyAppsFeatureDependency6e3d99de62d490ee639fProvider: MyAppsFeature
     var imageDownloadService: any ImageDownloadService {
         return devRootComponent.imageDownloadService
     }
+    var keychainDataStore: any KeychainDataStoreProtocol {
+        return devRootComponent.keychainDataStore
+    }
     var registerJWTFeatureBuilder: any RegisterJWTFeatureBuildable {
         return devRootComponent.registerJWTFeatureBuilder
     }
@@ -128,6 +137,7 @@ extension DevRootComponent: Registration {
         localTable["myAppToolsFeatureBuilder-any MyAppToolsFeatureBuildable"] = { [unowned self] in self.myAppToolsFeatureBuilder as Any }
         localTable["client-any Providable"] = { [unowned self] in self.client as Any }
         localTable["imageDownloadService-any ImageDownloadService"] = { [unowned self] in self.imageDownloadService as Any }
+        localTable["keychainDataStore-any KeychainDataStoreProtocol"] = { [unowned self] in self.keychainDataStore as Any }
     }
 }
 extension HomeFeatureBuilderComponent: Registration {
@@ -138,17 +148,19 @@ extension HomeFeatureBuilderComponent: Registration {
 extension MyAppToolsFeatureComponent: Registration {
     public func registerItems() {
         keyPathToName[\MyAppToolsFeatureDependency.client] = "client-any Providable"
+        keyPathToName[\MyAppToolsFeatureDependency.keychainDataStore] = "keychainDataStore-any KeychainDataStoreProtocol"
     }
 }
 extension RegisterJWTFeatureBuilderComponent: Registration {
     public func registerItems() {
-
+        keyPathToName[\RegisterJWTFeatureDependency.keychainDataStore] = "keychainDataStore-any KeychainDataStoreProtocol"
     }
 }
 extension MyAppsFeatureBuilderComponent: Registration {
     public func registerItems() {
         keyPathToName[\MyAppsFeatureDependency.client] = "client-any Providable"
         keyPathToName[\MyAppsFeatureDependency.imageDownloadService] = "imageDownloadService-any ImageDownloadService"
+        keyPathToName[\MyAppsFeatureDependency.keychainDataStore] = "keychainDataStore-any KeychainDataStoreProtocol"
         keyPathToName[\MyAppsFeatureDependency.registerJWTFeatureBuilder] = "registerJWTFeatureBuilder-any RegisterJWTFeatureBuildable"
         keyPathToName[\MyAppsFeatureDependency.myAppToolsFeatureBuilder] = "myAppToolsFeatureBuilder-any MyAppToolsFeatureBuildable"
     }
@@ -184,7 +196,7 @@ private func registerProviderFactory(_ componentPath: String, _ factory: @escapi
     registerProviderFactory("^->DevRootComponent", factoryEmptyDependencyProvider)
     registerProviderFactory("^->DevRootComponent->HomeFeatureBuilderComponent", factory61c9a65d91c54126627be3b0c44298fc1c149afb)
     registerProviderFactory("^->DevRootComponent->MyAppToolsFeatureComponent", factory1cd9013174eed344cbd4295202051d8ff8d8a13a)
-    registerProviderFactory("^->DevRootComponent->RegisterJWTFeatureBuilderComponent", factory3027719ba7197de4dae7e3b0c44298fc1c149afb)
+    registerProviderFactory("^->DevRootComponent->RegisterJWTFeatureBuilderComponent", factory3027719ba7197de4dae7295202051d8ff8d8a13a)
     registerProviderFactory("^->DevRootComponent->MyAppsFeatureBuilderComponent", factory7c6a8079ee013eb6ac6c295202051d8ff8d8a13a)
     registerProviderFactory("^->DevRootComponent->SettingFeatureBuilderComponent", factory5d4e408a43798995182c295202051d8ff8d8a13a)
     registerProviderFactory("^->DevRootComponent->AppIntroductionFeatureBuilderComponent", factorya635079052b624173c15295202051d8ff8d8a13a)

MutaroModule/Sources/App/Production/DI/RootComponent.swift

@@ -8,6 +8,7 @@
 import Client
 import Core
 import ImageLoader
+import KeychainStore
 import NeedleFoundation
 
 import AppIntroductionFeature
@@ -18,57 +19,63 @@ import RegisterJWTFeature
 import SettingFeature
 
 final class RootComponent: BootstrapComponent {
-    var appIntroductionFeatureBuilder: AppIntroductionFeatureBuildable {
+    public var appIntroductionFeatureBuilder: any AppIntroductionFeatureBuildable {
         shared {
             AppIntroductionFeatureBuilderComponent(parent: self)
                 .appIntroductionBuilder()
         }
     }
 
-    var settingFeatureBuilder: SettingFeatureBuildable {
+    public var settingFeatureBuilder: any SettingFeatureBuildable {
         shared {
             SettingFeatureBuilderComponent(parent: self)
                 .settingFeatureBuilder()
         }
     }
 
-    var homeFeatureBuilder: HomeFeatureBuildable {
+    public var homeFeatureBuilder: any HomeFeatureBuildable {
         shared {
             HomeFeatureBuilderComponent(parent: self)
                 .homeFeatureBuilder()
         }
     }
 
-    var myAppsFeatureBuilder: MyAppsFeatureBuildable {
+    public var myAppsFeatureBuilder: any MyAppsFeatureBuildable {
         shared {
             MyAppsFeatureBuilderComponent(parent: self)
                 .myAppsFeatureBuilder()
         }
     }
 
-    var registerJWTFeatureBuilder: RegisterJWTFeatureBuildable {
+    public var registerJWTFeatureBuilder: any RegisterJWTFeatureBuildable {
         shared {
             RegisterJWTFeatureBuilderComponent(parent: self)
                 .registerJWTFeatureBuilder()
         }
     }
 
-    var myAppToolsFeatureBuilder: MyAppToolsFeatureBuildable {
+    public var myAppToolsFeatureBuilder: any MyAppToolsFeatureBuildable {
         shared {
             MyAppToolsFeatureComponent(parent: self)
                 .myAppToolsFeatureBuilder()
         }
     }
 
-    var client: Providable {
+    public var client: any Providable {
         shared {
             Provider()
         }
     }
 
-    var imageDownloadService: ImageDownloadService {
+    public var imageDownloadService: any ImageDownloadService {
         shared {
             ImageDownloadServiceImp()
         }
     }
+
+    public var keychainDataStore: any KeychainDataStoreProtocol {
+        shared {
+            KeychainDataStore()
+        }
+    }
 }

MutaroModule/Sources/Core/Client/Common/JSONNull.swift

@@ -7,13 +7,13 @@
 
 import Foundation
 
-public class JSONNull: Codable, Hashable {
+public final class JSONNull: Codable, Hashable, Sendable {
     public static func == (_: JSONNull, _: JSONNull) -> Bool {
         true
     }
 
-    public var hashValue: Int {
-        0
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(0)
     }
 
     public init() {}

MutaroModule/Sources/Core/Client/Entity/BuildsEntity.swift

@@ -9,7 +9,7 @@ import Foundation
 
 // MARK: - BuildsEntity
 
-public struct BuildsEntity {
+public struct BuildsEntity: Sendable {
     public let links: BuildsLinks?
     public let data: [BuildsDatum]?
     public let meta: BuildsMeta?
@@ -22,7 +22,7 @@ public struct BuildsEntity {
 
     // MARK: - BuildsDatum
 
-    public struct BuildsDatum {
+    public struct BuildsDatum: Sendable {
         public let id: String?
         public let relationships: BuildsRelationships?
         public let links: BuildsLinks?
@@ -40,7 +40,7 @@ public struct BuildsEntity {
 
     // MARK: - BuildsAttributes
 
-    public struct BuildsAttributes {
+    public struct BuildsAttributes: Sendable {
         public let expirationDate: Date?
         public let expired: Bool?
         public let processingState, buildAudienceType, minOSVersion: String?
@@ -68,7 +68,7 @@ public struct BuildsEntity {
 
     // MARK: - BuildsIconAssetToken
 
-    public struct BuildsIconAssetToken {
+    public struct BuildsIconAssetToken: Sendable {
         public let width: Int?
         public let templateURL: String?
         public let height: Int?
@@ -82,7 +82,7 @@ public struct BuildsEntity {
 
     // MARK: - BuildsLinks
 
-    public struct BuildsLinks {
+    public struct BuildsLinks: Sendable {
         public let linksSelf: String?
 
         public init(linksSelf: String?) {
@@ -92,7 +92,7 @@ public struct BuildsEntity {
 
     // MARK: - BuildsRelationships
 
-    public struct BuildsRelationships {
+    public struct BuildsRelationships: Sendable {
         public let betaAppReviewSubmission, appStoreVersion, appEncryptionDeclaration, individualTesters: BuildsLinksElement?
         public let perfPowerMetrics: BuildsPerfPowerMetrics?
         public let betaBuildLocalizations: BuildsLinksElement?
@@ -118,7 +118,7 @@ public struct BuildsEntity {
 
     // MARK: - BuildsLinksElement
 
-    public struct BuildsLinksElement {
+    public struct BuildsLinksElement: Sendable {
         public let links: BuildsLinksDetails?
 
         public init(links: BuildsLinksDetails?) {
@@ -128,7 +128,7 @@ public struct BuildsEntity {
 
     // MARK: - BuildsLinksDetails
 
-    public struct BuildsLinksDetails {
+    public struct BuildsLinksDetails: Sendable {
         public let related, linksSelf: String?
 
         public init(related: String?, linksSelf: String?) {
@@ -139,7 +139,7 @@ public struct BuildsEntity {
 
     // MARK: - BuildsBetaGroups
 
-    public struct BuildsBetaGroups {
+    public struct BuildsBetaGroups: Sendable {
         public let links: BuildsLinks?
 
         public init(links: BuildsLinks?) {
@@ -149,7 +149,7 @@ public struct BuildsEntity {
 
     // MARK: - BuildsPerfPowerMetrics
 
-    public struct BuildsPerfPowerMetrics {
+    public struct BuildsPerfPowerMetrics: Sendable {
         public let links: BuildsPerfPowerMetricsLinks?
 
         public init(links: BuildsPerfPowerMetricsLinks?) {
@@ -159,7 +159,7 @@ public struct BuildsEntity {
 
     // MARK: - BuildsPerfPowerMetricsLinks
 
-    public struct BuildsPerfPowerMetricsLinks {
+    public struct BuildsPerfPowerMetricsLinks: Sendable {
         public let related: String?
 
         public init(related: String?) {
@@ -169,7 +169,7 @@ public struct BuildsEntity {
 
     // MARK: - BuildsMeta
 
-    public struct BuildsMeta {
+    public struct BuildsMeta: Sendable {
         public let paging: BuildsPaging?
 
         public init(paging: BuildsPaging?) {
@@ -179,7 +179,7 @@ public struct BuildsEntity {
 
     // MARK: - BuildsPaging
 
-    public struct BuildsPaging {
+    public struct BuildsPaging: Sendable {
         public let total, limit: Int?
 
         public init(total: Int?, limit: Int?) {