diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml index f3176f6..3d8dcaf 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-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) diff --git a/.github/workflows/ufeatures.yml b/.github/workflows/ufeatures.yml index 7588e70..78207cc 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-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) @@ -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) @@ -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) @@ -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) @@ -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) @@ -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) @@ -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) @@ -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) @@ -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) @@ -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) @@ -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) @@ -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) @@ -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) @@ -211,4 +211,4 @@ jobs: - name: Test App run: | make test-app - \ No newline at end of file + diff --git a/Makefile b/Makefile index 760208a..d7fe3b2 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.5" 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 diff --git a/Project.swift b/Project.swift index cf131e5..0f51f3b 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 } 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() 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. 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() -])