diff --git a/AuthenticatorShared/UI/Vault/PreviewContent/BitwardenSdk+VaultFixtures.swift b/AuthenticatorShared/UI/Vault/PreviewContent/BitwardenSdk+VaultFixtures.swift index 872d98e69..7c4fd7357 100644 --- a/AuthenticatorShared/UI/Vault/PreviewContent/BitwardenSdk+VaultFixtures.swift +++ b/AuthenticatorShared/UI/Vault/PreviewContent/BitwardenSdk+VaultFixtures.swift @@ -568,31 +568,4 @@ extension PasswordHistoryView { ) } } - -extension Date { - init( - year: Int, - month: Int, - day: Int, - hour: Int = 0, - minute: Int = 0, - second: Int = 0, - nanosecond: Int = 0, - timeZone: TimeZone = TimeZone(secondsFromGMT: 0)! - ) { - let calendar = Calendar(identifier: .gregorian) - let dateComponents = DateComponents( - calendar: calendar, - timeZone: timeZone, - year: year, - month: month, - day: day, - hour: hour, - minute: minute, - second: second, - nanosecond: nanosecond - ) - self = dateComponents.date! - } -} #endif diff --git a/TestHelpers/Extensions/Date.swift b/BitwardenKit/Core/Platform/Extensions/Date.swift similarity index 54% rename from TestHelpers/Extensions/Date.swift rename to BitwardenKit/Core/Platform/Extensions/Date.swift index 02458e742..4e198948c 100644 --- a/TestHelpers/Extensions/Date.swift +++ b/BitwardenKit/Core/Platform/Extensions/Date.swift @@ -1,6 +1,7 @@ import Foundation -extension Date { +public extension Date { + /// A convenience initializer for `Date` to specify a specific point in time. init( year: Int, month: Int, @@ -25,4 +26,15 @@ extension Date { ) self = dateComponents.date! } + + // MARK: Methods + + /// Returns a date that is set to midnight on the day that is seven days in the future. + /// + static func midnightOneWeekFromToday() -> Date? { + let calendar = Calendar.current + guard let date = calendar.date(byAdding: .day, value: 7, to: Date()) else { return nil } + guard let date = calendar.date(bySettingHour: 0, minute: 0, second: 0, of: date) else { return nil } + return date + } } diff --git a/BitwardenShared/Core/Platform/Extensions/Date.swift b/BitwardenShared/Core/Platform/Extensions/Date.swift deleted file mode 100644 index 1fff4e297..000000000 --- a/BitwardenShared/Core/Platform/Extensions/Date.swift +++ /dev/null @@ -1,14 +0,0 @@ -import Foundation - -extension Date { - // MARK: Methods - - /// Returns a date that is set to midnight on the day that is seven days in the future. - /// - static func midnightOneWeekFromToday() -> Date? { - let calendar = Calendar.current - guard let date = calendar.date(byAdding: .day, value: 7, to: Date()) else { return nil } - guard let date = calendar.date(bySettingHour: 0, minute: 0, second: 0, of: date) else { return nil } - return date - } -} diff --git a/BitwardenShared/UI/Auth/PreviewContent/LoginRequest+Fixtures.swift b/BitwardenShared/UI/Auth/PreviewContent/LoginRequest+Fixtures.swift index 24b0780bc..b1b4764c7 100644 --- a/BitwardenShared/UI/Auth/PreviewContent/LoginRequest+Fixtures.swift +++ b/BitwardenShared/UI/Auth/PreviewContent/LoginRequest+Fixtures.swift @@ -1,3 +1,4 @@ +import BitwardenKit import Foundation #if DEBUG diff --git a/BitwardenShared/UI/Tools/PreviewContent/SendView+Fixtures.swift b/BitwardenShared/UI/Tools/PreviewContent/SendView+Fixtures.swift index 743b91404..1aae28ce1 100644 --- a/BitwardenShared/UI/Tools/PreviewContent/SendView+Fixtures.swift +++ b/BitwardenShared/UI/Tools/PreviewContent/SendView+Fixtures.swift @@ -1,3 +1,4 @@ +import BitwardenKit import BitwardenSdk import Foundation diff --git a/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/AddEditSendItemState.swift b/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/AddEditSendItemState.swift index ddcc89d57..9351d10f6 100644 --- a/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/AddEditSendItemState.swift +++ b/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/AddEditSendItemState.swift @@ -1,3 +1,4 @@ +import BitwardenKit @preconcurrency import BitwardenSdk import Foundation diff --git a/BitwardenShared/UI/Vault/PreviewContent/BitwardenSdk+VaultFixtures.swift b/BitwardenShared/UI/Vault/PreviewContent/BitwardenSdk+VaultFixtures.swift index 872d98e69..7c4fd7357 100644 --- a/BitwardenShared/UI/Vault/PreviewContent/BitwardenSdk+VaultFixtures.swift +++ b/BitwardenShared/UI/Vault/PreviewContent/BitwardenSdk+VaultFixtures.swift @@ -568,31 +568,4 @@ extension PasswordHistoryView { ) } } - -extension Date { - init( - year: Int, - month: Int, - day: Int, - hour: Int = 0, - minute: Int = 0, - second: Int = 0, - nanosecond: Int = 0, - timeZone: TimeZone = TimeZone(secondsFromGMT: 0)! - ) { - let calendar = Calendar(identifier: .gregorian) - let dateComponents = DateComponents( - calendar: calendar, - timeZone: timeZone, - year: year, - month: month, - day: day, - hour: hour, - minute: minute, - second: second, - nanosecond: nanosecond - ) - self = dateComponents.date! - } -} #endif