Merge pull request 'fix(m9): link ICCeryCore statically so the app launches standalone (#117)' (#118) from feat/117-static-iccerycore into milestone/m9-monterey

Reviewed-on: #118

Packages/ICCeryCore/Package.swift

@@ -5,7 +5,10 @@ let package = Package(
     name: "ICCeryCore",
     platforms: [.macOS(.v12)],
     products: [
-        .library(name: "ICCeryCore", targets: ["ICCeryCore"]),
+        // Static so app + test bundles each link ICCeryCore directly —
+        // a dynamic package product framework is not embedded in the
+        // .app and dyld kills the app at launch on macOS 12 (#117).
+        .library(name: "ICCeryCore", type: .static, targets: ["ICCeryCore"]),
     ],
     targets: [
         .target(name: "ICCeryCore"),

Sources/ICCery/Print/PrintSessionViewModel.swift

@@ -110,7 +110,8 @@ final class PrintSessionViewModel: ObservableObject {
         isPrinting = true
         let task = Task { @MainActor [weak self] in
             guard let self else { return }
-            defer { self.printTask = nil }
+            // `defer` cannot mutate isolated state under Swift 5.7
+            // (Xcode 14.2 / macOS 12 runner), so clear explicitly (#113).
             var printed = 0
             for page in result.pages {
                 do {
@@ -123,6 +124,7 @@ final class PrintSessionViewModel: ObservableObject {
                             + error.localizedDescription
                     )
                     isPrinting = false
+                    self.printTask = nil
                     return
                 }
             }
@@ -132,6 +134,7 @@ final class PrintSessionViewModel: ObservableObject {
                 autoHideAfter: nil
             )
             isPrinting = false
+            self.printTask = nil
         }
         printTask = task
     }
@@ -141,7 +144,6 @@ final class PrintSessionViewModel: ObservableObject {
         isPrinting = true
         let task = Task { @MainActor [weak self] in
             guard let self else { return }
-            defer { self.printTask = nil }
             do {
                 try await spool(page, index: page.index, pageSize: pageSize)
                 printNotice = Notice(
@@ -156,6 +158,7 @@ final class PrintSessionViewModel: ObservableObject {
                 )
             }
             isPrinting = false
+            self.printTask = nil
         }
         printTask = task
     }

Sources/ICCery/Stage4View.swift

@@ -138,16 +138,20 @@ struct Stage4View: View {
                 .textFieldStyle(.roundedBorder)
                 .accessibilityIdentifier("colprofCopyright")
 
-            Toggle("Apply calibration curve", isOn: $model.applyCalibration)
-                .accessibilityIdentifier("colprofApplyCalibration")
+            // Nested VStack keeps the parent at the Swift 5.7 ViewBuilder
+            // 10-child limit (Xcode 14.2 / macOS 12 CI runner, #111).
+            VStack(alignment: .leading, spacing: 12) {
+                Toggle("Apply calibration curve", isOn: $model.applyCalibration)
+                    .accessibilityIdentifier("colprofApplyCalibration")
 
-            if model.applyCalibration {
-                HStack {
-                    TextField("Calibration .cal file", text: $model.calibrationFile)
-                        .textFieldStyle(.roundedBorder)
-                        .accessibilityIdentifier("colprofCalibrationFile")
-                    Button("Browse…") { model.browseForCalibrationFile() }
-                        .accessibilityIdentifier("btnBrowseCalibrationFile")
+                if model.applyCalibration {
+                    HStack {
+                        TextField("Calibration .cal file", text: $model.calibrationFile)
+                            .textFieldStyle(.roundedBorder)
+                            .accessibilityIdentifier("colprofCalibrationFile")
+                        Button("Browse…") { model.browseForCalibrationFile() }
+                            .accessibilityIdentifier("btnBrowseCalibrationFile")
+                    }
                 }
             }
         }

Tests/ICCeryCoreTests/ProcessRunSupportTests.swift

@@ -21,7 +21,9 @@ final class ProcessRunSupportTests: XCTestCase {
             setRunning: { running.append($0) },
             resetLog: { resets += 1 },
             onLog: { batch in
-                MainActor.assertIsolated()
+                // MainActor.assertIsolated() needs Swift 5.9; the runner is
+                // on Xcode 14.2 (Swift 5.7) (#115).
+                XCTAssertTrue(Thread.isMainThread)
                 received.append(contentsOf: batch)
             }
         ) { onLog in