Fix Swift 6.2 build blockers and concurrency issues

Author: g-cqd

.plan/IMPLEMENTATION_PLAN.md

@@ -0,0 +1,63 @@
+{
+  "version": 1,
+  "lineLength": 120,
+  "indentation": { "spaces": 4 },
+  "tabWidth": 4,
+  "maximumBlankLines": 1,
+  "respectsExistingLineBreaks": true,
+  "lineBreakBeforeControlFlowKeywords": false,
+  "lineBreakBeforeEachArgument": false,
+  "lineBreakBeforeEachGenericRequirement": false,
+  "prioritizeKeepingFunctionOutputTogether": false,
+  "indentConditionalCompilationBlocks": true,
+  "lineBreakAroundMultilineExpressionChainComponents": false,
+  "fileScopedDeclarationPrivacy": { "accessLevel": "private" },
+  "indentSwitchCaseLabels": false,
+  "spacesAroundRangeFormationOperators": false,
+  "multiElementCollectionTrailingCommas": true,
+  "rules": {
+    "AllPublicDeclarationsHaveDocumentation": false,
+    "AlwaysUseLiteralForEmptyCollectionInit": true,
+    "AlwaysUseLowerCamelCase": true,
+    "AmbiguousTrailingClosureOverload": true,
+    "AvoidRetroactiveConformances": true,
+    "BeginDocumentationCommentWithOneLineSummary": false,
+    "DoNotUseSemicolons": true,
+    "DontRepeatTypeInStaticProperties": true,
+    "FileScopedDeclarationPrivacy": true,
+    "FullyIndirectEnum": true,
+    "GroupNumericLiterals": true,
+    "IdentifiersMustBeASCII": true,
+    "NeverForceUnwrap": true,
+    "NeverUseForceTry": true,
+    "NeverUseImplicitlyUnwrappedOptionals": true,
+    "NoAccessLevelOnExtensionDeclaration": true,
+    "NoAssignmentInExpressions": true,
+    "NoBlockComments": true,
+    "NoCasesWithOnlyFallthrough": true,
+    "NoEmptyLinesOpeningClosingBraces": true,
+    "NoEmptyTrailingClosureParentheses": true,
+    "NoLabelsInCasePatterns": true,
+    "NoLeadingUnderscores": false,
+    "NoParensAroundConditions": true,
+    "NoPlaygroundLiterals": true,
+    "NoVoidReturnOnFunctionSignature": true,
+    "OmitExplicitReturns": false,
+    "OneCasePerLine": true,
+    "OneVariableDeclarationPerLine": true,
+    "OnlyOneTrailingClosureArgument": true,
+    "OrderedImports": true,
+    "ReplaceForEachWithForLoop": true,
+    "ReturnVoidInsteadOfEmptyTuple": true,
+    "TypeNamesShouldBeCapitalized": true,
+    "UseEarlyExits": false,
+    "UseExplicitNilCheckInConditions": false,
+    "UseLetInEveryBoundCaseVariable": true,
+    "UseShorthandTypeNames": true,
+    "UseSingleLinePropertyGetter": true,
+    "UseSynthesizedInitializer": false,
+    "UseTripleSlashForDocumentationComments": true,
+    "UseWhereClausesInForLoops": false,
+    "ValidateDocumentationComments": false
+  }
+}

.swift-format

@@ -679,7 +679,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = studio.aemi.ada23.Pasitea;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -712,7 +712,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = studio.aemi.ada23.Pasitea;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

Pasitea.xcodeproj/project.pbxproj

@@ -11,8 +11,8 @@ struct TopBarIconSet: OptionSet {
     let rawValue: Int
 
     static let close = TopBarIconSet(rawValue: 1 << 0)
-    static let info  = TopBarIconSet(rawValue: 1 << 1)
-    static let add   = TopBarIconSet(rawValue: 1 << 2)
+    static let info = TopBarIconSet(rawValue: 1 << 1)
+    static let add = TopBarIconSet(rawValue: 1 << 2)
 
     static let none: TopBarIconSet = []
 }

Pasitea/Model/TopBarIconSet.swift

