🔀️ Merge branch 'ladislas/bugfix/remove-implicit-dependencies' into d…

…evelop

.github/workflows/ci-fastlane-release_app_store.yml

@@ -48,6 +48,7 @@ jobs:
       - name: Setup mise
         run: |
           echo "$HOME/.local/share/mise/shims" >> $GITHUB_PATH
+          mise install
 
       - uses: actions/cache@v4
         with:

.github/workflows/ci-fastlane-release_beta_internal.yml

@@ -62,6 +62,7 @@ jobs:
       - name: Setup mise
         run: |
           echo "$HOME/.local/share/mise/shims" >> $GITHUB_PATH
+          mise install
 
       - uses: actions/cache@v4
         with:

.github/workflows/ci-linter-swiftformat.yml

@@ -29,6 +29,7 @@ jobs:
       - name: Setup mise
         run: |
           echo "$HOME/.local/share/mise/shims" >> $GITHUB_PATH
+          mise install
 
       - name: Run swiftformat
         run: |

.github/workflows/ci-linter-swiftlint.yml

@@ -29,6 +29,7 @@ jobs:
       - name: Setup mise
         run: |
           echo "$HOME/.local/share/mise/shims" >> $GITHUB_PATH
+          mise install
 
       - name: Run swiftlint
         run: |

.github/workflows/ci-tuist-build.yml

@@ -45,6 +45,7 @@ jobs:
       - name: Setup mise
         run: |
           echo "$HOME/.local/share/mise/shims" >> $GITHUB_PATH
+          mise install
 
       - name: tuist install
         run: |

.github/workflows/ci-tuist-unit_tests.yml

@@ -39,6 +39,7 @@ jobs:
       - name: Setup mise
         run: |
           echo "$HOME/.local/share/mise/shims" >> $GITHUB_PATH
+          mise install
 
       - name: tuist install
         run: |

.mise.toml

@@ -1,4 +1,4 @@
 [tools]
-swiftlint = "0.57.0"
-tuist = "4.33.0"
-swiftformat = "0.54.6"
+swiftlint = "0.57.1"
+tuist = "4.36.0"
+swiftformat = "0.55.3"

Apps/LekaApp/Project.swift

@@ -94,6 +94,7 @@ let project = Project.app(
         .external(name: "DeviceKit"),
         .external(name: "Fit"),
         .external(name: "MarkdownUI"),
+        .external(name: "Version"),
         .external(name: "Yams"),
     ],
     scripts: [

Apps/LekaApp/Sources/Views/AccountCreation/Process/AccountCreationProcess+Step2.swift

@@ -70,6 +70,7 @@ extension AccountCreationProcess {
         @StateObject private var caregiverManagerViewModel = CaregiverManagerViewModel()
 
         @State private var isCaregiverCreationPresented: Bool = false
+
         private let caregiverManager: CaregiverManager = .shared
     }
 }

Apps/LekaApp/Sources/Views/AvatarPicker/AvatarPicker.swift

