Skip to content

Update to tuist 2.0 #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kikeenrique wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Update to tuist 2.0 #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
edca5d2
Migrate to tuist 2.0
kikeenrique Nov 12, 2021
8ad451d
Migrate to tuist 2.0
kikeenrique Nov 13, 2021
3b050e8
Fix swift 5 compilation error
kikeenrique Nov 13, 2021
94f79c0
update CI to Xcode 13.1
kikeenrique Dec 11, 2021
9a50e20
update CI simulator device
kikeenrique Dec 11, 2021
34934b3
fix missing test dependency on uTesting
kikeenrique Dec 11, 2021
62e20ac
Merge branch 'master-origin'
kikeenrique Jul 19, 2022
ccbb51c
Use Xcode 13.4.1 on CI
kikeenrique Jul 19, 2022
cf5c998
Use macOS 12 on CI
kikeenrique Jul 19, 2022
e4eae2a
Fix class name
kikeenrique Jul 22, 2022
e977db9
update checkout action
kikeenrique Nov 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/cache.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ on:
jobs:
cache:
name: Warm cache
runs-on: macOS-latest
runs-on: macOS-12
steps:
- uses: actions/checkout@v1
- name: Select Xcode 11.4
run: sudo xcode-select -switch /Applications/Xcode_11.4.app
- uses: actions/checkout@v3
- 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)
Expand Down
106 changes: 53 additions & 53 deletions .github/workflows/ufeatures.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ on: ["push"]
jobs:
build-uCore:
name: Build uCore
runs-on: macOS-latest
runs-on: macOS-12
steps:
- uses: actions/checkout@v1
- name: Select Xcode 11.4
run: sudo xcode-select -switch /Applications/Xcode_11.4.app
- uses: actions/checkout@v3
- 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)
Expand All @@ -21,11 +21,11 @@ jobs:
make build-core
test-uCore:
name: Test uCore
runs-on: macOS-latest
runs-on: macOS-12
steps:
- uses: actions/checkout@v1
- name: Select Xcode 11.4
run: sudo xcode-select -switch /Applications/Xcode_11.4.app
- uses: actions/checkout@v3
- 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)
Expand All @@ -37,11 +37,11 @@ jobs:
make test-core
build-uTesting:
name: Build uTesting
runs-on: macOS-latest
runs-on: macOS-12
steps:
- uses: actions/checkout@v1
- name: Select Xcode 11.4
run: sudo xcode-select -switch /Applications/Xcode_11.5.app
- uses: actions/checkout@v3
- 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)
Expand All @@ -53,11 +53,11 @@ jobs:
make build-testing
build-uFeatures:
name: Build uFeatures
runs-on: macOS-latest
runs-on: macOS-12
steps:
- uses: actions/checkout@v1
- name: Select Xcode 11.4
run: sudo xcode-select -switch /Applications/Xcode_11.4.app
- uses: actions/checkout@v3
- 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)
Expand All @@ -69,11 +69,11 @@ jobs:
make build-features
test-uFeatures:
name: Test uFeatures
runs-on: macOS-latest
runs-on: macOS-12
steps:
- uses: actions/checkout@v1
- name: Select Xcode 11.4
run: sudo xcode-select -switch /Applications/Xcode_11.4.app
- uses: actions/checkout@v3
- 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)
Expand All @@ -85,11 +85,11 @@ jobs:
make test-features
build-uUI:
name: Build uUI
runs-on: macOS-latest
runs-on: macOS-12
steps:
- uses: actions/checkout@v1
- name: Select Xcode 11.4
run: sudo xcode-select -switch /Applications/Xcode_11.4.app
- uses: actions/checkout@v3
- 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)
Expand All @@ -101,11 +101,11 @@ jobs:
make build-ui
test-uUI:
name: Test uUI
runs-on: macOS-latest
runs-on: macOS-12
steps:
- uses: actions/checkout@v1
- name: Select Xcode 11.4
run: sudo xcode-select -switch /Applications/Xcode_11.4.app
- uses: actions/checkout@v3
- 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)
Expand All @@ -117,11 +117,11 @@ jobs:
make test-ui
build-uHome:
name: Build uHome
runs-on: macOS-latest
runs-on: macOS-12
steps:
- uses: actions/checkout@v1
- name: Select Xcode 11.4
run: sudo xcode-select -switch /Applications/Xcode_11.4.app
- uses: actions/checkout@v3
- 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)
Expand All @@ -133,11 +133,11 @@ jobs:
make build-home
test-uHome:
name: Test uHome
runs-on: macOS-latest
runs-on: macOS-12
steps:
- uses: actions/checkout@v1
- name: Select Xcode 11.4
run: sudo xcode-select -switch /Applications/Xcode_11.4.app
- uses: actions/checkout@v3
- 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)
Expand All @@ -149,11 +149,11 @@ jobs:
make test-home
build-uSearch:
name: Build uSearch
runs-on: macOS-latest
runs-on: macOS-12
steps:
- uses: actions/checkout@v1
- name: Select Xcode 11.4
run: sudo xcode-select -switch /Applications/Xcode_11.4.app
- uses: actions/checkout@v3
- 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)
Expand All @@ -165,11 +165,11 @@ jobs:
make build-search
test-uSearch:
name: Test uSearch
runs-on: macOS-latest
runs-on: macOS-12
steps:
- uses: actions/checkout@v1
- name: Select Xcode 11.4
run: sudo xcode-select -switch /Applications/Xcode_11.4.app
- uses: actions/checkout@v3
- 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)
Expand All @@ -181,11 +181,11 @@ jobs:
make test-search
build-app:
name: Build uSearch
runs-on: macOS-latest
runs-on: macOS-12
steps:
- uses: actions/checkout@v1
- name: Select Xcode 11.4
run: sudo xcode-select -switch /Applications/Xcode_11.4.app
- uses: actions/checkout@v3
- 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)
Expand All @@ -197,11 +197,11 @@ jobs:
make build-app
test-App:
name: Test App
runs-on: macOS-latest
runs-on: macOS-12
steps:
- uses: actions/checkout@v1
- name: Select Xcode 11.4
run: sudo xcode-select -switch /Applications/Xcode_11.4.app
- uses: actions/checkout@v3
- 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)
Expand All @@ -211,4 +211,4 @@ jobs:
- name: Test App
run: |
make test-app


4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
DESTINATION = "platform=iOS Simulator,name=iPhone 11,OS=13.5"
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:
Expand All @@ -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
xcodebuild -workspace uFeatures.xcworkspace -scheme App -config Debug -destination $(DESTINATION) -sdk iphonesimulator clean test
8 changes: 4 additions & 4 deletions Project.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion Projects/uCore/Examples/Sources/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion Projects/uHome/Examples/Sources/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion Projects/uSearch/Examples/Sources/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion Projects/uUI/Examples/Sources/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion Projects/uUI/Tests/uUITests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 0 additions & 6 deletions Setup.swift
View file
Open in desktop

This file was deleted.