Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Bump tuist + Rewrite some dependencies declarations #1528

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/uitests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ jobs:
touch $ENV_PATH
echo -e "enum Env {\n static let testAccountEmail = \"$UITEST_ACCOUNT_EMAIL\"\n static let testAccountPassword = \"$UITEST_ACCOUNT_PASSWORD\"\n}" > $ENV_PATH
- name: Setup
run: tuist install && tuist generate -n
run: tuist install && tuist generate --no-open
- name: UITest
run: tuist test Mail-Workspace --device "iPhone 15 Pro" --test-targets "MailUITests/MailUITests"
2 changes: 1 addition & 1 deletion .mise.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tools]
tuist = '4.12.1'
tuist = '4.32.0'
periphery = '2.21.1'
swiftformat = '0.54.5'
swiftlint = '0.57.0'
1 change: 1 addition & 0 deletions MailCore/Cache/RootViewState.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import Contacts
import Foundation
import InfomaniakCore
import InfomaniakCoreCommonUI
import InfomaniakCoreDB
import InfomaniakDI
import InfomaniakLogin
import SwiftUI
Expand Down
163 changes: 132 additions & 31 deletions Project.swift

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Tuist/Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/Infomaniak/ios-core",
"state" : {
"revision" : "82fa2c1f0fc4b6d0f520697bb073a7acddd52833",
"version" : "12.5.0"
"branch" : "transitive-dependency",
"revision" : "790e943d8314beb597ff8b04475bec024e330d46"
}
},
{
Expand Down
42 changes: 35 additions & 7 deletions Tuist/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,41 @@ import ProjectDescriptionHelpers

let packageSettings = PackageSettings(
productTypes: [
"RealmSwift": .staticLibrary,
"Realm": .staticLibrary,
"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,
"SwiftBackports": .framework,
"InfomaniakLogin": .framework,
"InfomaniakNotifications": .framework,
"InfomaniakOnboarding": .framework,
"InfomaniakRichHTMLEditor": .framework,
"NavigationBackport": .framework,
"NukeUI": .framework,
"Nuke": .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
"SwiftUIIntrospect": .framework,
"VersionChecker": .framework,
"WrappingHStack": .framework
]
)

Expand All @@ -25,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.1.0")),
.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")),
Expand Down
2 changes: 1 addition & 1 deletion scripts/periphery.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
eval "$($HOME/.local/bin/mise activate bash --shims)"

tuist install
tuist generate -n
tuist generate --no-open


# Perform the periphery scan and handle directory removal based on argument
Expand Down
Loading