From f1707a70e15cd48092fb257c973caaceab28047c Mon Sep 17 00:00:00 2001 From: Philippe Weidmann Date: Fri, 4 Oct 2024 13:11:58 +0200 Subject: [PATCH] chore: Implicit dependencies --- .mise.toml | 2 +- MailCore/Cache/RootViewState.swift | 1 + Project.swift | 150 ++++++++++++++++++++++------- Tuist/Package.resolved | 4 +- Tuist/Package.swift | 40 +++++++- 5 files changed, 156 insertions(+), 41 deletions(-) diff --git a/.mise.toml b/.mise.toml index 3d5e34f36..6b5f0f097 100644 --- a/.mise.toml +++ b/.mise.toml @@ -1,5 +1,5 @@ [tools] -tuist = '4.28.1' +tuist = '4.30.0' periphery = '2.21.1' swiftformat = '0.54.5' swiftlint = '0.57.0' diff --git a/MailCore/Cache/RootViewState.swift b/MailCore/Cache/RootViewState.swift index 7e88aabd7..83e8169c2 100644 --- a/MailCore/Cache/RootViewState.swift +++ b/MailCore/Cache/RootViewState.swift @@ -21,6 +21,7 @@ import Contacts import Foundation import InfomaniakCore import InfomaniakCoreCommonUI +import InfomaniakCoreDB import InfomaniakDI import InfomaniakLogin import SwiftUI diff --git a/Project.swift b/Project.swift index 4d06ba6f7..72bd86d01 100644 --- a/Project.swift +++ b/Project.swift @@ -46,14 +46,35 @@ let project = Project(name: "Mail", Constants.stripSymbolsScript ], dependencies: [ - .target(name: "MailResources"), .target(name: "MailCore"), .target(name: "MailCoreUI"), + .target(name: "MailResources"), .target(name: "MailNotificationServiceExtension"), .target(name: "MailNotificationContentExtension"), .target(name: "MailShareExtension"), .target(name: "MailAppIntentsExtension"), - .external(name: "Realm") + .external(name: "InfomaniakBugTracker"), + .external(name: "InfomaniakCoreCommonUI"), + .external(name: "InfomaniakCoreDB"), + .external(name: "InfomaniakCoreSwiftUI"), + .external(name: "InfomaniakCore"), + .external(name: "InfomaniakCreateAccount"), + .external(name: "InfomaniakDI"), + .external(name: "InfomaniakLogin"), + .external(name: "InfomaniakNotifications"), + .external(name: "InfomaniakOnboarding"), + .external(name: "InfomaniakRichHTMLEditor"), + .external(name: "NavigationBackport"), + .external(name: "Popovers"), + .external(name: "Realm"), + .external(name: "RealmSwift"), + .external(name: "SwiftModalPresentation"), + .external(name: "SwiftRegex"), + .external(name: "SwiftSoup"), + .external(name: "SwiftUIBackports"), + .external(name: "SwiftUIIntrospect"), + .external(name: "VersionChecker"), + .external(name: "WrappingHStack") ], settings: .settings(base: Constants.baseSettings), environmentVariables: [ @@ -69,9 +90,15 @@ let project = Project(name: "Mail", sources: "MailTests/**", dependencies: [ .target(name: "Infomaniak Mail"), - .target(name: "MailResources"), .target(name: "MailCore"), + .target(name: "MailResources"), + .external(name: "InfomaniakCoreDB"), + .external(name: "InfomaniakCore"), + .external(name: "InfomaniakDI"), + .external(name: "InfomaniakLogin"), + .external(name: "Realm"), .external(name: "RealmSwift"), + .external(name: "SwiftSoup") ], settings: .settings(base: Constants.testSettings)), .target(name: "MailUITests", @@ -83,9 +110,8 @@ let project = Project(name: "Mail", sources: "MailUITests/**", dependencies: [ .target(name: "Infomaniak Mail"), - .target(name: "MailResources"), .target(name: "MailCore"), - .external(name: "Realm") + .target(name: "MailResources") ], settings: .settings(base: Constants.testSettings)), .target(name: "MailShareExtension", @@ -107,10 +133,31 @@ let project = Project(name: "Mail", entitlements: "MailShareExtension/ShareExtension.entitlements", scripts: [Constants.swiftlintScript], dependencies: [ - .target(name: "MailResources"), .target(name: "MailCore"), .target(name: "MailCoreUI"), - .external(name: "Realm") + .target(name: "MailResources"), + .external(name: "InfomaniakBugTracker"), + .external(name: "InfomaniakCoreCommonUI"), + .external(name: "InfomaniakCoreDB"), + .external(name: "InfomaniakCoreSwiftUI"), + .external(name: "InfomaniakCore"), + .external(name: "InfomaniakCreateAccount"), + .external(name: "InfomaniakDI"), + .external(name: "InfomaniakLogin"), + .external(name: "InfomaniakNotifications"), + .external(name: "InfomaniakOnboarding"), + .external(name: "InfomaniakRichHTMLEditor"), + .external(name: "NavigationBackport"), + .external(name: "Popovers"), + .external(name: "Realm"), + .external(name: "RealmSwift"), + .external(name: "SwiftModalPresentation"), + .external(name: "SwiftRegex"), + .external(name: "SwiftSoup"), + .external(name: "SwiftUIBackports"), + .external(name: "SwiftUIIntrospect"), + .external(name: "VersionChecker"), + .external(name: "WrappingHStack") ], settings: .settings(base: Constants.baseSettings)), .target(name: "MailNotificationServiceExtension", @@ -131,9 +178,13 @@ let project = Project(name: "Mail", sources: "MailNotificationServiceExtension/**", entitlements: "MailResources/Mail.entitlements", dependencies: [ - .target(name: "MailResources"), .target(name: "MailCore"), - .external(name: "Realm") + .target(name: "MailResources"), + .external(name: "InfomaniakCore"), + .external(name: "InfomaniakDI"), + .external(name: "InfomaniakLogin"), + .external(name: "InfomaniakNotifications"), + .external(name: "RealmSwift") ], settings: .settings(base: Constants.baseSettings)), .target(name: "MailNotificationContentExtension", @@ -152,12 +203,33 @@ let project = Project(name: "Mail", entitlements: "MailNotificationContentExtension/MailNotificationContentExtension.entitlements", scripts: [Constants.swiftlintScript], dependencies: [ - .target(name: "MailResources"), .target(name: "MailCore"), .target(name: "MailCoreUI"), - .external(name: "Realm"), + .target(name: "MailResources"), .sdk(name: "UserNotifications", type: .framework), - .sdk(name: "UserNotificationsUI", type: .framework) + .sdk(name: "UserNotificationsUI", type: .framework), + .external(name: "InfomaniakBugTracker"), + .external(name: "InfomaniakCoreCommonUI"), + .external(name: "InfomaniakCoreDB"), + .external(name: "InfomaniakCoreSwiftUI"), + .external(name: "InfomaniakCore"), + .external(name: "InfomaniakCreateAccount"), + .external(name: "InfomaniakDI"), + .external(name: "InfomaniakLogin"), + .external(name: "InfomaniakNotifications"), + .external(name: "InfomaniakOnboarding"), + .external(name: "InfomaniakRichHTMLEditor"), + .external(name: "NavigationBackport"), + .external(name: "Popovers"), + .external(name: "Realm"), + .external(name: "RealmSwift"), + .external(name: "SwiftModalPresentation"), + .external(name: "SwiftRegex"), + .external(name: "SwiftSoup"), + .external(name: "SwiftUIBackports"), + .external(name: "SwiftUIIntrospect"), + .external(name: "VersionChecker"), + .external(name: "WrappingHStack") ], settings: .settings(base: Constants.baseSettings)), .target(name: "MailAppIntentsExtension", @@ -182,7 +254,7 @@ let project = Project(name: "Mail", entitlements: "MailResources/Mail.entitlements", dependencies: [ .target(name: "MailCore"), - .external(name: "RealmSwift"), + .external(name: "InfomaniakDI") ], settings: .settings(base: Constants.baseSettings)), .target(name: "MailResources", @@ -210,33 +282,35 @@ let project = Project(name: "Mail", sources: "MailCore/**", dependencies: [ .target(name: "MailResources"), - .external(name: "Algorithms"), .external(name: "Alamofire"), + .external(name: "Algorithms"), .external(name: "Atlantis"), - .external(name: "InfomaniakCore"), - .external(name: "InfomaniakCoreDB"), + .external(name: "InfomaniakBugTracker"), + .external(name: "InfomaniakConcurrency"), .external(name: "InfomaniakCoreCommonUI"), + .external(name: "InfomaniakCoreDB"), .external(name: "InfomaniakCoreSwiftUI"), .external(name: "InfomaniakCoreUIKit"), - .external(name: "InfomaniakLogin"), + .external(name: "InfomaniakCore"), + .external(name: "InfomaniakCreateAccount"), .external(name: "InfomaniakDI"), - .external(name: "InfomaniakConcurrency"), + .external(name: "InfomaniakLogin"), .external(name: "InfomaniakNotifications"), - .external(name: "InfomaniakBugTracker"), - .external(name: "InfomaniakCreateAccount"), + .external(name: "InfomaniakRichHTMLEditor"), + .external(name: "NukeUI"), + .external(name: "Nuke"), .external(name: "RealmSwift"), .external(name: "Realm"), - .external(name: "SwiftRegex"), - .external(name: "Nuke"), - .external(name: "NukeUI"), - .external(name: "SwiftSoup"), + .external(name: "SnackBar"), + .external(name: "SVGKit"), .external(name: "Swifter"), - .external(name: "VersionChecker"), .external(name: "SwiftModalPresentation"), - .external(name: "SVGKit"), - .external(name: "InfomaniakRichHTMLEditor") + .external(name: "SwiftRegex"), + .external(name: "SwiftSoup"), + .external(name: "VersionChecker") ], - settings: .settings(base: Constants.baseSettings)), + settings: .settings(base: + Constants.baseSettings.merging(["OTHER_LDFLAGS": "$(inherited) -ObjC"]))), .target(name: "MailCoreUI", destinations: Constants.destinations, product: .framework, @@ -245,15 +319,23 @@ let project = Project(name: "Mail", infoPlist: "MailCoreUI/Info.plist", sources: "MailCoreUI/**", dependencies: [ - .target(name: "MailResources"), .target(name: "MailCore"), - .external(name: "SwiftUIIntrospect-Static"), + .target(name: "MailResources"), + .external(name: "InfomaniakCoreCommonUI"), + .external(name: "InfomaniakCoreSwiftUI"), + .external(name: "InfomaniakCoreUIKit"), + .external(name: "InfomaniakCore"), + .external(name: "InfomaniakDI"), + .external(name: "InfomaniakLogin"), .external(name: "InfomaniakOnboarding"), - .external(name: "Shimmer"), - .external(name: "WrappingHStack"), .external(name: "NavigationBackport"), + .external(name: "NukeUI"), .external(name: "Popovers"), - .external(name: "SwiftUIBackports") + .external(name: "RealmSwift"), + .external(name: "Shimmer"), + .external(name: "SwiftUIBackports"), + .external(name: "SwiftUIIntrospect-Static"), + .external(name: "WrappingHStack") ], settings: .settings(base: Constants.baseSettings)) ], @@ -262,6 +344,6 @@ let project = Project(name: "Mail", shared: true, buildAction: .buildAction(targets: ["Infomaniak Mail"]), testAction: .targets(["MailTests", "MailUITests"]), - runAction: .runAction(executable: "Infomaniak Mail")), + runAction: .runAction(executable: "Infomaniak Mail")) ], fileHeaderTemplate: .file("file-header-template.txt")) diff --git a/Tuist/Package.resolved b/Tuist/Package.resolved index 08542466b..3476d26fe 100644 --- a/Tuist/Package.resolved +++ b/Tuist/Package.resolved @@ -41,8 +41,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/Infomaniak/ios-core", "state" : { - "revision" : "688a8ff5f5dbc213bc4e752db97ed54e8570fc4c", - "version" : "12.3.3" + "branch" : "transitive-dependency", + "revision" : "644120d40013d5c780c8ed83edd61fb5be0d9c90" } }, { diff --git a/Tuist/Package.swift b/Tuist/Package.swift index 2730170fc..7d6227ae6 100644 --- a/Tuist/Package.swift +++ b/Tuist/Package.swift @@ -7,8 +7,41 @@ import ProjectDescriptionHelpers let packageSettings = PackageSettings( productTypes: [ + "Alamofire": .framework, + "Algorithms": .staticFramework, + "Atlantis": .staticFramework, + "CocoaLumberjackSwift": .framework, + "CocoaLumberjack": .framework, + "InfomaniakBugTracker": .framework, + "InfomaniakConcurrency": .staticFramework, + "InfomaniakCoreCommonUI": .framework, + "InfomaniakCoreDB": .framework, + "InfomaniakCoreSwiftUI": .framework, + "InfomaniakCoreUIKit": .framework, + "InfomaniakCore": .framework, + "InfomaniakCreateAccount": .framework, + "InfomaniakDI": .framework, + "InfomaniakLogin": .framework, + "InfomaniakNotifications": .framework, + "InfomaniakOnboarding": .framework, + "InfomaniakRichHTMLEditor": .framework, + "NavigationBackport": .framework, + "NukeUI": .framework, "Nuke": .framework, - "InfomaniakDI": .framework + "Popovers": .framework, + "RealmSwift": .framework, + "Realm": .framework, + "Shimmer": .staticFramework, + "SnackBar": .framework, + "SVGKit": .framework, + "Swifter": .staticFramework, + "SwiftModalPresentation": .framework, + "SwiftRegex": .framework, + "SwiftSoup": .framework, + "SwiftUIBackports": .framework, + "SwiftUIIntrospect": .framework, + "VersionChecker": .framework, + "WrappingHStack": .framework ] ) @@ -21,18 +54,17 @@ let package = Package( .package(url: "https://github.com/Infomaniak/ios-login", .upToNextMajor(from: "7.0.1")), .package(url: "https://github.com/Infomaniak/ios-dependency-injection", .upToNextMajor(from: "2.0.0")), .package(url: "https://github.com/Infomaniak/swift-concurrency", .upToNextMajor(from: "0.0.5")), - .package(url: "https://github.com/Infomaniak/ios-core", .upToNextMajor(from: "12.3.3")), + .package(url: "https://github.com/Infomaniak/ios-core", branch: "transitive-dependency"), .package(url: "https://github.com/Infomaniak/ios-core-ui", .upToNextMajor(from: "13.1.0")), .package(url: "https://github.com/Infomaniak/ios-notifications", .upToNextMajor(from: "8.0.0")), .package(url: "https://github.com/Infomaniak/ios-create-account", .upToNextMajor(from: "12.0.0")), - .package(url: "https://github.com/Infomaniak/ios-bug-tracker", .upToNextMajor(from: "7.0.0")), + .package(url: "https://github.com/Infomaniak/ios-bug-tracker", .upToNextMajor(from: "7.0.1")), .package(url: "https://github.com/Infomaniak/ios-version-checker", .upToNextMajor(from: "7.0.0")), .package(url: "https://github.com/Infomaniak/ios-onboarding", .upToNextMajor(from: "1.0.3")), .package(url: "https://github.com/Infomaniak/swift-modal-presentation", .upToNextMajor(from: "1.0.0")), .package(url: "https://github.com/Infomaniak/SwiftSoup", .upToNextMajor(from: "1.1.0")), .package(url: "https://github.com/ProxymanApp/atlantis", .upToNextMajor(from: "1.21.0")), .package(url: "https://github.com/Alamofire/Alamofire", .upToNextMajor(from: "5.2.2")), - .package(url: "https://github.com/CocoaLumberjack/CocoaLumberjack", .upToNextMajor(from: "3.7.0")), .package(url: "https://github.com/realm/realm-swift", .upToNextMajor(from: "10.41.0")), .package(url: "https://github.com/flowbe/SwiftRegex", .upToNextMajor(from: "1.0.0")), .package(url: "https://github.com/matomo-org/matomo-sdk-ios", .upToNextMajor(from: "7.5.1")),