Merge pull request #16 from HelioMesquita/feature/moving_framework_to…

…_spm Start using SPM to modularization
HelioMesquita · Apr 2, 2024 · 54290e7 · 54290e7
2 parents 8784cd6 + 34e7715
commit 54290e7
Show file tree

Hide file tree

Showing 97 changed files with 225 additions and 331 deletions.
diff --git a/Infrastructure/Resources/Info.plist b/Infrastructure/Resources/Info.plist
diff --git a/Infrastructure/Resources/Infrastructure.h b/Infrastructure/Resources/Infrastructure.h
diff --git a/Infrastructure/Utils/Bundle+Utils.swift b/Infrastructure/Utils/Bundle+Utils.swift
diff --git a/InfrastructureTests/Info.plist b/InfrastructureTests/Info.plist
diff --git a/NetworkLayer/.gitignore b/NetworkLayer/.gitignore
@@ -0,0 +1,8 @@
+.DS_Store
+/.build
+/Packages
+xcuserdata/
+DerivedData/
+.swiftpm/configuration/registries.json
+.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+.netrc
diff --git a/NetworkLayer/Package.swift b/NetworkLayer/Package.swift
@@ -0,0 +1,27 @@
+// swift-tools-version: 5.9
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "NetworkLayer",
+    defaultLocalization: "en",
+    platforms: [
+        .iOS(.v15)
+    ],
+    products: [
+        // Products define the executables and libraries a package produces, making them visible to other packages.
+        .library(
+            name: "NetworkLayer",
+            targets: ["NetworkLayer"]),
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package, defining a module or a test suite.
+        // Targets can depend on other targets in this package and products from dependencies.
+        .target(
+            name: "NetworkLayer"),
+        .testTarget(
+            name: "NetworkLayerTests",
+            dependencies: ["NetworkLayer"]),
+    ]
+)
diff --git a/Infrastructure/BuilderProviderProtocol.swift → ...yer/Sources/BuilderProviderProtocol.swift b/Infrastructure/BuilderProviderProtocol.swift → ...yer/Sources/BuilderProviderProtocol.swift
diff --git a/Infrastructure/HttpVerb.swift → NetworkLayer/Sources/HttpVerb.swift b/Infrastructure/HttpVerb.swift → NetworkLayer/Sources/HttpVerb.swift
diff --git a/Infrastructure/RequestDecodable.swift → NetworkLayer/Sources/RequestDecodable.swift b/Infrastructure/RequestDecodable.swift → NetworkLayer/Sources/RequestDecodable.swift
diff --git a/Infrastructure/RequestError.swift → NetworkLayer/Sources/RequestError.swift b/Infrastructure/RequestError.swift → NetworkLayer/Sources/RequestError.swift
diff --git a/Infrastructure/RequestProviderProtocol.swift → ...yer/Sources/RequestProviderProtocol.swift b/Infrastructure/RequestProviderProtocol.swift → ...yer/Sources/RequestProviderProtocol.swift
diff --git a/Infrastructure/Resources/Text.swift → NetworkLayer/Sources/Resources/Text.swift b/Infrastructure/Resources/Text.swift → NetworkLayer/Sources/Resources/Text.swift
diff --git a/...re/Resources/en.lproj/Localizable.strings → ...es/Resources/en.lproj/Localizable.strings b/...re/Resources/en.lproj/Localizable.strings → ...es/Resources/en.lproj/Localizable.strings
diff --git a/...Resources/pt-BR.lproj/Localizable.strings → ...Resources/pt-BR.lproj/Localizable.strings b/...Resources/pt-BR.lproj/Localizable.strings → ...Resources/pt-BR.lproj/Localizable.strings
diff --git a/Infrastructure/ServiceProviderProtocol.swift → ...yer/Sources/ServiceProviderProtocol.swift b/Infrastructure/ServiceProviderProtocol.swift → ...yer/Sources/ServiceProviderProtocol.swift
diff --git a/Infrastructure/Utils/String+Utils.swift → ...orkLayer/Sources/Utils/String+Utils.swift b/Infrastructure/Utils/String+Utils.swift → ...orkLayer/Sources/Utils/String+Utils.swift
diff --git a/VisualTests/Utils/BundleTests.swift → NetworkLayer/Tests/BundleTests.swift b/VisualTests/Utils/BundleTests.swift → NetworkLayer/Tests/BundleTests.swift
@@ -8,13 +8,13 @@
 
 import XCTest
 
-@testable import Visual
+@testable import NetworkLayer
 
 class BundleTests: XCTestCase {
 
   func testReturnsModuleName() {
     XCTAssertEqual(
-      Bundle.module.bundleIdentifier, "com.visual")
+      Bundle.module.bundleIdentifier, "NetworkLayer-NetworkLayer-resources")
   }
 
 }
