From edca5d243c539918ae4d801acd500383566acc4f Mon Sep 17 00:00:00 2001
From: Enrique Garcia <github@lemambo.com>
Date: Fri, 12 Nov 2021 10:15:25 +0100
Subject: [PATCH 01/10] Migrate to tuist 2.0

---
 Project.swift                                 |  4 ++--
 .../Project+Templates.swift                   | 24 +++++++++----------
 Tuist/Templates/framework/Template.swift      |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Project.swift b/Project.swift
index 94a4dd4..abc4160 100644
--- a/Project.swift
+++ b/Project.swift
@@ -1,7 +1,7 @@
 import ProjectDescription
 import ProjectDescriptionHelpers
 
-let configurations: [CustomConfiguration] = [
+let configurations: [ProjectDescription.Configuration] = [
     .debug(name: "Debug", settings: [String: SettingValue](), xcconfig: .relativeToRoot("Configurations/Base/Configurations/Debug.xcconfig")),
     .debug(name: "Release", settings: [String: SettingValue](), xcconfig: .relativeToRoot("Configurations/Base/Configurations/Release.xcconfig")),
 ]
@@ -21,5 +21,5 @@ func targets() -> [Target] {
 let project = Project(name: "uFeatures",
                       organizationName: "io.tuist",
                       packages: [],
-                      settings: Settings(configurations: configurations),
+                      settings: Settings.settings(configurations: configurations),
                       targets: targets())
diff --git a/Tuist/ProjectDescriptionHelpers/Project+Templates.swift b/Tuist/ProjectDescriptionHelpers/Project+Templates.swift
index c83b7c2..65a5e6d 100644
--- a/Tuist/ProjectDescriptionHelpers/Project+Templates.swift
+++ b/Tuist/ProjectDescriptionHelpers/Project+Templates.swift
@@ -11,11 +11,11 @@ extension Target {
     public static func makeAppTargets(name: String,
                                       dependencies: [String] = [],
                                       testDependencies: [String] = []) -> [Target] {
-        let appConfigurations: [CustomConfiguration] = [
+        let appConfigurations: [ProjectDescription.Configuration] = [
             .debug(name: "Debug", settings: [String: SettingValue](), xcconfig: .relativeToRoot("Configurations/iOS/iOS-Application.xcconfig")),
             .debug(name: "Release", settings: [String: SettingValue](), xcconfig: .relativeToRoot("Configurations/iOS/iOS-Application.xcconfig")),
         ]
-        let testsConfigurations: [CustomConfiguration] = [
+        let testsConfigurations: [ProjectDescription.Configuration] = [
             .debug(name: "Debug", settings: [String: SettingValue](), xcconfig: .relativeToRoot("Configurations/iOS/iOS-Base.xcconfig")),
             .debug(name: "Release", settings: [String: SettingValue](), xcconfig: .relativeToRoot("Configurations/iOS/iOS-Base.xcconfig")),
         ]
@@ -29,7 +29,7 @@ extension Target {
                 sources: ["Projects/\(name)/Sources/**/*.swift"],
                 resources: ["Projects/\(name)/Resources/**/*"],
                 dependencies: targetDependencies,
-                settings: Settings(configurations: appConfigurations)),
+                settings: Settings.settings(configurations: appConfigurations)),
             Target(name: "\(name)Tests",
                 platform: .iOS,
                 product: .unitTests,
@@ -40,7 +40,7 @@ extension Target {
                     .target(name: name),
                     .xctest,
                     ] + testDependencies.map({ .target(name: $0) }),
-                settings: Settings(configurations: testsConfigurations)),
+                settings: Settings.settings(configurations: testsConfigurations)),
             Target(name: "\(name)UITests",
                 platform: .iOS,
                 product: .unitTests,
@@ -51,7 +51,7 @@ extension Target {
                     .target(name: name),
                     .xctest,
                     ] + testDependencies.map({ .target(name: $0) }),
-                settings: Settings(configurations: testsConfigurations)),
+                settings: Settings.settings(configurations: testsConfigurations)),
         ]
     }
     
@@ -62,15 +62,15 @@ extension Target {
                                             sdks: [String] = [],
                                             dependsOnXCTest: Bool = false) -> [Target] {
         // Configurations
-        let frameworkConfigurations: [CustomConfiguration] = [
+        let frameworkConfigurations: [ProjectDescription.Configuration] = [
             .debug(name: "Debug", settings: [String: SettingValue](), xcconfig: .relativeToRoot("Configurations/iOS/iOS-Framework.xcconfig")),
             .debug(name: "Release", settings: [String: SettingValue](), xcconfig: .relativeToRoot("Configurations/iOS/iOS-Framework.xcconfig")),
         ]
-        let testsConfigurations: [CustomConfiguration] = [
+        let testsConfigurations: [ProjectDescription.Configuration] = [
             .debug(name: "Debug", settings: [String: SettingValue](), xcconfig: .relativeToRoot("Configurations/iOS/iOS-Base.xcconfig")),
             .debug(name: "Release", settings: [String: SettingValue](), xcconfig: .relativeToRoot("Configurations/iOS/iOS-Base.xcconfig")),
         ]
-        let appConfigurations: [CustomConfiguration] = [
+        let appConfigurations: [ProjectDescription.Configuration] = [
             .debug(name: "Debug", settings: [String: SettingValue](), xcconfig: .relativeToRoot("Configurations/iOS/iOS-Base.xcconfig")),
             .debug(name: "Release", settings: [String: SettingValue](), xcconfig: .relativeToRoot("Configurations/iOS/iOS-Base.xcconfig")),
         ]
@@ -99,7 +99,7 @@ extension Target {
                 infoPlist: .default,
                 sources: ["Projects/\(name)/Sources/**/*.swift"],
                 dependencies: targetDependencies,
-                settings: Settings(configurations: frameworkConfigurations)))
+                settings: Settings.settings(configurations: frameworkConfigurations)))
         }
         if targets.contains(.testing) {
             projectTargets.append(Target(name: "\(name)Testing",
@@ -109,7 +109,7 @@ extension Target {
                 infoPlist: .default,
                 sources: ["Projects/\(name)/Testing/**/*.swift"],
                 dependencies: [.target(name: "\(name)"), .xctest],
-                settings: Settings(configurations: frameworkConfigurations)))
+                settings: Settings.settings(configurations: frameworkConfigurations)))
         }
         if targets.contains(.tests) {
             projectTargets.append(Target(name: "\(name)Tests",
@@ -119,7 +119,7 @@ extension Target {
                 infoPlist: .default,
                 sources: ["Projects/\(name)/Tests/**/*.swift"],
                 dependencies: targetTestDependencies,
-                settings: Settings(configurations: testsConfigurations)))
+                settings: Settings.settings(configurations: testsConfigurations)))
         }
         if targets.contains(.examples) {
             projectTargets.append(Target(name: "\(name)Example",
@@ -130,7 +130,7 @@ extension Target {
                 sources: ["Projects/\(name)/Examples/Sources/**/*.swift"],
                 resources: ["Projects/\(name)/Examples/Resources/**"],
                 dependencies: [.target(name: "\(name)")],
-                settings: Settings(configurations: appConfigurations)))
+                settings: Settings.settings(configurations: appConfigurations)))
         }
         return projectTargets
     }