@@ -20,6 +20,7 @@ struct AvatarPicker: View {
 
     @Environment(\.dismiss) var dismiss
     @State var selectedAvatar: String = ""
+
     let onCancel: (() -> Void)?
     let onSelect: ((String) -> Void)?
 

Apps/LekaApp/Sources/Views/ProfessionPicker/ProfessionPicker.swift

@@ -22,6 +22,7 @@ struct ProfessionPicker: View {
 
     @Environment(\.dismiss) var dismiss
     @State var selectedProfessions: Set<Profession> = []
+
     let selectedProfessionsIDs: [String]
     let onCancel: (() -> Void)?
     let onSelect: (([String]) -> Void)?

Apps/LekaApp/Sources/Views/Users/CareReceiver/CarereceiverAvatarCell.swift

@@ -56,8 +56,9 @@ struct CarereceiverAvatarCell: View {
 
     // MARK: Private
 
-    private let strokeColor: Color = .init(light: UIColor.systemGray3, dark: UIColor.systemGray2)
     @ObservedObject private var styleManager: StyleManager = .shared
+
+    private let strokeColor: Color = .init(light: UIColor.systemGray3, dark: UIColor.systemGray2)
 }
 
 #Preview {

Apps/LekaApp/Sources/Views/Users/CareReceiver/CarereceiverPicker.swift

@@ -96,13 +96,13 @@ struct CarereceiverPicker: View {
         case skip
     }
 
-    private let columns = Array(repeating: GridItem(spacing: -20), count: 4)
-
     @StateObject private var carereceiverManagerViewModel = CarereceiverManagerViewModel()
     @ObservedObject private var navigation: Navigation = .shared
     @State private var selectedCarereceiver: [Carereceiver]
     @State private var action: ActionType?
 
+    private let columns = Array(repeating: GridItem(spacing: -20), count: 4)
+
     private var noCarereceiverView: some View {
         VStack {
             Text(l10n.CarereceiverPicker.CreateFirstCarereceiver.message)

Apps/LekaApp/Sources/Views/Users/CareReceiver/CreateCarereceiverView.swift

@@ -50,6 +50,7 @@ struct CreateCarereceiverView: View {
     // MARK: Internal
 
     @Environment(\.dismiss) var dismiss
+
     var onClose: (() -> Void)?
 
     var carereceiverManager: CarereceiverManager = .shared

Apps/LekaApp/Sources/Views/Users/Caregiver/CreateCaregiverView.swift

@@ -49,6 +49,7 @@ struct CreateCaregiverView: View {
     // MARK: Internal
 
     @Environment(\.dismiss) var dismiss
+
     var onClose: (() -> Void)?
 
     var caregiverManager: CaregiverManager = .shared

Apps/LekaApp/Sources/Views/Users/Caregiver/EditCaregiverView.swift

@@ -126,14 +126,14 @@ struct EditCaregiverView: View {
     @FocusState private var focused: Bool
     @State private var isWhitespacesErrorMessageVisible = false
 
-    private var caregiverManager: CaregiverManager = .shared
-
     @StateObject private var viewModel: EditCaregiverViewViewModel
     @StateObject private var caregiverManagerViewModel = CaregiverManagerViewModel()
 
     @ObservedObject private var styleManager: StyleManager = .shared
     @State private var birthdate: Date
 
+    private var caregiverManager: CaregiverManager = .shared
+
     private var placeholderFirstName = Text(String(l10n.CaregiverCreation.caregiverPlaceholderFirstName.characters))
 
     private var placeholderLastName = Text(String(l10n.CaregiverCreation.caregiverPlaceholderLastName.characters))

Apps/LekaUpdater/Project.swift

@@ -44,5 +44,7 @@ let project = Project.app(
         .project(target: "DesignKit", path: Path("../../Modules/DesignKit")),
         .project(target: "LocalizationKit", path: Path("../../Modules/LocalizationKit")),
         .project(target: "RobotKit", path: Path("../../Modules/RobotKit")),
+
+        .external(name: "Version"),
     ]
 )

Modules/BLEKit/Examples/BLEKitExample/Sources/Views/RobotDiscoveryView.swift

@@ -69,9 +69,9 @@ struct RobotDiscoveryView: View {
 
     // MARK: Private
 
-    private var discovery: RobotDiscoveryModel
-
     // MARK: - Environment variables
 
     @EnvironmentObject private var robotListViewModel: RobotListViewModel
+
+    private var discovery: RobotDiscoveryModel
 }

Modules/ContentKit/Sources/Views/ActivityDetailsView.swift

@@ -175,15 +175,15 @@ public struct ActivityDetailsView: View {
 
     // MARK: Private
 
-    private let activity: Activity
-
     @State private var selectedAuthor: Author?
     @State private var selectedSkill: Skill?
 
     @ObservedObject private var styleManager: StyleManager = .shared
 
     @StateObject private var rootAccountViewModel = RootAccountManagerViewModel()
     @StateObject private var caregiverManagerViewModel = CaregiverManagerViewModel()
+
+    private let activity: Activity
 }
 
 // MARK: - l10n.ActivityDetailsView

Modules/ContentKit/Sources/Views/ActivityGridView.swift

@@ -68,8 +68,9 @@ public struct ActivityGridView: View {
 
     // MARK: Private
 
-    private let columns = Array(repeating: GridItem(), count: 3)
     @ObservedObject private var styleManager: StyleManager = .shared
+
+    private let columns = Array(repeating: GridItem(), count: 3)
 }
 
 #Preview {

Modules/ContentKit/Sources/Views/ActivityHorizontalListView.swift

@@ -64,9 +64,10 @@ public struct ActivityHorizontalListView: View {
 
     // MARK: Private
 
+    @ObservedObject private var styleManager: StyleManager = .shared
+
     private let columns = Array(repeating: GridItem(), count: 3)
     private let rows = [GridItem()]
-    @ObservedObject private var styleManager: StyleManager = .shared
 }
 
 #Preview {

Modules/ContentKit/Sources/Views/CurriculumDetailsView.swift

@@ -187,15 +187,15 @@ public struct CurriculumDetailsView: View {
 
     // MARK: Private
 
-    private let curriculum: Curriculum
-
     @State private var selectedAuthor: Author?
     @State private var selectedSkill: Skill?
     @State private var isDescriptionExpanded = false
     @ObservedObject private var styleManager: StyleManager = .shared
 
     @StateObject private var rootAccountViewModel = RootAccountManagerViewModel()
     @StateObject private var caregiverManagerViewModel = CaregiverManagerViewModel()
+
+    private let curriculum: Curriculum
 }
 
 // MARK: - l10n.CurriculumDetailsView

Modules/ContentKit/Sources/Views/CurriculumGridView.swift

@@ -52,8 +52,9 @@ public struct CurriculumGridView: View {
 
     // MARK: Private
 
-    private let columns = Array(repeating: GridItem(), count: 3)
     @ObservedObject private var styleManager: StyleManager = .shared
+
+    private let columns = Array(repeating: GridItem(), count: 3)
 }
 
 #Preview {

Modules/ContentKit/Sources/Views/CurriculumGroupboxView.swift

@@ -109,12 +109,12 @@ public struct CurriculumGroupboxView: View {
 
     // MARK: Private
 
-    private let curriculum: Curriculum
-
     @ObservedObject private var styleManager: StyleManager = .shared
 
     @StateObject private var rootAccountViewModel = RootAccountManagerViewModel()
     @StateObject private var caregiverManagerViewModel = CaregiverManagerViewModel()
+
+    private let curriculum: Curriculum
 }
 
 // MARK: - l10n.CurriculumGroupboxView

Modules/ContentKit/Sources/Views/CurriculumHorizontalListView.swift

@@ -53,9 +53,10 @@ public struct CurriculumHorizontalListView: View {
 
     // MARK: Private
 
+    @ObservedObject private var styleManager: StyleManager = .shared
+
     private let columns = Array(repeating: GridItem(), count: 3)
     private let rows = [GridItem()]
-    @ObservedObject private var styleManager: StyleManager = .shared
 }
 
 #Preview {

Modules/ContentKit/Sources/Views/GamepadGridView.swift

@@ -57,8 +57,9 @@ public struct GamepadGridView: View {
 
     // MARK: Private
 
-    private let columns = Array(repeating: GridItem(), count: 2)
     @ObservedObject private var styleManager: StyleManager = .shared
+
+    private let columns = Array(repeating: GridItem(), count: 2)
 }
 
 #Preview {

Modules/ContentKit/Sources/Views/ResourceFileView.swift

@@ -51,10 +51,10 @@ public struct ResourceFileView: View {
 
     // MARK: Internal
 
-    let resource: Category.Resource
-
     @State var isPresented: Bool = false
 
+    let resource: Category.Resource
+
     // MARK: Private
 
     @State private var url: URL?

Modules/ContentKit/Sources/Views/ResourceGridView.swift

@@ -40,8 +40,9 @@ public struct ResourceGridView: View {
 
     // MARK: Private
 
-    private let columns = Array(repeating: GridItem(), count: 2)
     @ObservedObject private var styleManager: StyleManager = .shared
+
+    private let columns = Array(repeating: GridItem(), count: 2)
 }
 
 #Preview {

Modules/ContentKit/Sources/Views/SkillsGridView.swift

@@ -73,8 +73,9 @@ public struct SkillsGridView: View {
 
     // MARK: Private
 
-    private let columns = Array(repeating: GridItem(), count: 3)
     @ObservedObject private var styleManager: StyleManager = .shared
+
+    private let columns = Array(repeating: GridItem(), count: 3)
 }
 
 // MARK: - l10n.SkillsGridView

Modules/ContentKit/Sources/Views/StoryDetailsView.swift

@@ -166,15 +166,15 @@ public struct StoryDetailsView: View {
 
     // MARK: Private
 
-    private let story: Story
-
     @State private var selectedAuthor: Author?
     @State private var selectedSkill: Skill?
 
     @ObservedObject private var styleManager: StyleManager = .shared
 
     @StateObject private var rootAccountViewModel = RootAccountManagerViewModel()
     @StateObject private var caregiverManagerViewModel = CaregiverManagerViewModel()
+
+    private let story: Story
 }
 
 // MARK: - l10n.StoryDetailsView

Modules/ContentKit/Sources/Views/StoryGridView.swift

@@ -63,8 +63,9 @@ public struct StoryGridView: View {
 
     // MARK: Private
 
-    private let columns = Array(repeating: GridItem(), count: 3)
     @ObservedObject private var styleManager: StyleManager = .shared
+
+    private let columns = Array(repeating: GridItem(), count: 3)
 }
 
 #Preview {

Modules/ContentKit/Sources/Views/SubskillsGridView.swift

@@ -97,8 +97,9 @@ public struct SubskillsGridView: View {
 
     // MARK: Private
 
-    private let columns = Array(repeating: GridItem(), count: 2)
     @ObservedObject private var styleManager: StyleManager = .shared
+
+    private let columns = Array(repeating: GridItem(), count: 2)
 }
 
 #Preview {

Modules/DesignKit/Sources/Views/TagView.swift

@@ -36,11 +36,11 @@ public struct TagView: View {
 
     // MARK: Private
 
+    @ObservedObject private var styleManager: StyleManager = .shared
+
     private let title: String
     private let systemImage: String
     private let action: (() -> Void)?
-
-    @ObservedObject private var styleManager: StyleManager = .shared
 }
 
 #Preview {

Modules/FirebaseKit/Project.swift

@@ -20,6 +20,7 @@ let project = Project.module(
         .external(name: "FirebaseAnalytics"),
         .external(name: "FirebaseAuth"),
         .external(name: "FirebaseAuthCombine-Community"),
+        .external(name: "FirebaseCore"),
         .external(name: "FirebaseCrashlytics"),
         .external(name: "FirebaseFirestore"),
         .external(name: "FirebaseFirestoreCombine-Community"),

Modules/GameEngineKit/Project.swift

@@ -25,6 +25,7 @@ let project = Project.module(
         .project(target: "UtilsKit", path: Path("../../Modules/UtilsKit")),
 
         .external(name: "AudioKit"),
+        .external(name: "Lottie"),
         .external(name: "SVGView"),
         .external(name: "SwiftUIJoystick"),
     ]

Modules/GameEngineKit/Sources/OldSystem/Exercises/ActionButton/ActionButton+Observe.swift

@@ -60,11 +60,11 @@ struct ActionButtonObserve: View {
 
     // MARK: Internal
 
+    @Binding var imageWasTapped: Bool
+
     let image: String
     let isSFSymbol: Bool
 
-    @Binding var imageWasTapped: Bool
-
     var body: some View {
         Button {
             withAnimation {