Merge pull request #91 from shimastripe/feature/swift6-mode

Enable Swift 6 mode

.github/workflows/codeql-analysis.yml

@@ -11,7 +11,7 @@ jobs:
     name: Analyze
     runs-on: macos-14
     env:
-      DEVELOPER_DIR: "/Applications/Xcode_15.4.0.app/Contents/Developer"
+      DEVELOPER_DIR: "/Applications/Xcode_16_beta_6.app/Contents/Developer"
     timeout-minutes: 120
     permissions:
       security-events: write

App/InAppPurchaseViewer/InAppPurchaseViewer.xcodeproj/project.pbxproj

@@ -82,6 +82,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 458FE1652B6E239700798686 /* Build configuration list for PBXNativeTarget "InAppPurchaseViewer" */;
 			buildPhases = (
+				45A8B3AC2C920C25004E6CF6 /* Run swift-format */,
 				458FE1522B6E239600798686 /* Sources */,
 				458FE1532B6E239600798686 /* Frameworks */,
 				458FE1542B6E239600798686 /* Resources */,
@@ -146,6 +147,28 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		45A8B3AC2C920C25004E6CF6 /* Run swift-format */ = {
+			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Run swift-format";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "cd ../../\nmake format\n";
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		458FE1522B6E239600798686 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -216,6 +239,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 6.0;
 			};
 			name = Debug;
 		};
@@ -269,6 +293,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_VERSION = 6.0;
 			};
 			name = Release;
 		};
@@ -293,7 +318,6 @@
 				SUPPORTED_PLATFORMS = macosx;
 				SUPPORTS_MACCATALYST = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -318,7 +342,6 @@
 				SUPPORTED_PLATFORMS = macosx;
 				SUPPORTS_MACCATALYST = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

App/InAppPurchaseViewer/InAppPurchaseViewer/InAppPurchaseViewerApp.swift

@@ -25,8 +25,9 @@ struct InAppPurchaseViewerApp: App {
         }
         .commands {
             CommandGroup(after: .appInfo) {
-                Button("Check for Updates...",
-                       action: updaterController.updater.checkForUpdates)
+                Button(
+                    "Check for Updates...",
+                    action: updaterController.updater.checkForUpdates)
             }
         }
         Settings {

App/Package.swift

@@ -5,7 +5,7 @@
 import PackageDescription
 
 let package = Package(
-  name: "client",
-  products: [],
-  targets: []
-)
+    name: "client",
+    products: [],
+    targets: []
+)

Makefile

@@ -0,0 +1,3 @@
+.PHONY: format
+format:
+		xcrun --sdk macosx swift-format swift-format -p -r -i .

Package.swift

@@ -1,21 +1,8 @@
-// swift-tools-version: 5.10
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
-let swiftSettings: [SwiftSetting] = [
-    .enableUpcomingFeature("BareSlashRegexLiterals"),
-    .enableUpcomingFeature("ConciseMagicFile"),
-    .enableUpcomingFeature("DeprecateApplicationMain"),
-    .enableUpcomingFeature("DisableOutwardActorInference"),
-    .enableUpcomingFeature("ExistentialAny"),
-    .enableUpcomingFeature("ForwardTrailingClosures"),
-    .enableUpcomingFeature("GlobalConcurrency"),
-    .enableUpcomingFeature("ImplicitOpenExistentials"),
-    .enableUpcomingFeature("ImportObjcForwardDeclarations"),
-    .enableUpcomingFeature("IsolatedDefaultValues"),
-]
-
 let package = Package(
     name: "InAppPurchaseViewer",
     defaultLocalization: "ja",
@@ -34,7 +21,6 @@ let package = Package(
         .package(url: "https://github.com/sparkle-project/Sparkle", exact: "2.6.4"),
         .package(url: "https://github.com/pointfreeco/swift-dependencies", exact: "1.3.9"),
         .package(url: "https://github.com/apple/swift-http-types", exact: "1.3.0"),
-        .package(url: "https://github.com/apple/swift-format", exact: "510.1.0"),
     ],
     targets: [
         .target(
@@ -56,24 +42,21 @@ let package = Package(
             dependencies: [
                 .product(name: "Dependencies", package: "swift-dependencies"),
                 .product(name: "DependenciesMacros", package: "swift-dependencies"),
-            ],
-            swiftSettings: swiftSettings
+            ]
         ),
         .target(
             name: "IAPInterface",
             dependencies: [
                 "IAPCore",
                 // Use Model...
                 .product(name: "AppStoreServerLibrary", package: "app-store-server-library-swift"),
-            ],
-            swiftSettings: swiftSettings
+            ]
         ),
         .target(
             name: "IAPModel",
             dependencies: [
-                "IAPInterface",
-            ],
-            swiftSettings: swiftSettings
+                "IAPInterface"
+            ]
         ),
         .testTarget(
             name: "IAPModelTests",
@@ -85,14 +68,14 @@ let package = Package(
                 "IAPModel",
                 .product(name: "Sparkle", package: "Sparkle"),
             ],
-            swiftSettings: swiftSettings,
             plugins: [
-                .plugin(name: "LicensesPlugin", package: "LicensesPlugin"),
+                .plugin(name: "LicensesPlugin", package: "LicensesPlugin")
             ]
         ),
         .testTarget(
             name: "IAPViewTests",
             dependencies: ["IAPView"]
         ),