diff --git a/InfrastructureTests/Mocks/MockProvider.swift → NetworkLayer/Tests/Mocks/MockProvider.swift b/InfrastructureTests/Mocks/MockProvider.swift → NetworkLayer/Tests/Mocks/MockProvider.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-@testable import Infrastructure
+@testable import NetworkLayer
 
 class MockProvider: RequestProviderProtocol {
 

diff --git a/...structureTests/Mocks/MockURLSession.swift → ...orkLayer/Tests/Mocks/MockURLSession.swift b/...structureTests/Mocks/MockURLSession.swift → ...orkLayer/Tests/Mocks/MockURLSession.swift
diff --git a/InfrastructureTests/RequestErrorTests.swift → NetworkLayer/Tests/RequestErrorTests.swift b/InfrastructureTests/RequestErrorTests.swift → NetworkLayer/Tests/RequestErrorTests.swift
@@ -8,7 +8,7 @@
 
 import XCTest
 
-@testable import Infrastructure
+@testable import NetworkLayer
 
 class RequestErrorTests: XCTestCase {
 

diff --git a/...eTests/RequestProviderProtocolTests.swift → .../Tests/RequestProviderProtocolTests.swift b/...eTests/RequestProviderProtocolTests.swift → .../Tests/RequestProviderProtocolTests.swift
@@ -8,7 +8,7 @@
 
 import XCTest
 
-@testable import Infrastructure
+@testable import NetworkLayer
 
 class RequestProviderProtocolTests: XCTestCase {
 

diff --git a/...eTests/ServiceProviderProtocolTests.swift → .../Tests/ServiceProviderProtocolTests.swift b/...eTests/ServiceProviderProtocolTests.swift → .../Tests/ServiceProviderProtocolTests.swift
@@ -8,7 +8,7 @@
 
 import XCTest
 
-@testable import Infrastructure
+@testable import NetworkLayer
 
 class ServiceProviderProtocolTests: XCTestCase {
 

diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@
 [![SPM](https://img.shields.io/badge/spm-compatible-blue.svg?style=flat)](https://www.apple.com)
 [![License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat)](https://github.com/HelioMesquita/Swiftmazing/blob/master/LICENSE)
 
-A iOS application with layout based on App Store that can check the most starred and last updated Swift repository. It was developed in a modular way, with their respective tests, using the modern collection view
+A iOS application with layout based on App Store that can check the most starred and last updated Swift repository. It was developed in a modular way using SPM, with their respective tests and using the modern collection view
 
 
 ## Features
@@ -20,7 +20,7 @@ A iOS application with layout based on App Store that can check the most starred
 <img src="https://github.com/HelioMesquita/Swiftmazing/blob/master/.assets/appscreendark.png" align="right"
      title="App preview dark mode" width="220 " height="476">
 
-* Modularization
+* Modularization using SPM
 * Xcodegen
 * CLEAN Swift Architecture (VIP)
 * Modern Collection View
@@ -33,7 +33,6 @@ A iOS application with layout based on App Store that can check the most starred
 * Internationalization (English and PT-Br)
 * Unit tests
 * Snapshots Tests
-* Functional Tests
 * Await/Async Request
 
 ### Prerequisites
@@ -43,7 +42,7 @@ A iOS application with layout based on App Store that can check the most starred
 
 ### Installing
 
-First of all download and install Xcode, Cocoapods and xcodegen, then clone the repository
+First of all download and install Xcode, and Xcodegen, then clone the repository
 
 ```
 https://github.com/HelioMesquita/Swiftmazing.git
@@ -60,9 +59,10 @@ Open the directory project and double tap on Swiftmazing.xcodeproj
 ## Running the tests
 
 For each scheme in project run some tests targets
-* The Visual scheme runs the snapshots tests for all views and view controllers
-* The Infrastructure scheme runs the unit tests for all network tests
-* The Swiftmazing scheme runs the unit tests for all bussiness and presentation rules
+* The Swiftmazing scheme runs the unit tests for all business and presentation rules
+* The UIComponents scheme runs the snapshot tests for all views and view controllers
+* The NetworkLayer scheme runs the unit tests for all network tests
+
 
 ## Built With
 

diff --git a/Swiftmazing/Application/SceneDelegate.swift b/Swiftmazing/Application/SceneDelegate.swift
@@ -7,7 +7,7 @@
 //
 
 import UIKit
-import Visual
+import UIComponents
 
 class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 

diff --git a/Swiftmazing/Infrastructure/RequestProvider.swift b/Swiftmazing/Infrastructure/RequestProvider.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import Infrastructure
+import NetworkLayer
 
 extension RequestProviderProtocol {
 

diff --git a/Swiftmazing/Infrastructure/ServiceProvider.swift b/Swiftmazing/Infrastructure/ServiceProvider.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import Infrastructure
+import NetworkLayer
 
 class ServiceProvider: ServiceProviderProtocol {
 

diff --git a/Swiftmazing/Infrastructure/ServiceProviderMock.swift b/Swiftmazing/Infrastructure/ServiceProviderMock.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import Infrastructure
+import NetworkLayer
 
 class ServiceProvider: ServiceProviderProtocol {
 

diff --git a/Swiftmazing/Scenes/Feed/FeedInteractor.swift b/Swiftmazing/Scenes/Feed/FeedInteractor.swift
@@ -12,7 +12,7 @@
 // This tag below is used to create the testable files from the Cuckoo pod
 // CUCKOO_TESTABLE
 
-import Infrastructure
+import NetworkLayer
 import UIKit
 
 protocol FeedBusinessLogic {

diff --git a/Swiftmazing/Scenes/Feed/FeedModels.swift b/Swiftmazing/Scenes/Feed/FeedModels.swift
@@ -11,7 +11,7 @@
 //
 
 import UIKit
-import Visual
+import UIComponents
 
 enum Feed {
 

diff --git a/Swiftmazing/Scenes/Feed/FeedViewController.swift b/Swiftmazing/Scenes/Feed/FeedViewController.swift
@@ -11,7 +11,7 @@
 //
 
 import UIKit
-import Visual
+import UIComponents
 
 protocol FeedDisplayLogic: AlertDisplayLogic {
   func show(_ viewModel: Feed.ViewModel)

diff --git a/Swiftmazing/Scenes/List/ListInteractor.swift b/Swiftmazing/Scenes/List/ListInteractor.swift
@@ -12,7 +12,7 @@
 // This tag below is used to create the testable files from the Cuckoo pod
 // CUCKOO_TESTABLE
 
-import Infrastructure
+import NetworkLayer
 import UIKit
 
 protocol ListBusinessLogic {

diff --git a/Swiftmazing/Scenes/List/ListModels.swift b/Swiftmazing/Scenes/List/ListModels.swift
@@ -11,7 +11,7 @@
 //
 
 import UIKit
-import Visual
+import UIComponents
 
 enum List {
 

diff --git a/Swiftmazing/Scenes/List/ListViewController.swift b/Swiftmazing/Scenes/List/ListViewController.swift
@@ -11,7 +11,7 @@
 //
 
 import UIKit
-import Visual
+import UIComponents
 
 protocol ListDisplayLogic: AlertDisplayLogic {
   func showTitle(_ title: String)

diff --git a/Swiftmazing/Scenes/Models/RepositoriesBuilder.swift b/Swiftmazing/Scenes/Models/RepositoriesBuilder.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import Infrastructure
+import NetworkLayer
 
 class RepositoryBuilder: BuilderProviderProtocol {
 

diff --git a/Swiftmazing/Scenes/Models/RepositoriesRequest.swift b/Swiftmazing/Scenes/Models/RepositoriesRequest.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import Infrastructure
+import NetworkLayer
 
 enum Filter: String {
   case stars

diff --git a/Swiftmazing/Scenes/Models/RepositoriesResponse.swift b/Swiftmazing/Scenes/Models/RepositoriesResponse.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import Infrastructure
+import NetworkLayer
 
 struct RepositoriesResponse: RequestDecodable {
 

diff --git a/Swiftmazing/Scenes/RepositoryDetail/RepositoryDetailViewController.swift b/Swiftmazing/Scenes/RepositoryDetail/RepositoryDetailViewController.swift
@@ -11,7 +11,7 @@
 //
 
 import UIKit
-import Visual
+import UIComponents
 
 protocol RepositoryDetailDisplayLogic: AnyObject {
   func showImage(_ imageURL: URL)

diff --git a/Swiftmazing/Scenes/Worker/RepositoriesWorker.swift b/Swiftmazing/Scenes/Worker/RepositoriesWorker.swift
@@ -8,7 +8,7 @@
 // CUCKOO_TESTABLE
 
 import Foundation
-import Infrastructure
+import NetworkLayer
 
 class RepositoriesWorker {
 

diff --git a/UIComponents/.gitignore b/UIComponents/.gitignore
@@ -0,0 +1,8 @@
+.DS_Store
+/.build
+/Packages
+xcuserdata/
+DerivedData/
+.swiftpm/configuration/registries.json
+.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+.netrc