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 to ios-core 10.0.0 #1397

Merged
merged 2 commits into from
Apr 25, 2024
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ struct SettingsNotificationsInstructionsView: View {
ModalButtonsView(
primaryButtonTitle: MailResourcesStrings.Localizable.alertNotificationsDisabledButton,
primaryButtonAction: DeeplinkConstants.presentsNotificationSettings

)
}
}
Expand Down
42 changes: 0 additions & 42 deletions MailCore/API/Extension/Realm+SafeWrite.swift

This file was deleted.

3 changes: 2 additions & 1 deletion MailCore/Cache/MailboxInfosManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import Foundation
import InfomaniakCore
import InfomaniakCoreDB
import Realm
import RealmSwift

Expand Down Expand Up @@ -123,7 +124,7 @@ public final class MailboxInfosManager {
public func removeMailboxesFor(userId: Int) {
let realm = getRealm()
let userMailboxes = realm.objects(Mailbox.self).where { $0.userId == userId }
try? realm.uncheckedSafeWrite {
adrien-coye marked this conversation as resolved.
Show resolved Hide resolved
try? realm.safeWrite {
realm.delete(userMailboxes)
}
}
Expand Down
3 changes: 2 additions & 1 deletion MailCore/Cache/MailboxManager/MailboxManager+Search.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import Foundation
import InfomaniakCore
import InfomaniakCoreDB
import RealmSwift

// MARK: - Search
Expand All @@ -35,7 +36,7 @@ public extension MailboxManager {
)

let realm = getRealm()
try? realm.uncheckedSafeWrite {
try? realm.safeWrite {
realm.add(searchFolder, update: .modified)
}
return searchFolder
Expand Down
1 change: 1 addition & 0 deletions MailCore/Models/Message.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import Foundation
import InfomaniakCore
import InfomaniakCoreDB
import MailResources
import RealmSwift

Expand Down
22 changes: 11 additions & 11 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -32,34 +32,34 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/Infomaniak/ios-bug-tracker",
"state" : {
"revision" : "7b582c8281a74762293b1522d7c1f096a44eb07e",
"version" : "4.0.0"
"revision" : "264d99bb71c48d404d32784fa4e3c271a70bed90",
"version" : "5.0.0"
}
},
{
"identity" : "ios-core",
"kind" : "remoteSourceControl",
"location" : "https://github.com/Infomaniak/ios-core",
"state" : {
"revision" : "f55044d2156f39a5a2251e37bfe23f596227056e"
"revision" : "4e168afcd6bc05bfa3cd96bd8f7889f920bab788"
}
},
{
"identity" : "ios-core-ui",
"kind" : "remoteSourceControl",
"location" : "https://github.com/Infomaniak/ios-core-ui",
"state" : {
"revision" : "43ae7acd0252baba9c7338a20b5a0aefcc301054",
"version" : "7.1.0"
"revision" : "b190fc752289c127d17ab707444dc1b83017eaad",
"version" : "8.0.0"
}
},
{
"identity" : "ios-create-account",
"kind" : "remoteSourceControl",
"location" : "https://github.com/Infomaniak/ios-create-account",
"state" : {
"revision" : "46f2ee2e1df00c84d29c30f191e578ad593f0784",
"version" : "6.0.0"
"revision" : "c194f002d7aa2929d2c2e6bfc51b8d1018ea6779",
"version" : "7.0.0"
}
},
{
Expand All @@ -85,17 +85,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/Infomaniak/ios-notifications",
"state" : {
"revision" : "cb006524be443259d04a311f06add5ee034fbf35",
"version" : "5.0.0"
"revision" : "c5ae1674448eafca051700aa47a35629e347dc0a",
"version" : "6.0.0"
}
},
{
"identity" : "ios-version-checker",
"kind" : "remoteSourceControl",
"location" : "https://github.com/Infomaniak/ios-version-checker",
"state" : {
"revision" : "7fc0d96c297e1a868e3e430bc1195b4d0ab70131",
"version" : "4.0.0"
"revision" : "4a9f4342fef91a132676ddcdd50c4808fefd4736",
"version" : "5.0.0"
}
},
{
Expand Down
12 changes: 6 additions & 6 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ let package = Package(
.package(url: "https://github.com/Infomaniak/ios-login", .upToNextMajor(from: "6.0.0")),
.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", .revision("f55044d2156f39a5a2251e37bfe23f596227056e")),
.package(url: "https://github.com/Infomaniak/ios-core-ui", .upToNextMajor(from: "7.1.0")),
.package(url: "https://github.com/Infomaniak/ios-notifications", .upToNextMajor(from: "5.0.0")),
.package(url: "https://github.com/Infomaniak/ios-create-account", .upToNextMajor(from: "6.0.0")),
.package(url: "https://github.com/Infomaniak/ios-bug-tracker", .upToNextMajor(from: "4.0.0")),
.package(url: "https://github.com/Infomaniak/ios-version-checker", .upToNextMajor(from: "4.0.0")),
.package(url: "https://github.com/Infomaniak/ios-core", .revision("4e168afcd6bc05bfa3cd96bd8f7889f920bab788")),
.package(url: "https://github.com/Infomaniak/ios-core-ui", .upToNextMajor(from: "8.0.0")),
.package(url: "https://github.com/Infomaniak/ios-notifications", .upToNextMajor(from: "6.0.0")),
.package(url: "https://github.com/Infomaniak/ios-create-account", .upToNextMajor(from: "7.0.0")),
.package(url: "https://github.com/Infomaniak/ios-bug-tracker", .upToNextMajor(from: "5.0.0")),
.package(url: "https://github.com/Infomaniak/ios-version-checker", .upToNextMajor(from: "5.0.0")),
.package(url: "https://github.com/Infomaniak/swift-modal-presentation", .upToNextMajor(from: "1.0.0")),
.package(url: "https://github.com/Infomaniak/SQRichTextEditor", .upToNextMajor(from: "1.1.1")),
.package(url: "https://github.com/Infomaniak/SwiftSoup", .upToNextMajor(from: "1.1.0")),
Expand Down
1 change: 1 addition & 0 deletions Project.swift
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ let project = Project(name: "Mail",
.external(name: "Alamofire"),
.external(name: "Atlantis"),
.external(name: "InfomaniakCore"),
.external(name: "InfomaniakCoreDB"),
.external(name: "InfomaniakCoreUI"),
.external(name: "InfomaniakLogin"),
.external(name: "InfomaniakDI"),
Expand Down
Loading