Skip to content

Commit

Permalink
Merge pull request #1226 from Infomaniak/upgrade-core
Browse files Browse the repository at this point in the history
chore: Use core 11.0.0
  • Loading branch information
PhilippeWeidmann authored Jul 12, 2024
2 parents 45f30ef + 372f45d commit c76bb62
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 13 deletions.
3 changes: 2 additions & 1 deletion Project.swift
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,8 @@ let project = Project(name: "kDrive",
.external(name: "MaterialOutlinedTextField"),
.external(name: "SwiftRegex"),
.external(name: "Sentry"),
.external(name: "VersionChecker")
.external(name: "VersionChecker"),
.external(name: "LocalizeKit")
]),
.target(name: "kDriveFileProvider",
destinations: Constants.destinations,
Expand Down
16 changes: 8 additions & 8 deletions Tuist/Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -86,17 +86,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/Infomaniak/ios-core",
"state" : {
"branch" : "mail",
"revision" : "8178fa508021e1d34deed765f545d4333d695a8e"
"revision" : "6c175294c2ff03c43eb7c9bd32ebd3a8c6448b0d",
"version" : "11.0.0"
}
},
{
"identity" : "ios-core-ui",
"kind" : "remoteSourceControl",
"location" : "https://github.com/Infomaniak/ios-core-ui",
"state" : {
"revision" : "b190fc752289c127d17ab707444dc1b83017eaad",
"version" : "8.0.0"
"revision" : "f6aa4a07a6668c86e9665be93cc6199c1dd64895",
"version" : "10.0.0"
}
},
{
Expand All @@ -122,8 +122,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/Infomaniak/ios-version-checker",
"state" : {
"revision" : "4a9f4342fef91a132676ddcdd50c4808fefd4736",
"version" : "5.0.0"
"revision" : "c8fd02352bfc6bede63e41bdb21f2472f7bc1612",
"version" : "6.0.0"
}
},
{
Expand All @@ -149,8 +149,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/Infomaniak/LocalizeKit",
"state" : {
"revision" : "a8f5b63a242a7cb5d8939db011fc9ee871a2a300",
"version" : "1.0.1"
"revision" : "e7dbea6d3a8d57f8352e1457649c45e49699b5eb",
"version" : "1.0.2"
}
},
{
Expand Down
7 changes: 4 additions & 3 deletions Tuist/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,13 @@ let package = Package(
dependencies: [
.package(url: "https://github.com/apple/swift-algorithms", .upToNextMajor(from: "1.2.0")),
.package(url: "https://github.com/Alamofire/Alamofire", .upToNextMajor(from: "5.2.2")),
.package(url: "https://github.com/Infomaniak/ios-core", branch: "mail"),
.package(url: "https://github.com/Infomaniak/ios-core-ui", .upToNextMajor(from: "8.0.0")),
.package(url: "https://github.com/Infomaniak/ios-core", .upToNextMajor(from: "11.0.0")),
.package(url: "https://github.com/Infomaniak/ios-core-ui", .upToNextMajor(from: "10.0.0")),
.package(url: "https://github.com/Infomaniak/ios-login", .upToNextMajor(from: "6.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.4")),
.package(url: "https://github.com/Infomaniak/ios-version-checker", .upToNextMajor(from: "5.0.0")),
.package(url: "https://github.com/Infomaniak/ios-version-checker", .upToNextMajor(from: "6.0.0")),
.package(url: "https://github.com/Infomaniak/LocalizeKit", .upToNextMajor(from: "1.0.2")),
.package(url: "https://github.com/realm/realm-swift", .upToNextMajor(from: "10.43.0")),
.package(url: "https://github.com/SCENEE/FloatingPanel", .upToNextMajor(from: "2.0.0")),
.package(url: "https://github.com/onevcat/Kingfisher", .upToNextMajor(from: "7.6.2")),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class SecurityTableViewController: BaseGroupedTableViewController {
tableView.register(cellView: ParameterTableViewCell.self)
tableView.register(cellView: ParameterWifiTableViewCell.self)

if lockHelper.isAvailable {
if lockHelper.isAvailable() {
tableContent = SecurityOption.allCases
} else {
tableContent = [.fileProviderExtension]
Expand Down

0 comments on commit c76bb62

Please sign in to comment.