Merge pull request #235 from uhooi/feature/bump_xcode_to_16

Bump Xcode from 15.4 to 16.0
uhooi · Sep 17, 2024 · 963544a · 963544a
2 parents afede7c + 4b9fabd
commit 963544a
Show file tree

Hide file tree

Showing 28 changed files with 98 additions and 163 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,20 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+max_line_length = 140
+end_of_line = lf
+charset = utf-8
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.swift]
+indent_size = 4
+
+[Makefile]
+indent_style = tab
+
+[*.md]
+trim_trailing_whitespace = false
+max_line_length = unset
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ permissions:
   contents: read
 
 env:
-  DEVELOPER_DIR: /Applications/Xcode_15.4.app
+  DEVELOPER_DIR: /Applications/Xcode_16.0.app
 
 jobs:
   build:

diff --git a/App/Develop.xcodeproj/project.pbxproj b/App/Develop.xcodeproj/project.pbxproj
@@ -252,6 +252,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_STRICT_CONCURRENCY = complete;
 			};
 			name = Debug;
 		};
@@ -307,6 +308,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_STRICT_CONCURRENCY = complete;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -345,7 +347,7 @@
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -383,7 +385,7 @@
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

diff --git a/App/Production.xcodeproj/project.pbxproj b/App/Production.xcodeproj/project.pbxproj
@@ -229,6 +229,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_STRICT_CONCURRENCY = complete;
 			};
 			name = Debug;
 		};
@@ -284,6 +285,7 @@
 				MTL_FAST_MATH = YES;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_STRICT_CONCURRENCY = complete;
 			};
 			name = Release;
 		};
@@ -325,8 +327,8 @@
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_STRICT_CONCURRENCY = targeted;
-				SWIFT_VERSION = 5.0;
+				SWIFT_STRICT_CONCURRENCY = complete;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -369,8 +371,8 @@
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_STRICT_CONCURRENCY = targeted;
-				SWIFT_VERSION = 5.0;
+				SWIFT_STRICT_CONCURRENCY = complete;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

diff --git a/Loki.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Loki.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,13 +1,13 @@
 {
-  "originHash" : "c8222e67b71e52ad42dbe97f9f64a00f8f9ca10eb16c103f0fcf6981ae37efd9",
+  "originHash" : "46d4a894610dea88c6f16090667e2703eb6ad07b5f0aaae8e556d491297df223",
   "pins" : [
     {
       "identity" : "licensesplugin",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/maiyama18/LicensesPlugin",
       "state" : {
-        "revision" : "e7dbcda9f67fdd747c16244f97070a009205e814",
-        "version" : "0.1.5"
+        "revision" : "3061787a7eca7ba801d7a3abccfc077053e79d73",
+        "version" : "0.2.0"
       }
     },
     {
@@ -24,17 +24,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/playbook-ui/playbook-ios.git",
       "state" : {
-        "revision" : "b2f25b15e82bc9aca59d60e79695f0c338e0e2e9",
-        "version" : "0.3.2"
+        "revision" : "da86a1a533e7ab5b1203908dfbb33aa38b782421",
+        "version" : "0.4.1"
       }
     },
     {
       "identity" : "swift-algorithms",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-algorithms.git",
       "state" : {
-        "revision" : "b14b7f4c528c942f121c8b860b9410b2bf57825e",
-        "version" : "1.0.0"
+        "revision" : "f6919dfc309e7f1b56224378b11e28bab5bccc42",
+        "version" : "1.2.0"
       }
     },
     {

diff --git a/LokiPackage/Package.resolved b/LokiPackage/Package.resolved
@@ -1,14 +1,6 @@
 {
+  "originHash" : "bb6c5795966de4e05096c73b6cd92718594b769072ebbf694b00bd26290184ce",
   "pins" : [
-    {
-      "identity" : "collectionconcurrencykit",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/JohnSundell/CollectionConcurrencyKit.git",
-      "state" : {
-        "revision" : "b4f23e24b5a1bff301efc5e70871083ca029ff95",
-        "version" : "0.2.0"
-      }
-    },
     {
       "identity" : "licensesplugin",
       "kind" : "remoteSourceControl",
@@ -19,21 +11,21 @@
       }
     },
     {
-      "identity" : "playbook-ios",
+      "identity" : "logdog",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/playbook-ui/playbook-ios.git",
+      "location" : "https://github.com/uhooi/Logdog.git",
       "state" : {
-        "revision" : "3320069508e677858a5dbfac72622b885f3b351e",
-        "version" : "0.3.3"
+        "revision" : "bc02bf2122f9da59e99710d1abb5e55fe40c950b",
+        "version" : "0.3.0"
       }
     },
     {
-      "identity" : "sourcekitten",
+      "identity" : "playbook-ios",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/jpsim/SourceKitten.git",
+      "location" : "https://github.com/playbook-ui/playbook-ios.git",
       "state" : {
-        "revision" : "fc12c0f182c5cf80781dd933b17a82eb98bd7c61",
-        "version" : "0.33.1"
+        "revision" : "3320069508e677858a5dbfac72622b885f3b351e",
+        "version" : "0.3.3"
       }
     },
     {
@@ -45,15 +37,6 @@
         "version" : "1.0.0"
       }
     },
-    {
-      "identity" : "swift-argument-parser",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-argument-parser.git",
-      "state" : {
-        "revision" : "fddd1c00396eed152c45a46bea9f47b98e59301d",
-        "version" : "1.2.0"
-      }
-    },
     {
       "identity" : "swift-numerics",
       "kind" : "remoteSourceControl",
@@ -62,60 +45,7 @@
         "revision" : "0a5bc04095a675662cf24757cc0640aa2204253b",
         "version" : "1.0.2"
       }
-    },
-    {
-      "identity" : "swift-syntax",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-syntax.git",
-      "state" : {
-        "revision" : "a2d31e8880224f5a619f24bf58c122836faf99ff"
-      }
-    },
-    {
-      "identity" : "swiftgenplugin",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/SwiftGen/SwiftGenPlugin",
-      "state" : {
-        "revision" : "879b85a470cacd70c19e22eb7e11a3aed66f4068",
-        "version" : "6.6.2"
-      }
-    },
-    {
-      "identity" : "swiftlint",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/uhooi/SwiftLint.git",
-      "state" : {
-        "branch" : "feature/add_command_plugin",
-        "revision" : "05048f87831117747467d520c69de879c63daf4a"
-      }
-    },
-    {
-      "identity" : "swiftytexttable",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/scottrhoyt/SwiftyTextTable.git",
-      "state" : {
-        "revision" : "c6df6cf533d120716bff38f8ff9885e1ce2a4ac3",
-        "version" : "0.9.0"
-      }
-    },
-    {
-      "identity" : "swxmlhash",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/drmohundro/SWXMLHash.git",
-      "state" : {
-        "revision" : "4d0f62f561458cbe1f732171e625f03195151b60",
-        "version" : "7.0.1"
-      }
-    },
-    {
-      "identity" : "yams",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/jpsim/Yams.git",
-      "state" : {
-        "revision" : "01835dc202670b5bb90d07f3eae41867e9ed29f6",
-        "version" : "5.0.1"
-      }
     }
   ],
-  "version" : 2
+  "version" : 3
 }
