diff --git a/Sources/Communications/Classes/MockURLProtocol.swift b/Libraries/Communication/Classes/MockURLProtocol.swift similarity index 100% rename from Sources/Communications/Classes/MockURLProtocol.swift rename to Libraries/Communication/Classes/MockURLProtocol.swift diff --git a/Sources/Communications/Enumerations/HTTPRequestMethod.swift b/Libraries/Communication/Enumerations/HTTPRequestMethod.swift similarity index 100% rename from Sources/Communications/Enumerations/HTTPRequestMethod.swift rename to Libraries/Communication/Enumerations/HTTPRequestMethod.swift diff --git a/Sources/Communications/Enumerations/HTTPResponseCode.swift b/Libraries/Communication/Enumerations/HTTPResponseCode.swift similarity index 100% rename from Sources/Communications/Enumerations/HTTPResponseCode.swift rename to Libraries/Communication/Enumerations/HTTPResponseCode.swift diff --git a/Sources/Communications/Errors/MakeURLRequestError.swift b/Libraries/Communication/Errors/MakeURLRequestError.swift similarity index 100% rename from Sources/Communications/Errors/MakeURLRequestError.swift rename to Libraries/Communication/Errors/MakeURLRequestError.swift diff --git a/Sources/Communications/Protocols/Client.swift b/Libraries/Communication/Protocols/Client.swift similarity index 100% rename from Sources/Communications/Protocols/Client.swift rename to Libraries/Communication/Protocols/Client.swift diff --git a/Sources/Communications/Protocols/Endpoint.swift b/Libraries/Communication/Protocols/Endpoint.swift similarity index 100% rename from Sources/Communications/Protocols/Endpoint.swift rename to Libraries/Communication/Protocols/Endpoint.swift diff --git a/Sources/Communications/Use Cases/MakeURLRequestUseCase.swift b/Libraries/Communication/Use Cases/MakeURLRequestUseCase.swift similarity index 100% rename from Sources/Communications/Use Cases/MakeURLRequestUseCase.swift rename to Libraries/Communication/Use Cases/MakeURLRequestUseCase.swift diff --git a/Sources/Coordination/Protocols/Coordinator.swift b/Libraries/Coordination/Protocols/Coordinator.swift similarity index 100% rename from Sources/Coordination/Protocols/Coordinator.swift rename to Libraries/Coordination/Protocols/Coordinator.swift diff --git a/Sources/Coordination/Protocols/Router.swift b/Libraries/Coordination/Protocols/Router.swift similarity index 100% rename from Sources/Coordination/Protocols/Router.swift rename to Libraries/Coordination/Protocols/Router.swift diff --git a/Sources/Coordination/Routers/BaseNavigationRouter.swift b/Libraries/Coordination/Routers/BaseNavigationRouter.swift similarity index 100% rename from Sources/Coordination/Routers/BaseNavigationRouter.swift rename to Libraries/Coordination/Routers/BaseNavigationRouter.swift diff --git a/Sources/Coordination/Routers/ModalNavigationRouter.swift b/Libraries/Coordination/Routers/ModalNavigationRouter.swift similarity index 100% rename from Sources/Coordination/Routers/ModalNavigationRouter.swift rename to Libraries/Coordination/Routers/ModalNavigationRouter.swift diff --git a/Sources/Coordination/Routers/PushNavigationRouter.swift b/Libraries/Coordination/Routers/PushNavigationRouter.swift similarity index 100% rename from Sources/Coordination/Routers/PushNavigationRouter.swift rename to Libraries/Coordination/Routers/PushNavigationRouter.swift diff --git a/Sources/Coordination/Routers/WindowRouter.swift b/Libraries/Coordination/Routers/WindowRouter.swift similarity index 100% rename from Sources/Coordination/Routers/WindowRouter.swift rename to Libraries/Coordination/Routers/WindowRouter.swift diff --git a/Sources/Dependencies/Property Wrappers/Dependency.swift b/Libraries/Dependency/Property Wrappers/Dependency.swift similarity index 100% rename from Sources/Dependencies/Property Wrappers/Dependency.swift rename to Libraries/Dependency/Property Wrappers/Dependency.swift diff --git a/Sources/Dependencies/Protocols/DependencyKey.swift b/Libraries/Dependency/Protocols/DependencyKey.swift similarity index 100% rename from Sources/Dependencies/Protocols/DependencyKey.swift rename to Libraries/Dependency/Protocols/DependencyKey.swift diff --git a/Sources/Dependencies/Services/DependencyService.swift b/Libraries/Dependency/Services/DependencyService.swift similarity index 100% rename from Sources/Dependencies/Services/DependencyService.swift rename to Libraries/Dependency/Services/DependencyService.swift diff --git a/Sources/Core/Errors/BundleError.swift b/Libraries/Foundation/Errors/BundleError.swift similarity index 100% rename from Sources/Core/Errors/BundleError.swift rename to Libraries/Foundation/Errors/BundleError.swift diff --git a/Sources/Core/Extensions/Bool+Init.swift b/Libraries/Foundation/Extensions/Bool+Init.swift similarity index 100% rename from Sources/Core/Extensions/Bool+Init.swift rename to Libraries/Foundation/Extensions/Bool+Init.swift diff --git a/Sources/Core/Extensions/Bundle+LocalisationBundle.swift b/Libraries/Foundation/Extensions/Bundle+LocalisationBundle.swift similarity index 100% rename from Sources/Core/Extensions/Bundle+LocalisationBundle.swift rename to Libraries/Foundation/Extensions/Bundle+LocalisationBundle.swift diff --git a/Sources/Core/Extensions/Collection+Empty.swift b/Libraries/Foundation/Extensions/Collection+Empty.swift similarity index 100% rename from Sources/Core/Extensions/Collection+Empty.swift rename to Libraries/Foundation/Extensions/Collection+Empty.swift diff --git a/Sources/Core/Extensions/Optional+Nil.swift b/Libraries/Foundation/Extensions/Optional+Nil.swift similarity index 100% rename from Sources/Core/Extensions/Optional+Nil.swift rename to Libraries/Foundation/Extensions/Optional+Nil.swift diff --git a/Sources/Core/Extensions/String+Empty.swift b/Libraries/Foundation/Extensions/String+Empty.swift similarity index 100% rename from Sources/Core/Extensions/String+Empty.swift rename to Libraries/Foundation/Extensions/String+Empty.swift diff --git a/Sources/Core/Extensions/String+Localisation.swift b/Libraries/Foundation/Extensions/String+Localisation.swift similarity index 100% rename from Sources/Core/Extensions/String+Localisation.swift rename to Libraries/Foundation/Extensions/String+Localisation.swift diff --git a/Sources/Core/Extensions/TimeZone+Zone.swift b/Libraries/Foundation/Extensions/TimeZone+Zone.swift similarity index 100% rename from Sources/Core/Extensions/TimeZone+Zone.swift rename to Libraries/Foundation/Extensions/TimeZone+Zone.swift diff --git a/Sources/Core/Property Wrappers/LossyCodableList.swift b/Libraries/Foundation/Property Wrappers/LossyCodableList.swift similarity index 100% rename from Sources/Core/Property Wrappers/LossyCodableList.swift rename to Libraries/Foundation/Property Wrappers/LossyCodableList.swift diff --git a/Sources/Persistence/Classes/Fetcher.swift b/Libraries/Persistence/Classes/Fetcher.swift similarity index 100% rename from Sources/Persistence/Classes/Fetcher.swift rename to Libraries/Persistence/Classes/Fetcher.swift diff --git a/Sources/Persistence/Extensions/URL+Devices.swift b/Libraries/Persistence/Extensions/URL+Devices.swift similarity index 100% rename from Sources/Persistence/Extensions/URL+Devices.swift rename to Libraries/Persistence/Extensions/URL+Devices.swift diff --git a/Sources/Persistence/Protocols/Service.swift b/Libraries/Persistence/Protocols/Service.swift similarity index 100% rename from Sources/Persistence/Protocols/Service.swift rename to Libraries/Persistence/Protocols/Service.swift diff --git a/Package.swift b/Package.swift index 26716a6..7468013 100644 --- a/Package.swift +++ b/Package.swift @@ -14,56 +14,56 @@ import PackageDescription // MARK: - Variables private var targetsLibrary: [String] = [ - .Target.communications, + .Target.communication, .Target.coordination, - .Target.core, - .Target.dependencies, + .Target.foundation, + .Target.dependency, ] private var targetsPackage: [Target] = [ .target( - name: .Target.communications, - dependencies: [] + name: .Target.communication, + path: "Libraries/Communication" ), .target( name: .Target.coordination, - dependencies: [] + path: "Libraries/Coordination" ), .target( - name: .Target.core, - dependencies: [] + name: .Target.foundation, + path: "Libraries/Foundation" ), .target( - name: .Target.dependencies, - dependencies: [] + name: .Target.dependency, + path: "Libraries/Dependency" ), .testTarget( - name: "CommunicationsTests", + name: .Target.communication.tests, dependencies: [ - .init(stringLiteral: .Target.communications) + .init(stringLiteral: .Target.communication) ], - path: "Tests/Communications" + path: "Tests/Communication" ), .testTarget( - name: "CoordinationTests", + name: .Target.coordination.tests, dependencies: [ .init(stringLiteral: .Target.coordination) ], path: "Tests/Coordination" ), .testTarget( - name: "CoreTests", + name: .Target.foundation.tests, dependencies: [ - .init(stringLiteral: .Target.core) + .init(stringLiteral: .Target.foundation) ], - path: "Tests/Core" + path: "Tests/Foundation" ), .testTarget( - name: "DependenciesTests", + name: .Target.dependency.tests, dependencies: [ - .init(stringLiteral: .Target.dependencies) + .init(stringLiteral: .Target.dependency) ], - path: "Tests/Dependencies" + path: "Tests/Dependency" ), ] @@ -72,10 +72,10 @@ targetsLibrary.append(.Target.persistence) targetsPackage.append(contentsOf: [ .target( name: .Target.persistence, - dependencies: [] + path: "Libraries/Persistence" ), .testTarget( - name: "PersistenceTests", + name: .Target.persistence.tests, dependencies: [ .init(stringLiteral: .Target.persistence) ], @@ -100,7 +100,7 @@ let package = Package( ], products: [ .library( - name: .Package.name, + name: .Library.name, targets: targetsLibrary ), ], @@ -112,14 +112,26 @@ let package = Package( private extension String { enum Package { + static let name = "swift-libs" + } + + enum Library { static let name = "SwiftLibs" } enum Target { - static let communications = "Communications" - static let coordination = "Coordination" - static let core = "Core" - static let dependencies = "Dependencies" - static let persistence = "Persistence" + static let communication = "SwiftLibsCommunication" + static let coordination = "SwiftLibsCoordination" + static let foundation = "SwiftLibsFoundation" + static let dependency = "SwiftLibsDependency" + static let persistence = "SwiftLibsPersistence" + } +} + +// MARK: - String+Computed + +private extension String { + var tests: String { + self + "Tests" } } diff --git a/README.md b/README.md index b6677e8..314d990 100644 --- a/README.md +++ b/README.md @@ -14,11 +14,11 @@ This package contains the core building blocks that we, [Röck+Cöde](https://ro This package contains several libraries which can be imported, and these libraries are grouped by a certain concern, feature or purpose. To provide further details about the libraries included in this package: -* `Communications`: protocols, enumerations and a ready-to-use mock url class to build remote API services; -* `Coordination`: protocols to implement the [Coordinator pattern](https://khanlou.com/2015/01/the-coordinator/) and some ready-to-use platform-specific concrete routers; -* `Core`: extensions we usually add to the base layer functionality and primitive types provided by the [Swift standard library](https://https://www.swift.org/documentation/#standard-library); -* `Dependencies`: a ready-to-use, simple [Dependency Injection](https://en.wikipedia.org/wiki/Dependency_injection) mechanism that levers heavily on the [dynamic property wrappers](https://www.hackingwithswift.com/plus/intermediate-swiftui/creating-a-custom-property-wrapper-using-dynamicproperty) provided by the [Swift programming language](https://docs.swift.org/swift-book/documentation/the-swift-programming-language/properties/#Projecting-a-Value-From-a-Property-Wrapper); -* `Persistence` (*available for Apple platforms only*): protocols, extensions and a ready-to-use fetcher class to simplify the building of the [CoreData](https://developer.apple.com/documentation/coredata) persistence layer; +* `SwiftLibsCommunication`: protocols, enumerations and a ready-to-use mock url class to build remote API services; +* `SwiftLibsCoordination`: protocols to implement the [Coordinator pattern](https://khanlou.com/2015/01/the-coordinator/) and some ready-to-use platform-specific concrete routers; +* `SwiftLibsDependency`: a ready-to-use, simple [Dependency Injection](https://en.wikipedia.org/wiki/Dependency_injection) mechanism that levers heavily on the [dynamic property wrappers](https://www.hackingwithswift.com/plus/intermediate-swiftui/creating-a-custom-property-wrapper-using-dynamicproperty) provided by the [Swift programming language](https://docs.swift.org/swift-book/documentation/the-swift-programming-language/properties/#Projecting-a-Value-From-a-Property-Wrapper); +* `SwiftLibsFoundation`: extensions we usually add to the base layer functionality and primitive types provided by the [Swift standard library](https://https://www.swift.org/documentation/#standard-library); +* `SwiftLibsPersistence` (*available for Apple platforms only*): protocols, extensions and a ready-to-use fetcher class to simplify the building of the [CoreData](https://developer.apple.com/documentation/coredata) persistence layer; ## Installation @@ -37,7 +37,7 @@ In the intended `Package.swift` file, it is required to add the following depend ```swift dependencies: [ // ... - .package(url: "https://github.com/rock-n-code/swift-libs.git", from: "0.1.7") + .package(url: "https://github.com/rock-n-code/swift-libs.git", from: "0.2.0") // ... ], ``` @@ -66,7 +66,7 @@ In an opened Xcode project, it is required to follow these steps to install the 4. press on the *+* (plus) button to add dependencies to the project; 5. enter the URL `https://github.com/rock-n-code/swift-libs.git` into the *Search or Enter Package URL* located in the upper right corner; 6. select the retrieved option; -7. define the dependency rule (the *Up to Next Major Version* option and the *0.1.7* text are recommended); +7. define the dependency rule (the *Up to Next Major Version* option and the *0.2.0* text are recommended); 8. select the target to which the dependency will be applied (if required); 9. wait for the package to be resolved and included in the project; 10. now you should be ready to start using this package! diff --git a/Tests/Communications/Cases/Use Cases/MakeURLRequestUseCaseTests.swift b/Tests/Communication/Cases/Use Cases/MakeURLRequestUseCaseTests.swift similarity index 99% rename from Tests/Communications/Cases/Use Cases/MakeURLRequestUseCaseTests.swift rename to Tests/Communication/Cases/Use Cases/MakeURLRequestUseCaseTests.swift index 3fdd850..f16cbd2 100644 --- a/Tests/Communications/Cases/Use Cases/MakeURLRequestUseCaseTests.swift +++ b/Tests/Communication/Cases/Use Cases/MakeURLRequestUseCaseTests.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -import Communications import Foundation +import SwiftLibsCommunication import XCTest #if canImport(FoundationNetworking) diff --git a/Tests/Communications/Helpers/Endpoints/TestEndpoint.swift b/Tests/Communication/Helpers/Endpoints/TestEndpoint.swift similarity index 97% rename from Tests/Communications/Helpers/Endpoints/TestEndpoint.swift rename to Tests/Communication/Helpers/Endpoints/TestEndpoint.swift index f7f5ce5..78de8de 100644 --- a/Tests/Communications/Helpers/Endpoints/TestEndpoint.swift +++ b/Tests/Communication/Helpers/Endpoints/TestEndpoint.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -import Communications import Foundation +import SwiftLibsCommunication struct TestEndpoint: Endpoint { diff --git a/Tests/Dependencies/Cases/Property Wrappers/DependencyTests.swift b/Tests/Dependency/Cases/Property Wrappers/DependencyTests.swift similarity index 98% rename from Tests/Dependencies/Cases/Property Wrappers/DependencyTests.swift rename to Tests/Dependency/Cases/Property Wrappers/DependencyTests.swift index a8f881b..372e465 100644 --- a/Tests/Dependencies/Cases/Property Wrappers/DependencyTests.swift +++ b/Tests/Dependency/Cases/Property Wrappers/DependencyTests.swift @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -import Dependencies +import SwiftLibsDependency import XCTest final class DependencyTests: XCTestCase { diff --git a/Tests/Dependencies/Cases/Services/DependencyServiceTests.swift b/Tests/Dependency/Cases/Services/DependencyServiceTests.swift similarity index 98% rename from Tests/Dependencies/Cases/Services/DependencyServiceTests.swift rename to Tests/Dependency/Cases/Services/DependencyServiceTests.swift index 6e74544..944e53a 100644 --- a/Tests/Dependencies/Cases/Services/DependencyServiceTests.swift +++ b/Tests/Dependency/Cases/Services/DependencyServiceTests.swift @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -import Dependencies +import SwiftLibsDependency import XCTest final class DependencyServiceTests: XCTestCase { diff --git a/Tests/Dependencies/Helpers/TestServices.swift b/Tests/Dependency/Helpers/TestServices.swift similarity index 97% rename from Tests/Dependencies/Helpers/TestServices.swift rename to Tests/Dependency/Helpers/TestServices.swift index eff295c..916e853 100644 --- a/Tests/Dependencies/Helpers/TestServices.swift +++ b/Tests/Dependency/Helpers/TestServices.swift @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -import Dependencies +import SwiftLibsDependency // MARK: - Protocols diff --git a/Tests/Core/Cases/Extensions/Bool+InitTests.swift b/Tests/Foundation/Cases/Extensions/Bool+InitTests.swift similarity index 98% rename from Tests/Core/Cases/Extensions/Bool+InitTests.swift rename to Tests/Foundation/Cases/Extensions/Bool+InitTests.swift index e56dd5d..7ad7892 100644 --- a/Tests/Core/Cases/Extensions/Bool+InitTests.swift +++ b/Tests/Foundation/Cases/Extensions/Bool+InitTests.swift @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -import Core +import SwiftLibsFoundation import XCTest final class Bool_InitTests: XCTestCase { diff --git a/Tests/Core/Cases/Extensions/Bundle+LocalisationBundleTests.swift b/Tests/Foundation/Cases/Extensions/Bundle+LocalisationBundleTests.swift similarity index 98% rename from Tests/Core/Cases/Extensions/Bundle+LocalisationBundleTests.swift rename to Tests/Foundation/Cases/Extensions/Bundle+LocalisationBundleTests.swift index dc9b8f5..d24c58b 100644 --- a/Tests/Core/Cases/Extensions/Bundle+LocalisationBundleTests.swift +++ b/Tests/Foundation/Cases/Extensions/Bundle+LocalisationBundleTests.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -import Core import Foundation +import SwiftLibsFoundation import XCTest final class Bundle_LocalisationBundleTests: XCTestCase { diff --git a/Tests/Core/Cases/Extensions/Collection+EmptyTests.swift b/Tests/Foundation/Cases/Extensions/Collection+EmptyTests.swift similarity index 98% rename from Tests/Core/Cases/Extensions/Collection+EmptyTests.swift rename to Tests/Foundation/Cases/Extensions/Collection+EmptyTests.swift index feb518c..161663e 100644 --- a/Tests/Core/Cases/Extensions/Collection+EmptyTests.swift +++ b/Tests/Foundation/Cases/Extensions/Collection+EmptyTests.swift @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -import Core +import SwiftLibsFoundation import XCTest final class Collection_EmptyTests: XCTestCase { diff --git a/Tests/Core/Cases/Extensions/Optional+NilTests.swift b/Tests/Foundation/Cases/Extensions/Optional+NilTests.swift similarity index 98% rename from Tests/Core/Cases/Extensions/Optional+NilTests.swift rename to Tests/Foundation/Cases/Extensions/Optional+NilTests.swift index 5a9bcc1..c516060 100644 --- a/Tests/Core/Cases/Extensions/Optional+NilTests.swift +++ b/Tests/Foundation/Cases/Extensions/Optional+NilTests.swift @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -import Core +import SwiftLibsFoundation import XCTest final class Optional_NilTests: XCTestCase { diff --git a/Tests/Core/Cases/Extensions/String+EmptyTests.swift b/Tests/Foundation/Cases/Extensions/String+EmptyTests.swift similarity index 97% rename from Tests/Core/Cases/Extensions/String+EmptyTests.swift rename to Tests/Foundation/Cases/Extensions/String+EmptyTests.swift index 23a204f..0dc9b9f 100644 --- a/Tests/Core/Cases/Extensions/String+EmptyTests.swift +++ b/Tests/Foundation/Cases/Extensions/String+EmptyTests.swift @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -import Core +import SwiftLibsFoundation import XCTest final class String_EmptyTests: XCTestCase { diff --git a/Tests/Core/Cases/Extensions/String+LocalisationTests.swift b/Tests/Foundation/Cases/Extensions/String+LocalisationTests.swift similarity index 99% rename from Tests/Core/Cases/Extensions/String+LocalisationTests.swift rename to Tests/Foundation/Cases/Extensions/String+LocalisationTests.swift index dd6e809..01df275 100644 --- a/Tests/Core/Cases/Extensions/String+LocalisationTests.swift +++ b/Tests/Foundation/Cases/Extensions/String+LocalisationTests.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -import Core import Foundation +import SwiftLibsFoundation import XCTest final class String_LocalisationTests: XCTestCase { diff --git a/Tests/Core/Cases/Extensions/TimeZone+ZoneTests.swift b/Tests/Foundation/Cases/Extensions/TimeZone+ZoneTests.swift similarity index 96% rename from Tests/Core/Cases/Extensions/TimeZone+ZoneTests.swift rename to Tests/Foundation/Cases/Extensions/TimeZone+ZoneTests.swift index 0bfcd34..11bea09 100644 --- a/Tests/Core/Cases/Extensions/TimeZone+ZoneTests.swift +++ b/Tests/Foundation/Cases/Extensions/TimeZone+ZoneTests.swift @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -import Core +import SwiftLibsFoundation import XCTest final class TimeZone_ZoneTests: XCTestCase { diff --git a/Tests/Core/Cases/Property Wrappers/LossyCodableList+DecodableTests.swift b/Tests/Foundation/Cases/Property Wrappers/LossyCodableList+DecodableTests.swift similarity index 98% rename from Tests/Core/Cases/Property Wrappers/LossyCodableList+DecodableTests.swift rename to Tests/Foundation/Cases/Property Wrappers/LossyCodableList+DecodableTests.swift index 55198a6..88b056c 100644 --- a/Tests/Core/Cases/Property Wrappers/LossyCodableList+DecodableTests.swift +++ b/Tests/Foundation/Cases/Property Wrappers/LossyCodableList+DecodableTests.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -import Core import Foundation +import SwiftLibsFoundation import XCTest final class LossyCodableList_DecodableTests: XCTestCase { diff --git a/Tests/Core/Cases/Property Wrappers/LossyCodableList+EncodableTests.swift b/Tests/Foundation/Cases/Property Wrappers/LossyCodableList+EncodableTests.swift similarity index 98% rename from Tests/Core/Cases/Property Wrappers/LossyCodableList+EncodableTests.swift rename to Tests/Foundation/Cases/Property Wrappers/LossyCodableList+EncodableTests.swift index 468a3cd..39d184e 100644 --- a/Tests/Core/Cases/Property Wrappers/LossyCodableList+EncodableTests.swift +++ b/Tests/Foundation/Cases/Property Wrappers/LossyCodableList+EncodableTests.swift @@ -13,7 +13,7 @@ import Foundation import XCTest -@testable import Core +@testable import SwiftLibsFoundation final class LossyCodableList_EncodableTests: XCTestCase { diff --git a/Tests/Core/Helpers/Extensions/Data+Result.swift b/Tests/Foundation/Helpers/Extensions/Data+Result.swift similarity index 100% rename from Tests/Core/Helpers/Extensions/Data+Result.swift rename to Tests/Foundation/Helpers/Extensions/Data+Result.swift diff --git a/Tests/Core/Helpers/Extensions/Data+Seed.swift b/Tests/Foundation/Helpers/Extensions/Data+Seed.swift similarity index 100% rename from Tests/Core/Helpers/Extensions/Data+Seed.swift rename to Tests/Foundation/Helpers/Extensions/Data+Seed.swift diff --git a/Tests/Core/Helpers/Extensions/String+Result.swift b/Tests/Foundation/Helpers/Extensions/String+Result.swift similarity index 100% rename from Tests/Core/Helpers/Extensions/String+Result.swift rename to Tests/Foundation/Helpers/Extensions/String+Result.swift diff --git a/Tests/Core/Helpers/Extensions/String+Seed.swift b/Tests/Foundation/Helpers/Extensions/String+Seed.swift similarity index 100% rename from Tests/Core/Helpers/Extensions/String+Seed.swift rename to Tests/Foundation/Helpers/Extensions/String+Seed.swift diff --git a/Tests/Core/Helpers/Models/TestCodable.swift b/Tests/Foundation/Helpers/Models/TestCodable.swift similarity index 100% rename from Tests/Core/Helpers/Models/TestCodable.swift rename to Tests/Foundation/Helpers/Models/TestCodable.swift diff --git a/Tests/Core/Helpers/Models/TestCodableList.swift b/Tests/Foundation/Helpers/Models/TestCodableList.swift similarity index 95% rename from Tests/Core/Helpers/Models/TestCodableList.swift rename to Tests/Foundation/Helpers/Models/TestCodableList.swift index e015e75..c4d67af 100644 --- a/Tests/Core/Helpers/Models/TestCodableList.swift +++ b/Tests/Foundation/Helpers/Models/TestCodableList.swift @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -import Core +import SwiftLibsFoundation struct TestCodableList: Codable { @LossyCodableList var items: [TestCodable] diff --git a/Tests/Core/Resources/en.lproj/Localizable.strings b/Tests/Foundation/Resources/en.lproj/Localizable.strings similarity index 100% rename from Tests/Core/Resources/en.lproj/Localizable.strings rename to Tests/Foundation/Resources/en.lproj/Localizable.strings diff --git a/Tests/Persistence/Cases/Classes/FetcherTests.swift b/Tests/Persistence/Cases/Classes/FetcherTests.swift index 40787fa..060ab45 100644 --- a/Tests/Persistence/Cases/Classes/FetcherTests.swift +++ b/Tests/Persistence/Cases/Classes/FetcherTests.swift @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// import Combine -import Persistence +import SwiftLibsPersistence import XCTest final class FetcherTests: XCTestCase { diff --git a/Tests/Persistence/Cases/Extensions/URL+DevicesTests.swift b/Tests/Persistence/Cases/Extensions/URL+DevicesTests.swift index 1f2377c..a518785 100644 --- a/Tests/Persistence/Cases/Extensions/URL+DevicesTests.swift +++ b/Tests/Persistence/Cases/Extensions/URL+DevicesTests.swift @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// import Foundation -import Persistence +import SwiftLibsPersistence import XCTest final class URL_DevicesTests: XCTestCase { diff --git a/Tests/Persistence/Helpers/TestPersistenceService.swift b/Tests/Persistence/Helpers/TestPersistenceService.swift index bac652b..7121b1a 100644 --- a/Tests/Persistence/Helpers/TestPersistenceService.swift +++ b/Tests/Persistence/Helpers/TestPersistenceService.swift @@ -12,7 +12,7 @@ import CoreData import Foundation -import Persistence +import SwiftLibsPersistence struct TestPersistenceService {