From 72033d0831cdd32e32c5ce903b59aa05b244d545 Mon Sep 17 00:00:00 2001 From: Javier Cicchelli Date: Tue, 11 Apr 2023 17:39:30 +0200 Subject: [PATCH] Renamed the "Locations" library in the Libraries package as "API" because it was conflicting with the Locations app target. --- Apps/Locations/Libraries/Package.swift | 28 +++++++++---------- .../Clients/LocationsClient.swift | 0 .../Endpoints/GetLocationsEndpoint.swift | 0 .../Extensions/String+Constants.swift | 0 .../{Locations => API}/Models/Location.swift | 0 .../Services/LocationsService.swift | 0 .../Clients/LocationsClientTests.swift | 0 .../Endpoints/GetLocationsEndpointTests.swift | 0 .../Helpers/Data+Constants.swift | 0 .../Services/LocationsServiceTests.swift | 0 10 files changed, 14 insertions(+), 14 deletions(-) rename Apps/Locations/Libraries/Sources/{Locations => API}/Clients/LocationsClient.swift (100%) rename Apps/Locations/Libraries/Sources/{Locations => API}/Endpoints/GetLocationsEndpoint.swift (100%) rename Apps/Locations/Libraries/Sources/{Locations => API}/Extensions/String+Constants.swift (100%) rename Apps/Locations/Libraries/Sources/{Locations => API}/Models/Location.swift (100%) rename Apps/Locations/Libraries/Sources/{Locations => API}/Services/LocationsService.swift (100%) rename Apps/Locations/Libraries/Tests/{LocationsTests => APITests}/Clients/LocationsClientTests.swift (100%) rename Apps/Locations/Libraries/Tests/{LocationsTests => APITests}/Endpoints/GetLocationsEndpointTests.swift (100%) rename Apps/Locations/Libraries/Tests/{LocationsTests => APITests}/Helpers/Data+Constants.swift (100%) rename Apps/Locations/Libraries/Tests/{LocationsTests => APITests}/Services/LocationsServiceTests.swift (100%) diff --git a/Apps/Locations/Libraries/Package.swift b/Apps/Locations/Libraries/Package.swift index 16ba787..eb9c786 100644 --- a/Apps/Locations/Libraries/Package.swift +++ b/Apps/Locations/Libraries/Package.swift @@ -11,15 +11,21 @@ let package = Package( .library( name: "Libraries", targets: [ + "API", "Core", "Dependency", - "Locations", "Persistence" ] ), ], dependencies: [], targets: [ + .target( + name: "API", + dependencies: [ + "APICore" + ] + ), .target( name: "APICore", dependencies: [] @@ -32,16 +38,17 @@ let package = Package( name: "Dependency", dependencies: [] ), - .target( - name: "Locations", - dependencies: [ - "APICore" - ] - ), .target( name: "Persistence", dependencies: [] ), + .testTarget( + name: "APITests", + dependencies: [ + "APICore", + "API" + ] + ), .testTarget( name: "APICoreTests", dependencies: [ @@ -60,13 +67,6 @@ let package = Package( "Dependency" ] ), - .testTarget( - name: "LocationsTests", - dependencies: [ - "APICore", - "Locations" - ] - ), .testTarget( name: "PersistenceTests", dependencies: [ diff --git a/Apps/Locations/Libraries/Sources/Locations/Clients/LocationsClient.swift b/Apps/Locations/Libraries/Sources/API/Clients/LocationsClient.swift similarity index 100% rename from Apps/Locations/Libraries/Sources/Locations/Clients/LocationsClient.swift rename to Apps/Locations/Libraries/Sources/API/Clients/LocationsClient.swift diff --git a/Apps/Locations/Libraries/Sources/Locations/Endpoints/GetLocationsEndpoint.swift b/Apps/Locations/Libraries/Sources/API/Endpoints/GetLocationsEndpoint.swift similarity index 100% rename from Apps/Locations/Libraries/Sources/Locations/Endpoints/GetLocationsEndpoint.swift rename to Apps/Locations/Libraries/Sources/API/Endpoints/GetLocationsEndpoint.swift diff --git a/Apps/Locations/Libraries/Sources/Locations/Extensions/String+Constants.swift b/Apps/Locations/Libraries/Sources/API/Extensions/String+Constants.swift similarity index 100% rename from Apps/Locations/Libraries/Sources/Locations/Extensions/String+Constants.swift rename to Apps/Locations/Libraries/Sources/API/Extensions/String+Constants.swift diff --git a/Apps/Locations/Libraries/Sources/Locations/Models/Location.swift b/Apps/Locations/Libraries/Sources/API/Models/Location.swift similarity index 100% rename from Apps/Locations/Libraries/Sources/Locations/Models/Location.swift rename to Apps/Locations/Libraries/Sources/API/Models/Location.swift diff --git a/Apps/Locations/Libraries/Sources/Locations/Services/LocationsService.swift b/Apps/Locations/Libraries/Sources/API/Services/LocationsService.swift similarity index 100% rename from Apps/Locations/Libraries/Sources/Locations/Services/LocationsService.swift rename to Apps/Locations/Libraries/Sources/API/Services/LocationsService.swift diff --git a/Apps/Locations/Libraries/Tests/LocationsTests/Clients/LocationsClientTests.swift b/Apps/Locations/Libraries/Tests/APITests/Clients/LocationsClientTests.swift similarity index 100% rename from Apps/Locations/Libraries/Tests/LocationsTests/Clients/LocationsClientTests.swift rename to Apps/Locations/Libraries/Tests/APITests/Clients/LocationsClientTests.swift diff --git a/Apps/Locations/Libraries/Tests/LocationsTests/Endpoints/GetLocationsEndpointTests.swift b/Apps/Locations/Libraries/Tests/APITests/Endpoints/GetLocationsEndpointTests.swift similarity index 100% rename from Apps/Locations/Libraries/Tests/LocationsTests/Endpoints/GetLocationsEndpointTests.swift rename to Apps/Locations/Libraries/Tests/APITests/Endpoints/GetLocationsEndpointTests.swift diff --git a/Apps/Locations/Libraries/Tests/LocationsTests/Helpers/Data+Constants.swift b/Apps/Locations/Libraries/Tests/APITests/Helpers/Data+Constants.swift similarity index 100% rename from Apps/Locations/Libraries/Tests/LocationsTests/Helpers/Data+Constants.swift rename to Apps/Locations/Libraries/Tests/APITests/Helpers/Data+Constants.swift diff --git a/Apps/Locations/Libraries/Tests/LocationsTests/Services/LocationsServiceTests.swift b/Apps/Locations/Libraries/Tests/APITests/Services/LocationsServiceTests.swift similarity index 100% rename from Apps/Locations/Libraries/Tests/LocationsTests/Services/LocationsServiceTests.swift rename to Apps/Locations/Libraries/Tests/APITests/Services/LocationsServiceTests.swift