diff --git a/LokiPackage/Package.swift b/LokiPackage/Package.swift
@@ -1,19 +1,7 @@
-// swift-tools-version: 5.10
-// swiftlint:disable:previous file_name
+// swift-tools-version: 6.0
 
 import PackageDescription
 
-private extension PackageDescription.Target.Dependency {
-    static let algorithms: Self = .product(name: "Algorithms", package: "swift-algorithms")
-    static let logdogUI: Self = .product(name: "LogdogUI", package: "Logdog")
-    static let playbook: Self = .product(name: "Playbook", package: "playbook-ios")
-    static let playbookUI: Self = .product(name: "PlaybookUI", package: "playbook-ios")
-}
-
-private extension PackageDescription.Target.PluginUsage {
-    static let licenses: Self = .plugin(name: "LicensesPlugin", package: "LicensesPlugin")
-}
-
 let debugOtherSwiftFlags = [
     "-Xfrontend", "-warn-long-expression-type-checking=500",
     "-Xfrontend", "-warn-long-function-bodies=500",
@@ -23,17 +11,8 @@ let debugOtherSwiftFlags = [
 
 let debugSwiftSettings: [PackageDescription.SwiftSetting] = [
     .unsafeFlags(debugOtherSwiftFlags, .when(configuration: .debug)),
-    .enableUpcomingFeature("ConciseMagicFile", .when(configuration: .debug)), // SE-0274
-    .enableUpcomingFeature("ForwardTrailingClosures", .when(configuration: .debug)), // SE-0286
     .enableUpcomingFeature("ExistentialAny", .when(configuration: .debug)), // SE-0335
-    .enableUpcomingFeature("BareSlashRegexLiterals", .when(configuration: .debug)), // SE-0354
-    .enableUpcomingFeature("DeprecateApplicationMain", .when(configuration: .debug)), // SE-0383
-    .enableUpcomingFeature("ImportObjcForwardDeclarations", .when(configuration: .debug)), // SE-0384
-    .enableUpcomingFeature("DisableOutwardActorInference", .when(configuration: .debug)), // SE-0401
-    .enableUpcomingFeature("IsolatedDefaultValues", .when(configuration: .debug)), // SE-0411
-    .enableUpcomingFeature("GlobalConcurrency", .when(configuration: .debug)), // SE-0412
-    .enableExperimentalFeature("AccessLevelOnImport", .when(configuration: .debug)), // SE-0409
-    .enableExperimentalFeature("StrictConcurrency", .when(configuration: .debug)),
+    .enableUpcomingFeature("InternalImportsByDefault", .when(configuration: .debug)), // SE-0409
 ]
 
 let productionFeatures: [PackageDescription.Target.Dependency] = [
@@ -58,12 +37,12 @@ let package = Package(
     ],
     dependencies: [
         // Libraries
-        .package(url: "https://github.com/apple/swift-algorithms.git", from: "1.0.0"),
+        .package(url: "https://github.com/apple/swift-algorithms.git", from: "1.2.0"),
         .package(url: "https://github.com/uhooi/Logdog.git", from: "0.3.0"),
-        .package(url: "https://github.com/playbook-ui/playbook-ios.git", from: "0.3.2"),
+        .package(url: "https://github.com/playbook-ui/playbook-ios.git", from: "0.4.1"),
 
         // Plugins
-        .package(url: "https://github.com/maiyama18/LicensesPlugin", from: "0.1.5"),
+        .package(url: "https://github.com/maiyama18/LicensesPlugin", from: "0.2.0"),
     ],
     targets: [
         // App layer
@@ -81,8 +60,8 @@ let package = Package(
             name: "CatalogApp",
             dependencies: productionFeatures + [
                 "UICore",
-                .playbook,
-                .playbookUI,
+                .product(name: "Playbook", package: "playbook-ios"),
+                .product(name: "PlaybookUI", package: "playbook-ios"),
             ],
             path: "./Sources/Apps/Catalog"),
 
@@ -92,7 +71,7 @@ let package = Package(
             dependencies: [
                 "SakatsuData",
                 "UICore",
-                .algorithms,
+                .product(name: "Algorithms", package: "swift-algorithms"),
             ],
             path: "./Sources/Features/Sakatsu"),
         .testTarget(
@@ -112,12 +91,12 @@ let package = Package(
             ],
             path: "./Sources/Features/Licenses",
             plugins: [
-                .licenses,
+                .plugin(name: "LicensesPlugin", package: "LicensesPlugin"),
             ]),
         .target(
             name: "DebugFeature",
             dependencies: [
-                .logdogUI,
+                .product(name: "LogdogUI", package: "Logdog"),
             ],
             path: "./Sources/Features/Debug"),
 

diff --git a/LokiPackage/Sources/Apps/Catalog/CatalogRootScreen.swift b/LokiPackage/Sources/Apps/Catalog/CatalogRootScreen.swift
@@ -1,4 +1,4 @@
-import SwiftUI
+public import SwiftUI
 import PlaybookUI
 
 public struct CatalogRootScreen: View {

diff --git a/LokiPackage/Sources/Apps/Catalog/PlaybookScreen.swift b/LokiPackage/Sources/Apps/Catalog/PlaybookScreen.swift
@@ -16,6 +16,7 @@ struct PlaybookScreen: View {
                 .tabItem {
                     Image(systemName: "rectangle.grid.3x2")
                         .accessibilityHidden(true)
+
                     Text("Gallery")
                 }
 
@@ -24,6 +25,7 @@ struct PlaybookScreen: View {
                 .tabItem {
                     Image(systemName: "doc.text.magnifyingglass")
                         .accessibilityHidden(true)
+
                     Text("Catalog")
                 }
         }

diff --git a/LokiPackage/Sources/Apps/Catalog/Scenarios/LicensesScenarios.swift b/LokiPackage/Sources/Apps/Catalog/Scenarios/LicensesScenarios.swift
@@ -2,7 +2,7 @@ import Playbook
 import LicensesFeature
 
 @MainActor
-struct LicensesScenarios: ScenarioProvider {
+struct LicensesScenarios: @preconcurrency ScenarioProvider {
     static func addScenarios(into playbook: Playbook) {
         playbook.addScenarios(of: "Licenses") {
             Scenario("LicenseList", layout: .fill) {

diff --git a/LokiPackage/Sources/Apps/Catalog/Scenarios/SakatsuScenarios.swift b/LokiPackage/Sources/Apps/Catalog/Scenarios/SakatsuScenarios.swift
@@ -3,7 +3,7 @@ import Playbook
 import SakatsuFeature
 
 @MainActor
-struct SakatsuScenarios: ScenarioProvider {
+struct SakatsuScenarios: @preconcurrency ScenarioProvider {
     static func addScenarios(into playbook: Playbook) {
         playbook.addScenarios(of: "Sakatsu") {
             Scenario("SakatsuList", layout: .fill) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,7 @@ permissions: @@
       contents: read
     env:
-      DEVELOPER_DIR: /Applications/Xcode_15.4.app
+      DEVELOPER_DIR: /Applications/Xcode_16.0.app
     jobs:
       build:
@@ Expand Down @@