diff --git a/Tuist/Templates/framework/Template.swift b/Tuist/Templates/framework/Template.swift
index e559182..98a08c2 100644
--- a/Tuist/Templates/framework/Template.swift
+++ b/Tuist/Templates/framework/Template.swift
@@ -34,7 +34,7 @@ let template = Template(
         nameAttribute,
         .optional("platform", default: "iOS"),
     ],
-    files: [
+    items: [
         .string(path: "\(nameAttribute)/Sources/\(nameAttribute).swift", contents: exampleContents),
         .string(path: "\(nameAttribute)/Tests/\(nameAttribute)Tests.swift", contents: testContents),
         .file(path: "\(nameAttribute)/Project.swift", templatePath: "project.stencil"),

From 8ad451d98121959a698cd243b36ece6ec6f75d58 Mon Sep 17 00:00:00 2001
From: Enrique Garcia <github@lemambo.com>
Date: Sat, 13 Nov 2021 22:23:14 +0100
Subject: [PATCH 02/10] Migrate to tuist 2.0

---
 Setup.swift | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 Setup.swift

diff --git a/Setup.swift b/Setup.swift
deleted file mode 100644
index 909a1cd..0000000
--- a/Setup.swift
+++ /dev/null
@@ -1,6 +0,0 @@
-import ProjectDescription
-
-let setup = Setup([
-    // .homebrew(packages: ["swiftlint", "carthage"]),
-    // .carthage()
-])

From 3b050e8b01e10ebd6813117a7c3ec22bc738f074 Mon Sep 17 00:00:00 2001
From: Enrique Garcia <github@lemambo.com>
Date: Sat, 13 Nov 2021 22:31:17 +0100
Subject: [PATCH 03/10] Fix swift 5 compilation error

---
 Projects/uCore/Examples/Sources/AppDelegate.swift   | 2 +-
 Projects/uHome/Examples/Sources/AppDelegate.swift   | 2 +-
 Projects/uSearch/Examples/Sources/AppDelegate.swift | 2 +-
 Projects/uUI/Examples/Sources/AppDelegate.swift     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Projects/uCore/Examples/Sources/AppDelegate.swift b/Projects/uCore/Examples/Sources/AppDelegate.swift
index 79dde32..56be470 100644
--- a/Projects/uCore/Examples/Sources/AppDelegate.swift
+++ b/Projects/uCore/Examples/Sources/AppDelegate.swift
@@ -5,7 +5,7 @@ import UIKit
 class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
-    func application(_: UIApplication, didFinishLaunchingWithOptions _: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_: UIApplication, didFinishLaunchingWithOptions _: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         window = UIWindow(frame: UIScreen.main.bounds)
         window?.rootViewController = UIViewController(nibName: nil, bundle: nil)
         window?.makeKeyAndVisible()
diff --git a/Projects/uHome/Examples/Sources/AppDelegate.swift b/Projects/uHome/Examples/Sources/AppDelegate.swift
index 79dde32..56be470 100644
--- a/Projects/uHome/Examples/Sources/AppDelegate.swift
+++ b/Projects/uHome/Examples/Sources/AppDelegate.swift
@@ -5,7 +5,7 @@ import UIKit
 class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
-    func application(_: UIApplication, didFinishLaunchingWithOptions _: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_: UIApplication, didFinishLaunchingWithOptions _: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         window = UIWindow(frame: UIScreen.main.bounds)
         window?.rootViewController = UIViewController(nibName: nil, bundle: nil)
         window?.makeKeyAndVisible()
diff --git a/Projects/uSearch/Examples/Sources/AppDelegate.swift b/Projects/uSearch/Examples/Sources/AppDelegate.swift
index 79dde32..56be470 100644
--- a/Projects/uSearch/Examples/Sources/AppDelegate.swift
+++ b/Projects/uSearch/Examples/Sources/AppDelegate.swift
@@ -5,7 +5,7 @@ import UIKit
 class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
-    func application(_: UIApplication, didFinishLaunchingWithOptions _: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_: UIApplication, didFinishLaunchingWithOptions _: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         window = UIWindow(frame: UIScreen.main.bounds)
         window?.rootViewController = UIViewController(nibName: nil, bundle: nil)
         window?.makeKeyAndVisible()
diff --git a/Projects/uUI/Examples/Sources/AppDelegate.swift b/Projects/uUI/Examples/Sources/AppDelegate.swift
index 79dde32..56be470 100644
--- a/Projects/uUI/Examples/Sources/AppDelegate.swift
+++ b/Projects/uUI/Examples/Sources/AppDelegate.swift
@@ -5,7 +5,7 @@ import UIKit
 class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
-    func application(_: UIApplication, didFinishLaunchingWithOptions _: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_: UIApplication, didFinishLaunchingWithOptions _: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         window = UIWindow(frame: UIScreen.main.bounds)
         window?.rootViewController = UIViewController(nibName: nil, bundle: nil)
         window?.makeKeyAndVisible()

From 94f79c014d436cca143ca8614dc54a6c75285a72 Mon Sep 17 00:00:00 2001
From: Enrique Garcia <github@lemambo.com>
Date: Sat, 11 Dec 2021 18:22:20 +0100
Subject: [PATCH 04/10] update CI to Xcode 13.1

---
 .github/workflows/cache.yml     |  6 +--
 .github/workflows/ufeatures.yml | 78 ++++++++++++++++-----------------
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
index f3176f6..b92759d 100644
--- a/.github/workflows/cache.yml
+++ b/.github/workflows/cache.yml
@@ -9,11 +9,11 @@ on:
 jobs:
   cache:
     name: Warm cache
-    runs-on: macOS-latest
+    runs-on: macOS-11
     steps:
       - uses: actions/checkout@v1
-      - name: Select Xcode 11.4
-        run: sudo xcode-select -switch /Applications/Xcode_11.4.app
+      - name: Select Xcode 13.1
+        run: sudo xcode-select -switch /Applications/Xcode_13.1.app
       - name: Install Tuist
         run: |
           bash <(curl -Ls https://install.tuist.io)
diff --git a/.github/workflows/ufeatures.yml b/.github/workflows/ufeatures.yml
index 7588e70..e203c35 100644
--- a/.github/workflows/ufeatures.yml
+++ b/.github/workflows/ufeatures.yml
@@ -5,11 +5,11 @@ on: ["push"]
 jobs:
   build-uCore:
     name: Build uCore
-    runs-on: macOS-latest
+    runs-on: macOS-11
     steps:
       - uses: actions/checkout@v1
-      - name: Select Xcode 11.4
-        run: sudo xcode-select -switch /Applications/Xcode_11.4.app
+      - name: Select Xcode 13.1
+        run: sudo xcode-select -switch /Applications/Xcode_13.1.app
       - name: Install Tuist
         run: |
           bash <(curl -Ls https://install.tuist.io)
@@ -21,11 +21,11 @@ jobs:
           make build-core
   test-uCore:
     name: Test uCore
-    runs-on: macOS-latest
+    runs-on: macOS-11
     steps:
       - uses: actions/checkout@v1
-      - name: Select Xcode 11.4
-        run: sudo xcode-select -switch /Applications/Xcode_11.4.app
+      - name: Select Xcode 13.1
+        run: sudo xcode-select -switch /Applications/Xcode_13.1.app
       - name: Install Tuist
         run: |
           bash <(curl -Ls https://install.tuist.io)
@@ -37,10 +37,10 @@ jobs:
           make test-core
   build-uTesting:
     name: Build uTesting
-    runs-on: macOS-latest
+    runs-on: macOS-11
     steps:
       - uses: actions/checkout@v1
-      - name: Select Xcode 11.4
+      - name: Select Xcode 13.1
         run: sudo xcode-select -switch /Applications/Xcode_11.5.app
       - name: Install Tuist
         run: |
@@ -53,11 +53,11 @@ jobs:
           make build-testing
   build-uFeatures:
     name: Build uFeatures
-    runs-on: macOS-latest
+    runs-on: macOS-11
     steps:
       - uses: actions/checkout@v1
-      - name: Select Xcode 11.4
-        run: sudo xcode-select -switch /Applications/Xcode_11.4.app
+      - name: Select Xcode 13.1
+        run: sudo xcode-select -switch /Applications/Xcode_13.1.app
       - name: Install Tuist
         run: |
           bash <(curl -Ls https://install.tuist.io)
@@ -69,11 +69,11 @@ jobs:
           make build-features
   test-uFeatures:
     name: Test uFeatures
-    runs-on: macOS-latest
+    runs-on: macOS-11
     steps:
       - uses: actions/checkout@v1
-      - name: Select Xcode 11.4
-        run: sudo xcode-select -switch /Applications/Xcode_11.4.app
+      - name: Select Xcode 13.1
+        run: sudo xcode-select -switch /Applications/Xcode_13.1.app
       - name: Install Tuist
         run: |
           bash <(curl -Ls https://install.tuist.io)
@@ -85,11 +85,11 @@ jobs:
           make test-features
   build-uUI:
     name: Build uUI
-    runs-on: macOS-latest
+    runs-on: macOS-11
     steps:
       - uses: actions/checkout@v1
-      - name: Select Xcode 11.4
-        run: sudo xcode-select -switch /Applications/Xcode_11.4.app
+      - name: Select Xcode 13.1
+        run: sudo xcode-select -switch /Applications/Xcode_13.1.app
       - name: Install Tuist
         run: |
           bash <(curl -Ls https://install.tuist.io)
@@ -101,11 +101,11 @@ jobs:
           make build-ui
   test-uUI:
     name: Test uUI
-    runs-on: macOS-latest
+    runs-on: macOS-11
     steps:
       - uses: actions/checkout@v1
-      - name: Select Xcode 11.4
-        run: sudo xcode-select -switch /Applications/Xcode_11.4.app
+      - name: Select Xcode 13.1
+        run: sudo xcode-select -switch /Applications/Xcode_13.1.app
       - name: Install Tuist
         run: |
           bash <(curl -Ls https://install.tuist.io)
@@ -117,11 +117,11 @@ jobs:
           make test-ui
   build-uHome:
     name: Build uHome
-    runs-on: macOS-latest
+    runs-on: macOS-11
     steps:
       - uses: actions/checkout@v1
-      - name: Select Xcode 11.4
-        run: sudo xcode-select -switch /Applications/Xcode_11.4.app
+      - name: Select Xcode 13.1
+        run: sudo xcode-select -switch /Applications/Xcode_13.1.app
       - name: Install Tuist
         run: |
           bash <(curl -Ls https://install.tuist.io)
@@ -133,11 +133,11 @@ jobs:
           make build-home
   test-uHome:
     name: Test uHome
-    runs-on: macOS-latest
+    runs-on: macOS-11
     steps:
       - uses: actions/checkout@v1
-      - name: Select Xcode 11.4
-        run: sudo xcode-select -switch /Applications/Xcode_11.4.app
+      - name: Select Xcode 13.1
+        run: sudo xcode-select -switch /Applications/Xcode_13.1.app
       - name: Install Tuist
         run: |
           bash <(curl -Ls https://install.tuist.io)
@@ -149,11 +149,11 @@ jobs:
           make test-home
   build-uSearch:
     name: Build uSearch
-    runs-on: macOS-latest
+    runs-on: macOS-11
     steps:
       - uses: actions/checkout@v1
-      - name: Select Xcode 11.4
-        run: sudo xcode-select -switch /Applications/Xcode_11.4.app
+      - name: Select Xcode 13.1
+        run: sudo xcode-select -switch /Applications/Xcode_13.1.app
       - name: Install Tuist
         run: |
           bash <(curl -Ls https://install.tuist.io)
@@ -165,11 +165,11 @@ jobs:
           make build-search
   test-uSearch:
     name: Test uSearch
-    runs-on: macOS-latest
+    runs-on: macOS-11
     steps:
       - uses: actions/checkout@v1
-      - name: Select Xcode 11.4
-        run: sudo xcode-select -switch /Applications/Xcode_11.4.app
+      - name: Select Xcode 13.1
+        run: sudo xcode-select -switch /Applications/Xcode_13.1.app
       - name: Install Tuist
         run: |
           bash <(curl -Ls https://install.tuist.io)
@@ -181,11 +181,11 @@ jobs:
           make test-search
   build-app:
     name: Build uSearch
-    runs-on: macOS-latest
+    runs-on: macOS-11
     steps:
       - uses: actions/checkout@v1
-      - name: Select Xcode 11.4
-        run: sudo xcode-select -switch /Applications/Xcode_11.4.app
+      - name: Select Xcode 13.1
+        run: sudo xcode-select -switch /Applications/Xcode_13.1.app
       - name: Install Tuist
         run: |
           bash <(curl -Ls https://install.tuist.io)
@@ -197,11 +197,11 @@ jobs:
           make build-app
   test-App:
     name: Test App
-    runs-on: macOS-latest
+    runs-on: macOS-11
     steps:
       - uses: actions/checkout@v1
-      - name: Select Xcode 11.4
-        run: sudo xcode-select -switch /Applications/Xcode_11.4.app
+      - name: Select Xcode 13.1
+        run: sudo xcode-select -switch /Applications/Xcode_13.1.app
       - name: Install Tuist
         run: |
           bash <(curl -Ls https://install.tuist.io)
@@ -211,4 +211,4 @@ jobs:
       - name: Test App
         run: |
           make test-app
-      
\ No newline at end of file
+      

From 9a50e2033a9fab1852e323e0ba565856a62a972c Mon Sep 17 00:00:00 2001
From: Enrique Garcia <github@lemambo.com>
Date: Sat, 11 Dec 2021 18:31:33 +0100
Subject: [PATCH 05/10] update CI simulator device

---
 .github/workflows/ufeatures.yml | 2 +-
 Makefile                        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ufeatures.yml b/.github/workflows/ufeatures.yml
index e203c35..c46f1eb 100644
--- a/.github/workflows/ufeatures.yml
+++ b/.github/workflows/ufeatures.yml
@@ -41,7 +41,7 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - name: Select Xcode 13.1
-        run: sudo xcode-select -switch /Applications/Xcode_11.5.app
+        run: sudo xcode-select -switch /Applications/Xcode_13.1.app
       - name: Install Tuist
         run: |
           bash <(curl -Ls https://install.tuist.io)
diff --git a/Makefile b/Makefile
index 760208a..cd0bb18 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-DESTINATION = "platform=iOS Simulator,name=iPhone 11,OS=13.5"
+DESTINATION = "platform=iOS Simulator,name=iPhone 13,OS=15.0"
 build-core:
 	xcodebuild -workspace uFeatures.xcworkspace -scheme uCore -config Debug -destination $(DESTINATION) -sdk iphonesimulator clean build
 test-core:
@@ -24,4 +24,4 @@ test-search:
 build-app:
 	xcodebuild -workspace uFeatures.xcworkspace -scheme App -config Debug -destination $(DESTINATION) -sdk iphonesimulator clean build
 test-app:
-	xcodebuild -workspace uFeatures.xcworkspace -scheme App -config Debug -destination $(DESTINATION) -sdk iphonesimulator clean test
\ No newline at end of file
+	xcodebuild -workspace uFeatures.xcworkspace -scheme App -config Debug -destination $(DESTINATION) -sdk iphonesimulator clean test

From 34934b30c945f2e8cfcd1911c1af8fbf5815926d Mon Sep 17 00:00:00 2001
From: Enrique Garcia <github@lemambo.com>
Date: Sat, 11 Dec 2021 19:39:42 +0100
Subject: [PATCH 06/10] fix missing test dependency on uTesting

---
 Project.swift | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Project.swift b/Project.swift
index abc4160..9c439ae 100644
--- a/Project.swift
+++ b/Project.swift
@@ -11,10 +11,10 @@ func targets() -> [Target] {
     targets += Target.makeAppTargets(name: "App", dependencies: ["uSearch", "uHome"], testDependencies: ["uTesting"])
     targets += Target.makeFrameworkTargets(name: "uTesting", targets: Set([.framework]), dependsOnXCTest: true)
     targets += Target.makeFrameworkTargets(name: "uCore")
-    targets += Target.makeFrameworkTargets(name: "uUI")
-    targets += Target.makeFrameworkTargets(name: "uFeatures", dependencies: ["uCore", "uUI"], targets: Set([.framework, .tests, .testing]))
-    targets += Target.makeFrameworkTargets(name: "uHome", dependencies: ["uFeatures", "uCore", "uUI"])
-    targets += Target.makeFrameworkTargets(name: "uSearch", dependencies:  ["uFeatures", "uCore", "uUI"])
+    targets += Target.makeFrameworkTargets(name: "uUI", testDependencies: ["uTesting"])
+    targets += Target.makeFrameworkTargets(name: "uFeatures", dependencies: ["uCore", "uUI"], testDependencies: ["uTesting"], targets: Set([.framework, .tests, .testing]))
+    targets += Target.makeFrameworkTargets(name: "uHome", dependencies: ["uFeatures", "uCore", "uUI"], testDependencies: ["uTesting"])
+    targets += Target.makeFrameworkTargets(name: "uSearch", dependencies:  ["uFeatures", "uCore", "uUI"], testDependencies: ["uTesting"])
     return targets
 }
 

From ccbb51c7c0f8f50d1ce87b1c6b3d78a8824da50b Mon Sep 17 00:00:00 2001
From: Enrique Garcia <github@lemambo.com>
Date: Tue, 19 Jul 2022 18:07:39 +0200
Subject: [PATCH 07/10] Use Xcode 13.4.1 on CI

---
 .github/workflows/cache.yml     |  4 +--
 .github/workflows/ufeatures.yml | 52 ++++++++++++++++-----------------
 Makefile                        |  2 +-
 3 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
index b92759d..17b858f 100644
--- a/.github/workflows/cache.yml
+++ b/.github/workflows/cache.yml
@@ -12,8 +12,8 @@ jobs:
     runs-on: macOS-11
     steps:
       - uses: actions/checkout@v1
-      - name: Select Xcode 13.1
-        run: sudo xcode-select -switch /Applications/Xcode_13.1.app
+      - name: Select Xcode 13.4.1
+        run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app
       - name: Install Tuist
         run: |
           bash <(curl -Ls https://install.tuist.io)
diff --git a/.github/workflows/ufeatures.yml b/.github/workflows/ufeatures.yml
index c46f1eb..0ef144d 100644
--- a/.github/workflows/ufeatures.yml
+++ b/.github/workflows/ufeatures.yml
@@ -8,8 +8,8 @@ jobs:
     runs-on: macOS-11
     steps:
       - uses: actions/checkout@v1
-      - name: Select Xcode 13.1
-        run: sudo xcode-select -switch /Applications/Xcode_13.1.app
+      - name: Select Xcode 13.4.1
+        run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app
       - name: Install Tuist
         run: |
           bash <(curl -Ls https://install.tuist.io)
@@ -24,8 +24,8 @@ jobs:
     runs-on: macOS-11
     steps:
       - uses: actions/checkout@v1
-      - name: Select Xcode 13.1
-        run: sudo xcode-select -switch /Applications/Xcode_13.1.app
+      - name: Select Xcode 13.4.1
+        run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app
       - name: Install Tuist
         run: |
           bash <(curl -Ls https://install.tuist.io)
@@ -40,8 +40,8 @@ jobs:
     runs-on: macOS-11
     steps:
       - uses: actions/checkout@v1
-      - name: Select Xcode 13.1
-        run: sudo xcode-select -switch /Applications/Xcode_13.1.app
+      - name: Select Xcode 13.4.1
+        run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app
       - name: Install Tuist
         run: |
           bash <(curl -Ls https://install.tuist.io)
@@ -56,8 +56,8 @@ jobs:
     runs-on: macOS-11
     steps:
       - uses: actions/checkout@v1
-      - name: Select Xcode 13.1
-        run: sudo xcode-select -switch /Applications/Xcode_13.1.app
+      - name: Select Xcode 13.4.1
+        run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app
       - name: Install Tuist
         run: |
           bash <(curl -Ls https://install.tuist.io)
@@ -72,8 +72,8 @@ jobs:
     runs-on: macOS-11
     steps:
       - uses: actions/checkout@v1
-      - name: Select Xcode 13.1
-        run: sudo xcode-select -switch /Applications/Xcode_13.1.app
+      - name: Select Xcode 13.4.1
+        run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app
       - name: Install Tuist
         run: |
           bash <(curl -Ls https://install.tuist.io)
@@ -88,8 +88,8 @@ jobs:
     runs-on: macOS-11
     steps:
       - uses: actions/checkout@v1
-      - name: Select Xcode 13.1
-        run: sudo xcode-select -switch /Applications/Xcode_13.1.app
+      - name: Select Xcode 13.4.1
+        run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app
       - name: Install Tuist
         run: |
           bash <(curl -Ls https://install.tuist.io)
@@ -104,8 +104,8 @@ jobs:
     runs-on: macOS-11
     steps:
       - uses: actions/checkout@v1
-      - name: Select Xcode 13.1
-        run: sudo xcode-select -switch /Applications/Xcode_13.1.app
+      - name: Select Xcode 13.4.1
+        run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app
       - name: Install Tuist
         run: |
           bash <(curl -Ls https://install.tuist.io)
@@ -120,8 +120,8 @@ jobs:
     runs-on: macOS-11
     steps:
       - uses: actions/checkout@v1
-      - name: Select Xcode 13.1
-        run: sudo xcode-select -switch /Applications/Xcode_13.1.app
+      - name: Select Xcode 13.4.1
+        run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app
       - name: Install Tuist
         run: |
           bash <(curl -Ls https://install.tuist.io)
@@ -136,8 +136,8 @@ jobs:
     runs-on: macOS-11
     steps:
       - uses: actions/checkout@v1
-      - name: Select Xcode 13.1
-        run: sudo xcode-select -switch /Applications/Xcode_13.1.app
+      - name: Select Xcode 13.4.1
+        run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app
       - name: Install Tuist
         run: |
           bash <(curl -Ls https://install.tuist.io)
@@ -152,8 +152,8 @@ jobs:
     runs-on: macOS-11
     steps:
       - uses: actions/checkout@v1
-      - name: Select Xcode 13.1
-        run: sudo xcode-select -switch /Applications/Xcode_13.1.app
+      - name: Select Xcode 13.4.1
+        run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app
       - name: Install Tuist
         run: |
           bash <(curl -Ls https://install.tuist.io)
@@ -168,8 +168,8 @@ jobs:
     runs-on: macOS-11
     steps:
       - uses: actions/checkout@v1
-      - name: Select Xcode 13.1
-        run: sudo xcode-select -switch /Applications/Xcode_13.1.app
+      - name: Select Xcode 13.4.1
+        run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app
       - name: Install Tuist
         run: |
           bash <(curl -Ls https://install.tuist.io)
@@ -184,8 +184,8 @@ jobs:
     runs-on: macOS-11
     steps:
       - uses: actions/checkout@v1
-      - name: Select Xcode 13.1
-        run: sudo xcode-select -switch /Applications/Xcode_13.1.app
+      - name: Select Xcode 13.4.1
+        run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app
       - name: Install Tuist
         run: |
           bash <(curl -Ls https://install.tuist.io)
@@ -200,8 +200,8 @@ jobs:
     runs-on: macOS-11
     steps:
       - uses: actions/checkout@v1
-      - name: Select Xcode 13.1
-        run: sudo xcode-select -switch /Applications/Xcode_13.1.app
+      - name: Select Xcode 13.4.1
+        run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app
       - name: Install Tuist
         run: |
           bash <(curl -Ls https://install.tuist.io)
diff --git a/Makefile b/Makefile
index cd0bb18..d7fe3b2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-DESTINATION = "platform=iOS Simulator,name=iPhone 13,OS=15.0"
+DESTINATION = "platform=iOS Simulator,name=iPhone 13,OS=15.5"
 build-core:
 	xcodebuild -workspace uFeatures.xcworkspace -scheme uCore -config Debug -destination $(DESTINATION) -sdk iphonesimulator clean build
 test-core:

From cf5c99858ef9f75e64f62045818cd7022cc052a6 Mon Sep 17 00:00:00 2001
From: Enrique Garcia <github@lemambo.com>
Date: Tue, 19 Jul 2022 18:14:41 +0200
Subject: [PATCH 08/10] Use macOS 12 on CI

---
 .github/workflows/cache.yml     |  2 +-
 .github/workflows/ufeatures.yml | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
index 17b858f..4ac00ef 100644
--- a/.github/workflows/cache.yml
+++ b/.github/workflows/cache.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   cache:
     name: Warm cache
-    runs-on: macOS-11
+    runs-on: macOS-12
     steps:
       - uses: actions/checkout@v1
       - name: Select Xcode 13.4.1
diff --git a/.github/workflows/ufeatures.yml b/.github/workflows/ufeatures.yml
index 0ef144d..e281bb7 100644
--- a/.github/workflows/ufeatures.yml
+++ b/.github/workflows/ufeatures.yml
@@ -5,7 +5,7 @@ on: ["push"]
 jobs:
   build-uCore:
     name: Build uCore
-    runs-on: macOS-11
+    runs-on: macOS-12
     steps:
       - uses: actions/checkout@v1
       - name: Select Xcode 13.4.1
@@ -21,7 +21,7 @@ jobs:
           make build-core
   test-uCore:
     name: Test uCore
-    runs-on: macOS-11
+    runs-on: macOS-12
     steps:
       - uses: actions/checkout@v1
       - name: Select Xcode 13.4.1
@@ -37,7 +37,7 @@ jobs:
           make test-core
   build-uTesting:
     name: Build uTesting
-    runs-on: macOS-11
+    runs-on: macOS-12
     steps:
       - uses: actions/checkout@v1
       - name: Select Xcode 13.4.1
@@ -53,7 +53,7 @@ jobs:
           make build-testing
   build-uFeatures:
     name: Build uFeatures
-    runs-on: macOS-11
+    runs-on: macOS-12
     steps:
       - uses: actions/checkout@v1
       - name: Select Xcode 13.4.1
@@ -69,7 +69,7 @@ jobs:
           make build-features
   test-uFeatures:
     name: Test uFeatures
-    runs-on: macOS-11
+    runs-on: macOS-12
     steps:
       - uses: actions/checkout@v1
       - name: Select Xcode 13.4.1
@@ -85,7 +85,7 @@ jobs:
           make test-features
   build-uUI:
     name: Build uUI
-    runs-on: macOS-11
+    runs-on: macOS-12
     steps:
       - uses: actions/checkout@v1
       - name: Select Xcode 13.4.1
@@ -101,7 +101,7 @@ jobs:
           make build-ui
   test-uUI:
     name: Test uUI
-    runs-on: macOS-11
+    runs-on: macOS-12
     steps:
       - uses: actions/checkout@v1
       - name: Select Xcode 13.4.1
@@ -117,7 +117,7 @@ jobs:
           make test-ui
   build-uHome:
     name: Build uHome
-    runs-on: macOS-11
+    runs-on: macOS-12
     steps:
       - uses: actions/checkout@v1
       - name: Select Xcode 13.4.1
@@ -133,7 +133,7 @@ jobs:
           make build-home
   test-uHome:
     name: Test uHome
-    runs-on: macOS-11
+    runs-on: macOS-12
     steps:
       - uses: actions/checkout@v1
       - name: Select Xcode 13.4.1
@@ -149,7 +149,7 @@ jobs:
           make test-home
   build-uSearch:
     name: Build uSearch
-    runs-on: macOS-11
+    runs-on: macOS-12
     steps:
       - uses: actions/checkout@v1
       - name: Select Xcode 13.4.1
@@ -165,7 +165,7 @@ jobs:
           make build-search
   test-uSearch:
     name: Test uSearch
-    runs-on: macOS-11
+    runs-on: macOS-12
     steps:
       - uses: actions/checkout@v1
       - name: Select Xcode 13.4.1
@@ -181,7 +181,7 @@ jobs:
           make test-search
   build-app:
     name: Build uSearch
-    runs-on: macOS-11
+    runs-on: macOS-12
     steps:
       - uses: actions/checkout@v1
       - name: Select Xcode 13.4.1
@@ -197,7 +197,7 @@ jobs:
           make build-app
   test-App:
     name: Test App
-    runs-on: macOS-11
+    runs-on: macOS-12
     steps:
       - uses: actions/checkout@v1
       - name: Select Xcode 13.4.1

From e4eae2a93d4b4482be11a8d42c3ecd6d9c1c0f7e Mon Sep 17 00:00:00 2001
From: Enrique Garcia <github@lemambo.com>
Date: Fri, 22 Jul 2022 19:12:13 +0200
Subject: [PATCH 09/10] Fix class name

---
 Projects/uUI/Tests/uUITests.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Projects/uUI/Tests/uUITests.swift b/Projects/uUI/Tests/uUITests.swift
index c7b0fc8..b43f1cb 100644
--- a/Projects/uUI/Tests/uUITests.swift
+++ b/Projects/uUI/Tests/uUITests.swift
@@ -2,7 +2,7 @@
 @testable import uUI
 import XCTest
 
-class uCoreTests: XCTestCase {
+class uUITests: XCTestCase {
     override func setUp() {
         super.setUp()
         // Put setup code here. This method is called before the invocation of each test method in the class.

From e977db9e94c8f164000d96d870e39670831faf61 Mon Sep 17 00:00:00 2001
From: Enrique Garcia <github@lemambo.com>
Date: Wed, 9 Nov 2022 11:47:10 +0100
Subject: [PATCH 10/10] update checkout action

---
 .github/workflows/cache.yml     |  2 +-
 .github/workflows/ufeatures.yml | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
index 4ac00ef..3d8dcaf 100644
--- a/.github/workflows/cache.yml
+++ b/.github/workflows/cache.yml
@@ -11,7 +11,7 @@ jobs:
     name: Warm cache
     runs-on: macOS-12
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Select Xcode 13.4.1
         run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app
       - name: Install Tuist
diff --git a/.github/workflows/ufeatures.yml b/.github/workflows/ufeatures.yml
index e281bb7..78207cc 100644
--- a/.github/workflows/ufeatures.yml
+++ b/.github/workflows/ufeatures.yml
@@ -7,7 +7,7 @@ jobs:
     name: Build uCore
     runs-on: macOS-12
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Select Xcode 13.4.1
         run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app
       - name: Install Tuist
@@ -23,7 +23,7 @@ jobs:
     name: Test uCore
     runs-on: macOS-12
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Select Xcode 13.4.1
         run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app
       - name: Install Tuist
@@ -39,7 +39,7 @@ jobs:
     name: Build uTesting
     runs-on: macOS-12
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Select Xcode 13.4.1
         run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app
       - name: Install Tuist
@@ -55,7 +55,7 @@ jobs:
     name: Build uFeatures
     runs-on: macOS-12
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Select Xcode 13.4.1
         run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app
       - name: Install Tuist
@@ -71,7 +71,7 @@ jobs:
     name: Test uFeatures
     runs-on: macOS-12
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Select Xcode 13.4.1
         run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app
       - name: Install Tuist
@@ -87,7 +87,7 @@ jobs:
     name: Build uUI
     runs-on: macOS-12
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Select Xcode 13.4.1
         run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app
       - name: Install Tuist
@@ -103,7 +103,7 @@ jobs:
     name: Test uUI
     runs-on: macOS-12
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Select Xcode 13.4.1
         run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app
       - name: Install Tuist
@@ -119,7 +119,7 @@ jobs:
     name: Build uHome
     runs-on: macOS-12
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Select Xcode 13.4.1
         run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app
       - name: Install Tuist
@@ -135,7 +135,7 @@ jobs:
     name: Test uHome
     runs-on: macOS-12
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Select Xcode 13.4.1
         run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app
       - name: Install Tuist
@@ -151,7 +151,7 @@ jobs:
     name: Build uSearch
     runs-on: macOS-12
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Select Xcode 13.4.1
         run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app
       - name: Install Tuist
@@ -167,7 +167,7 @@ jobs:
     name: Test uSearch
     runs-on: macOS-12
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Select Xcode 13.4.1
         run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app
       - name: Install Tuist
@@ -183,7 +183,7 @@ jobs:
     name: Build uSearch
     runs-on: macOS-12
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Select Xcode 13.4.1
         run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app
       - name: Install Tuist
@@ -199,7 +199,7 @@ jobs:
     name: Test App
     runs-on: macOS-12
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Select Xcode 13.4.1
         run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app
       - name: Install Tuist