@@ -11,7 +11,7 @@ import SwiftUI
 
 @Model
 public final class TrackItem: Identifiable {
-    @Attribute(.unique) public let id: UUID
+    @Attribute(.unique) public var id: UUID
     public var type: TrackType.RawValue = TrackType.none.rawValue
     public var desc: String = ""
     public var tags: [String] = []
@@ -48,7 +48,7 @@ public final class TrackItem: Identifiable {
         self.previousId = previousId ?? nil
     }
 
-    init(_ item: TrackItem ) {
+    init(_ item: TrackItem) {
         self.id = UUID()
         self.type = item.type
         self.desc = item.desc
@@ -63,7 +63,7 @@ extension TrackItem {
     @Transient
     public var typeAsTrackType: TrackType {
         get {
-            (TrackType(rawValue: self.type))!
+            TrackType(rawValue: self.type) ?? .none
         }
         set(rawValue) {
             self.type = rawValue.rawValue

Pasitea/Model/TrackItem.swift

@@ -17,7 +17,7 @@ class TrackItemWrapper {
 
     public func reset(_ modelContext: ModelContext, tags: String...) -> TrackItemWrapper {
         for tag in tags {
-            self.item.addTags( tag )
+            self.item.addTags(tag)
         }
         self.item.endsNow().saveInto(modelContext)
         self.item = TrackItem(type: self.item.typeAsTrackType, previousId: self.item.previousId ?? self.item.id)
@@ -27,15 +27,15 @@ class TrackItemWrapper {
     public func startsNow(_ tags: String...) -> TrackItemWrapper {
         self.item.startsNow()
         for tag in tags {
-            self.item.addTags( tag )
+            self.item.addTags(tag)
         }
         return self
     }
 
     public func endsNow(_ tags: String...) -> TrackItemWrapper {
         self.item.startsNow()
         for tag in tags {
-            self.item.addTags( tag )
+            self.item.addTags(tag)
         }
         return self
     }

Pasitea/Model/TrackItemWrapper.swift

@@ -5,8 +5,8 @@
 //  Created by Guillaume Coquard on 16/10/23.
 //
 
-import SwiftUI
 import SwiftData
+import SwiftUI
 
 @main
 struct PasiteaApp: App {
@@ -16,7 +16,7 @@ struct PasiteaApp: App {
 
     init() {
         do {
-            container = try ModelContainer( for: TrackItem.self )
+            container = try ModelContainer(for: TrackItem.self)
         } catch {
             #if DEBUG
             print(error.localizedDescription)

Pasitea/PasiteaApp.swift

@@ -53,13 +53,15 @@ struct CalmSingleStepView: View {
             }
             Spacer(minLength: 16)
             HStack(alignment: .center) {
-                (
-                    calmStep.id != 4
-                        ? Button("Next", systemImage: "arrow.right.circle.fill") { currentStep = getNextScreen().wrappedValue }
-                        : Button("Finish", systemImage: "checkmark.circle.fill") { currentStep = getNextScreen().wrappedValue }
-                )
-                .pasiteaButtonStyle(.borderedProminent)
-                .customHaptic(currentStep)
+                (calmStep.id != 4
+                    ? Button("Next", systemImage: "arrow.right.circle.fill") {
+                        currentStep = getNextScreen().wrappedValue
+                    }
+                    : Button("Finish", systemImage: "checkmark.circle.fill") {
+                        currentStep = getNextScreen().wrappedValue
+                    })
+                    .pasiteaButtonStyle(.borderedProminent)
+                    .customHaptic(currentStep)
             }
             .frame(height: 128)
             Spacer()

Pasitea/View/Calm/Calm - 5 Steps/CalmSingleStepView.swift

@@ -6,8 +6,8 @@
 //
 
 import Foundation
-import SwiftUI
 import SwiftData
+import SwiftUI
 
 struct CalmStepsView: View {
     @Environment(ModelData.self) private var modelData
@@ -48,7 +48,7 @@ struct CalmStepsView: View {
             GradientView()
 
             VStack(spacing: 10) {
-                CalmSingleStepView( step: $currentStep, getNextScreen: getNextScreen )
+                CalmSingleStepView(step: $currentStep, getNextScreen: getNextScreen)
             }
 
             VStack {
@@ -65,19 +65,20 @@ struct CalmStepsView: View {
                             .fontDesign(.serif)
                             .fontWeight(.bold)
                         Group {
-                            Text("""
-The 5-4-3-2-1 method is a scientifically proven quick anxiety and stress reduction technique.
+                            Text(
+                                """
+                                The 5-4-3-2-1 method is a scientifically proven quick anxiety and stress reduction technique.
 
-To calm down:
+                                To calm down:
 
-1. See: Identify 5 things around you.
-2. Touch: Acknowledge 4 things you can physically feel.
-3. Hear: Note 3 sounds in your environment.
-4. Smell: Focus on 2 scents.
-5. Taste: Experience 1 taste, like a sip of water.
+                                1. See: Identify 5 things around you.
+                                2. Touch: Acknowledge 4 things you can physically feel.
+                                3. Hear: Note 3 sounds in your environment.
+                                4. Smell: Focus on 2 scents.
+                                5. Taste: Experience 1 taste, like a sip of water.
 
-Engaging your senses this way helps you stay present and reduce anxiety.
-""")
+                                Engaging your senses this way helps you stay present and reduce anxiety.
+                                """)
                         }
                         .multilineTextAlignment(.leading)
                         .fontWeight(.medium)
@@ -91,7 +92,7 @@ Engaging your senses this way helps you stay present and reduce anxiety.
         .ultraThinInterface()
         .customCover(isPresented: $exerciseFinished, transition: .blur, animation: .easeInOut(duration: 2)) {
             CalmExerciseFinishedView(
-                trackItem: TrackItem( trackItem ).endsNow(),
+                trackItem: TrackItem(trackItem).endsNow(),
                 dismiss: dismiss,
                 customDismiss: customDismiss
             )

Pasitea/View/Calm/Calm - 5 Steps/CalmStepsView.swift

@@ -5,8 +5,8 @@
 //  Created by Antonio Abbatiello on 25/10/23.
 //
 
-import SwiftUI
 import Combine
+import SwiftUI
 
 struct BreatheFlowerAnimation: View {
     @Environment(\.modelContext) var modelContext
@@ -62,22 +62,22 @@ struct BreatheFlowerAnimation: View {
                 ZStack {
                     // Middle Left Petal - Second
                     Image("flower")
-                        .rotationEffect(.degrees( isFlowerOpen ? -25 : -5), anchor: .bottom)
+                        .rotationEffect(.degrees(isFlowerOpen ? -25 : -5), anchor: .bottom)
 
                     // Middle Right Petal - Fourth
                     Image("flower")
-                        .rotationEffect(.degrees( isFlowerOpen ? 25 : 5), anchor: .bottom)
+                        .rotationEffect(.degrees(isFlowerOpen ? 25 : 5), anchor: .bottom)
 
                     // Middle Petal - Third
                     Image("flower")
 
                     // Left Petal - First
                     Image("flower")
-                        .rotationEffect(.degrees( isFlowerOpen ? -50 : -10), anchor: .bottom)
+                        .rotationEffect(.degrees(isFlowerOpen ? -50 : -10), anchor: .bottom)
 
                     // Right Petal - Fifth
                     Image("flower")
-                        .rotationEffect(.degrees( isFlowerOpen ? 50 : 10), anchor: .bottom)
+                        .rotationEffect(.degrees(isFlowerOpen ? 50 : 10), anchor: .bottom)
                 }
                 .shadow(radius: isFlowerOpen ? 20 : 0)
                 .hueRotation(Angle(degrees: isFlowerOpen ? -170 : 0))
@@ -87,7 +87,8 @@ struct BreatheFlowerAnimation: View {
             ZStack {
                 if !isDone {
                     Group {
-                        Text( !isPreparing
+                        Text(
+                            !isPreparing
                                 ? isRunning
                                 ? "Breathe Out"
                                 : "Restart when you're ready"
@@ -111,29 +112,27 @@ struct BreatheFlowerAnimation: View {
             .fontWeight(.bold)
 
             Button("Placeholder") {
-                DispatchQueue.global(qos: .background).async {
-                    if isPreparing {
-                        isPreparing = false
-                        started = true
-                    } else if !isRunning {
-                        breatheCount = 0
-                    }
+                if isPreparing {
+                    isPreparing = false
+                    started = true
+                } else if !isRunning {
+                    breatheCount = 0
+                }
 
-                    isRunning.toggle()
+                isRunning.toggle()
 
-                    if isRunning {
-                        trackItem.startsNow()
-                    } else {
-                        trackItem.reset(modelContext, tags: self.breatheCount.description)
-                    }
+                if isRunning {
+                    trackItem.startsNow()
+                } else {
+                    trackItem.reset(modelContext, tags: breatheCount.description)
+                }
 
-                    withAnimation( flowerAnimation ) {
-                        isFlowerOpen.toggle()
-                    }
+                withAnimation(flowerAnimation) {
+                    isFlowerOpen.toggle()
+                }
 
-                    withAnimation( textAnimation ) {
-                        isFlowerOpenForText.toggle()
-                    }
+                withAnimation(textAnimation) {
+                    isFlowerOpenForText.toggle()
                 }
             }
             .foregroundStyle(.clear)
@@ -142,10 +141,12 @@ struct BreatheFlowerAnimation: View {
             .background {
                 GeometryReader { geo in
                     ProgressView(value: Double(breatheCount), total: Double(numberOrBreathing)) {
-                        Label(isPreparing ? "Start" : isRunning ? "Stop" : "Restart",
-                              systemImage: isPreparing ? "play" : isRunning ? "stop" : "arrow.clockwise")
-                            .font(.title3)
-                            .fontWeight(.semibold)
+                        Label(
+                            isPreparing ? "Start" : isRunning ? "Stop" : "Restart",
+                            systemImage: isPreparing ? "play" : isRunning ? "stop" : "arrow.clockwise"
+                        )
+                        .font(.title3)
+                        .fontWeight(.semibold)
                     }
                     .onReceive(timer) { _ in
                         if isRunning {