-    ]
+    ],
+    swiftLanguageVersions: [.v6]
 )

README.md

@@ -53,7 +53,7 @@ Get the statuses for all of a customer’s auto-renewable subscriptions in your
 
 ### Development Environment
 
-- macOS 14 Sonoma
-- Xcode 15.4
-- Swift 5.10
+- macOS 15 Sequoia
+- Xcode 16.0
+- Swift 6.0
 - Sandbox enabled

Sources/IAPClient/CredentialClient.swift

@@ -8,7 +8,7 @@
 import Dependencies
 import Foundation
 import IAPInterface
-import KeychainAccess
+@preconcurrency import KeychainAccess
 
 extension CredentialClient: DependencyKey {
 

Sources/IAPClient/RootCertificateClient.swift

@@ -10,7 +10,7 @@ import Foundation
 import HTTPTypes
 import HTTPTypesFoundation
 import IAPInterface
-import KeychainAccess
+@preconcurrency import KeychainAccess
 
 extension RootCertificateClient: DependencyKey {
     public static let liveValue: RootCertificateClient = {

Sources/IAPClient/SignedDataVerifier+.swift

@@ -8,7 +8,7 @@
 import AppStoreServerLibrary
 import Foundation
 
-extension VerificationError: Error {}
+extension VerificationError: @retroactive Error {}
 
 extension SignedDataVerifier {
 

Sources/IAPInterface/AppStoreServerClientInterface.swift

@@ -56,13 +56,14 @@ public struct AppStoreServerClient: Sendable {
 extension AppStoreServerClient: TestDependencyKey {
     public static let testValue = Self()
     public static let previewValue: AppStoreServerClient = {
-        let makeDate: (_ year: Int, _ month: Int, _ day: Int, _ hour: Int, _ minute: Int) -> Date? =
-            {
-                (year, month, day, hour, minute) in
-                Calendar.current.date(
-                    from: .init(
-                        year: year, month: month, day: day, hour: hour, minute: minute))
-            }
+        let makeDate:
+            @Sendable (_ year: Int, _ month: Int, _ day: Int, _ hour: Int, _ minute: Int) -> Date? =
+                {
+                    (year, month, day, hour, minute) in
+                    Calendar.current.date(
+                        from: .init(
+                            year: year, month: month, day: day, hour: hour, minute: minute))
+                }
 
         return .init(
             fetchNotificationHistory: { _, _, _, _, _, _, _ in

Sources/IAPInterface/Model/AutoRenewStatus+.swift

@@ -8,7 +8,7 @@
 import AppStoreServerLibrary
 import Foundation
 
-extension AutoRenewStatus: CustomStringConvertible {
+extension AutoRenewStatus: @retroactive CustomStringConvertible {
 
     public var description: String {
         switch self {

Sources/IAPInterface/Model/ExpirationIntent+.swift

@@ -8,7 +8,7 @@
 import AppStoreServerLibrary
 import Foundation
 
-extension ExpirationIntent: CustomStringConvertible {
+extension ExpirationIntent: @retroactive CustomStringConvertible {
 
     public var description: String {
         switch self {

Sources/IAPInterface/Model/JWSTransactionDecodedPayload+.swift

@@ -7,7 +7,7 @@
 
 import AppStoreServerLibrary
 
-extension JWSTransactionDecodedPayload: Identifiable {
+extension JWSTransactionDecodedPayload: @retroactive Identifiable {
     public var id: String? {
         transactionId
     }

Sources/IAPInterface/Model/NotificationHistoryModel.swift

@@ -5,10 +5,10 @@
 //  Created by shimastripe on 2024/02/10.
 //
 
-import AppStoreServerLibrary  // For Model
+@preconcurrency import AppStoreServerLibrary  // For Model
 import Foundation
 
-public struct NotificationHistoryModel: Codable, Hashable {
+public struct NotificationHistoryModel: Codable, Hashable, Sendable {
 
     public var paginationToken: String?
 
@@ -25,7 +25,7 @@ public struct NotificationHistoryModel: Codable, Hashable {
     }
 }
 
-public struct NotificationHistoryItem: Identifiable, Codable, Hashable {
+public struct NotificationHistoryItem: Identifiable, Codable, Hashable, Sendable {
 
     public struct ID: RawRepresentable, Hashable, Sendable, Codable, ExpressibleByStringLiteral {
         public let rawValue: String

Sources/IAPInterface/Model/OfferType+.swift

@@ -8,7 +8,7 @@
 import AppStoreServerLibrary
 import Foundation
 
-extension OfferType: CustomStringConvertible {
+extension OfferType: @retroactive CustomStringConvertible {
 
     public var description: String {
         switch self {

Sources/IAPInterface/Model/PriceIncreaseStatus+.swift

@@ -8,7 +8,7 @@
 import AppStoreServerLibrary
 import Foundation
 
-extension PriceIncreaseStatus: CustomStringConvertible {
+extension PriceIncreaseStatus: @retroactive CustomStringConvertible {
 
     public var description: String {
         switch self {

Sources/IAPInterface/Model/RevocationReason+.swift

@@ -7,7 +7,7 @@
 
 import AppStoreServerLibrary
 
-extension RevocationReason: CustomStringConvertible {
+extension RevocationReason: @retroactive CustomStringConvertible {
 
     public var description: String {
         switch self {

Sources/IAPInterface/Model/ServerEnvironment.swift

@@ -7,7 +7,9 @@
 
 import Foundation
 
-public enum ServerEnvironment: Identifiable, Hashable, CustomStringConvertible, CaseIterable {
+public enum ServerEnvironment: Identifiable, Hashable, CustomStringConvertible, CaseIterable,
+    Sendable
+{
     case sandbox
     case production
 

Sources/IAPInterface/Model/Status+.swift

@@ -8,7 +8,7 @@
 import AppStoreServerLibrary
 import SwiftUI
 
-extension Status: CustomStringConvertible {
+extension Status: @retroactive CustomStringConvertible {
     public var description: String {
         switch self {
         case .active:

Sources/IAPInterface/Model/SubscriptionStatus.swift

@@ -5,10 +5,10 @@
 //  Created by shimastripe on 2024/02/22.
 //
 
-import AppStoreServerLibrary  // For Model
+@preconcurrency import AppStoreServerLibrary  // For Model
 import Foundation
 
-public struct SubscriptionStatus: Codable, Hashable {
+public struct SubscriptionStatus: Codable, Hashable, Sendable {
 
     public let environment: Environment?
 
@@ -28,7 +28,7 @@ public struct SubscriptionStatus: Codable, Hashable {
     }
 }
 
-public struct SubscriptionGroup: Codable, Hashable, Identifiable {
+public struct SubscriptionGroup: Codable, Hashable, Identifiable, Sendable {
 
     public let subscriptionGroupIdentifier: String?
 
@@ -47,7 +47,7 @@ public struct SubscriptionGroup: Codable, Hashable, Identifiable {
     }
 }
 
-public struct LastTransaction: Codable, Hashable, Identifiable {
+public struct LastTransaction: Codable, Hashable, Identifiable, Sendable {
 
     public let status: Status?
 

Sources/IAPInterface/Model/TransactionHistory.swift

@@ -5,10 +5,10 @@
 //  Created by shimastripe on 2024/02/24.
 //
 
-import AppStoreServerLibrary  // For Model
+@preconcurrency import AppStoreServerLibrary  // For Model
 import Foundation
 
-public struct TransactionHistory: Codable, Hashable {
+public struct TransactionHistory: Codable, Hashable, Sendable {
 
     public var revision: String?
 

Sources/IAPInterface/RootCertificateClientInterface.swift

@@ -30,12 +30,12 @@ extension RootCertificateClient: TestDependencyKey {
     public static let testValue = Self()
     public static let previewValue: RootCertificateClient = .init(
         fetch: {
-            unimplemented()
+            unimplemented(placeholder: Data())
         },
         get: {
             Data()
         },
         remove: {
-            unimplemented()
+            unimplemented(placeholder: ())
         })
 }