From 709ffe49ed2e3414729b16d892d626704c14b227 Mon Sep 17 00:00:00 2001 From: Steven Grosmark Date: Fri, 7 Jun 2024 07:39:12 -0400 Subject: [PATCH] Remove Tuist --- .github/workflows/build-test.yml | 32 ----- Example/Project.swift | 113 ------------------ Example/Tuist/Config.swift | 5 - Example/Tuist/Dependencies.swift | 16 --- .../Project+Templates.swift | 10 -- Project.swift | 68 ----------- .../NavigationTesting.swift | 2 +- Tuist/Config.swift | 5 - .../Project+Templates.swift | 10 -- 9 files changed, 1 insertion(+), 260 deletions(-) delete mode 100644 Example/Project.swift delete mode 100644 Example/Tuist/Config.swift delete mode 100644 Example/Tuist/Dependencies.swift delete mode 100644 Example/Tuist/ProjectDescriptionHelpers/Project+Templates.swift delete mode 100644 Project.swift delete mode 100644 Tuist/Config.swift delete mode 100644 Tuist/ProjectDescriptionHelpers/Project+Templates.swift diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index ba31d1b..f6ad4a3 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -113,35 +113,3 @@ jobs: run: git clean -ffdxq if: always() continue-on-error: true - - build-and-test-tuist: - runs-on: macos-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Install tuist - run: | - curl -Ls https://install.tuist.io | bash - tuist local 3.19.0 - - - name: Clean - working-directory: Example - run: tuist clean - - - name: Fetch dependencies - working-directory: Example - run: tuist fetch - - - name: Generate project - working-directory: Example - run: tuist generate --no-open - - - name: Build and run tests - working-directory: Example - run: tuist test - - - name: Post job cleanup - run: git clean -ffdxq - if: always() - continue-on-error: true diff --git a/Example/Project.swift b/Example/Project.swift deleted file mode 100644 index afeba4d..0000000 --- a/Example/Project.swift +++ /dev/null @@ -1,113 +0,0 @@ -import ProjectDescription -import ProjectDescriptionHelpers - -let bundleIdPrefix = "com.weightwatchers." - -let baseSettings: SettingsDictionary = [ - "IPHONEOS_DEPLOYMENT_TARGET": "13.0", - "WATCHOS_DEPLOYMENT_TARGET": "7.1", - - "LastUpgradeCheck": "1330" -] - -let infoPlist: [String: InfoPlist.Value] = [ - "CFBundleShortVersionString": "1.3.0", - "CFBundleVersion": "1" -] - -let defaultSettings: Settings = .settings( - configurations: [ - .debug(name: "Debug", settings: baseSettings), - .release(name: "Release", settings: baseSettings), - .release(name: "AdHoc", settings: baseSettings), - .release(name: "Enterprise", settings: baseSettings), - .release(name: "AppStore", settings: baseSettings) - ] -) - -let lasso: TargetDependency = .project(target: "Lasso", path: "../") -let lassoTestUtilities: TargetDependency = .project(target: "LassoTestUtilities", path: "../") - -let lassoExample = Target( - name: "Lasso_Example", // we need the underscore to match Pod name - platform: .iOS, - product: .app, - bundleId: bundleIdPrefix + "LassoExample", - infoPlist: .extendingDefault(with: infoPlist), - sources: [ - "Lasso/**/*.swift" - ], - resources: [ - "Lasso/Base.lproj/**/*", - "Lasso/Images.xcassets" - ], - dependencies: [ - lasso, - .external(name: "WWLayout") - ] -) - -let lassoTests = Target( - name: "LassoTests", - platform: .iOS, - product: .unitTests, - bundleId: bundleIdPrefix + "LassoTests", - infoPlist: .extendingDefault(with: infoPlist), - sources: [ - "Lasso_Tests/**/*.swift" - ], - dependencies: [ - .target(name: "Lasso_Example"), - lassoTestUtilities - ] -) - -let lassoExampleTests = Target( - name: "LassoExampleTests", - platform: .iOS, - product: .unitTests, - bundleId: bundleIdPrefix + "LassoExampleTests", - infoPlist: .extendingDefault(with: infoPlist), - sources: [ - "Example_Tests/**/*.swift" - ], - dependencies: [ - .target(name: "Lasso_Example"), - lassoTestUtilities - ] -) - -let lassoTestUtilitiesTests = Target( - name: "LassoTestUtilitiesTests", - platform: .iOS, - product: .unitTests, - bundleId: bundleIdPrefix + "LassoTestUtilitiesTests", - infoPlist: .extendingDefault(with: infoPlist), - sources: [ - "LassoTestUtilities_Tests/**/*.swift" - ], - dependencies: [ - .target(name: "Lasso_Example"), - lassoTestUtilities - ] -) - -let project = Project( - name: "LassoTuistExample", - organizationName: "WW Tech", - options: .options(), - packages: [ - ], - - settings: defaultSettings, - - targets: [ - lassoExample, - lassoTests, lassoExampleTests, lassoTestUtilitiesTests - ], - - schemes: [], - fileHeaderTemplate: nil, - additionalFiles: [], - resourceSynthesizers: [] -) diff --git a/Example/Tuist/Config.swift b/Example/Tuist/Config.swift deleted file mode 100644 index 80d8688..0000000 --- a/Example/Tuist/Config.swift +++ /dev/null @@ -1,5 +0,0 @@ -import ProjectDescription - -let config = Config( - generationOptions: .options() -) diff --git a/Example/Tuist/Dependencies.swift b/Example/Tuist/Dependencies.swift deleted file mode 100644 index d78b604..0000000 --- a/Example/Tuist/Dependencies.swift +++ /dev/null @@ -1,16 +0,0 @@ -// -// Dependencies.swift -// tuistManifests -// -// Created by Marius Patru on 09.12.2022. -// - -import ProjectDescription - -let dependencies = Dependencies( - carthage: [], - swiftPackageManager: [ - .remote(url: "https://github.com/ww-tech/wwlayout.git", requirement: .upToNextMajor(from: "0.8.0")) - ], - platforms: [.iOS] -) diff --git a/Example/Tuist/ProjectDescriptionHelpers/Project+Templates.swift b/Example/Tuist/ProjectDescriptionHelpers/Project+Templates.swift deleted file mode 100644 index 28bbfc1..0000000 --- a/Example/Tuist/ProjectDescriptionHelpers/Project+Templates.swift +++ /dev/null @@ -1,10 +0,0 @@ -import ProjectDescription - -/// Project helpers are functions that simplify the way you define your project. -/// Share code to create targets, settings, dependencies, -/// Create your own conventions, e.g: a func that makes sure all shared targets are "static frameworks" -/// See https://docs.tuist.io/guides/helpers/ - -extension Project { - -} diff --git a/Project.swift b/Project.swift deleted file mode 100644 index a313040..0000000 --- a/Project.swift +++ /dev/null @@ -1,68 +0,0 @@ -import ProjectDescription -import ProjectDescriptionHelpers - -let bundleIdPrefix = "com.weightwatchers." - -let baseSettings: SettingsDictionary = [ - "IPHONEOS_DEPLOYMENT_TARGET": "13.0", - "WATCHOS_DEPLOYMENT_TARGET": "7.1", - - "LastUpgradeCheck": "1330" -] - -let infoPlist: [String: InfoPlist.Value] = [ - "CFBundleShortVersionString": "1.3.0", - "CFBundleVersion": "1" -] - -let defaultSettings: Settings = .settings( - configurations: [ - .debug(name: "Debug", settings: baseSettings), - .release(name: "Release", settings: baseSettings), - .release(name: "AdHoc", settings: baseSettings), - .release(name: "Enterprise", settings: baseSettings), - .release(name: "AppStore", settings: baseSettings) - ] -) - -let lasso = Target( - name: "Lasso", - platform: .iOS, - product: .framework, - bundleId: bundleIdPrefix + "Lasso", - infoPlist: .extendingDefault(with: infoPlist), - sources: [ - "Sources/Lasso/**/*.swift" - ] -) - -let lassoTestUtilities = Target( - name: "LassoTestUtilities", - platform: .iOS, - product: .framework, - bundleId: bundleIdPrefix + "LassoTestUtilities", - infoPlist: .extendingDefault(with: infoPlist), - sources: [ - "Sources/LassoTestUtilities/**/*.swift" - ], - dependencies: [.target(name: "Lasso"), .xctest] -) - -let project = Project( - name: "LassoTuist", - organizationName: "WW Tech", - options: .options(), - packages: [ - ], - - settings: defaultSettings, - - targets: [ - lasso, lassoTestUtilities - ], - - schemes: [], - fileHeaderTemplate: nil, - additionalFiles: [], - resourceSynthesizers: [] -) diff --git a/Sources/LassoTestUtilities/NavigationTesting.swift b/Sources/LassoTestUtilities/NavigationTesting.swift index 1287e17..79d745f 100644 --- a/Sources/LassoTestUtilities/NavigationTesting.swift +++ b/Sources/LassoTestUtilities/NavigationTesting.swift @@ -140,7 +140,7 @@ public extension XCTestCase { throw NavigationPresentationError.unexpectedStackFollowingRootEvent(navigationController: nav) } return root - }, + }, when: event, timeout: timeout, onViewDidLoad: onViewDidLoad, diff --git a/Tuist/Config.swift b/Tuist/Config.swift deleted file mode 100644 index 80d8688..0000000 --- a/Tuist/Config.swift +++ /dev/null @@ -1,5 +0,0 @@ -import ProjectDescription - -let config = Config( - generationOptions: .options() -) diff --git a/Tuist/ProjectDescriptionHelpers/Project+Templates.swift b/Tuist/ProjectDescriptionHelpers/Project+Templates.swift deleted file mode 100644 index 28bbfc1..0000000 --- a/Tuist/ProjectDescriptionHelpers/Project+Templates.swift +++ /dev/null @@ -1,10 +0,0 @@ -import ProjectDescription - -/// Project helpers are functions that simplify the way you define your project. -/// Share code to create targets, settings, dependencies, -/// Create your own conventions, e.g: a func that makes sure all shared targets are "static frameworks" -/// See https://docs.tuist.io/guides/helpers/ - -extension Project { - -}