Tuist 4 (tuist#5567)

* Remove tuist-env * Fix the release pipeline * Remove deprecated methods (tuist#5560) * [tuist-4] Remove `tuistenv` (tuist#5556) * Remove tuist-env * Fix the release pipeline * chore: remove deprecated methods * chore: remove disableAnalytics * fix: fix fixture definition --------- Co-authored-by: Pedro Piñera Buendía <[email protected]> * Fix the bundle script * Change the coloring behaviour (tuist#5668) * Not auto-generate a scheme per platform (tuist#5679) * Eliminate signing capabilities (tuist#5716) * Eliminate signing capabilities * Update the root Package.resolved * Removed TargetDependency's .packagePlugin API in favor of using PackageType (tuist#5719) * feat(TargetDependency): remove packagePlugin api * feat(TargetDependency+ManifestMapper): remove packagePlugin api handle * test(TargetDependency+ManifestMapperTests): add tests for package types: runtime, macro and plugin * style(TargetDependency+ManifestMapperTests): add lint changes * chore: remove carthage support (tuist#5740) * Resolve Tuist-4 Compiler Errors (tuist#5818) * Remove Dependencies.swift (tuist#5812) * Squashed commit of the following: commit f74176d Author: fortmarek <[email protected]> Date: Tue Jan 16 09:21:28 2024 +0100 Remove cache warm for Silicon commit b954bdb Author: fortmarek <[email protected]> Date: Tue Jan 16 09:20:46 2024 +0100 Minor updates commit 4693f71 Author: fortmarek <[email protected]> Date: Mon Jan 15 23:52:01 2024 +0100 Run lint:fix commit 984a73f Author: fortmarek <[email protected]> Date: Mon Jan 15 23:51:44 2024 +0100 Update external dependencies tutorial commit 909fc24 Author: fortmarek <[email protected]> Date: Mon Jan 15 23:45:31 2024 +0100 Add PackageSettings in Package.swift commit c70affb Merge: a932745 7f34cba Author: fortmarek <[email protected]> Date: Mon Jan 15 09:35:51 2024 +0100 Merge remote-tracking branch 'origin/main' into tests/dependencies-acceptance commit a932745 Merge: ef80095 675239c Author: Daniele Formichelli <[email protected]> Date: Tue Jan 2 13:55:15 2024 +0100 Merge branch 'main' into tests/dependencies-acceptance commit ef80095 Merge: 54f9875 e14da60 Author: Daniele Formichelli <[email protected]> Date: Sun Dec 31 16:55:49 2023 +0100 Merge branch 'main' into tests/dependencies-acceptance commit 54f9875 Author: Daniele Formichelli <[email protected]> Date: Sun Dec 31 16:55:43 2023 +0100 fix: feature one target sources commit 9671063 Author: Daniele Formichelli <[email protected]> Date: Sat Dec 30 16:52:44 2023 +0100 chore: format commit 7df88d4 Author: Daniele Formichelli <[email protected]> Date: Sat Dec 30 16:46:10 2023 +0100 chore: simplify spm fixture commit 9a05c9e Author: Daniele Formichelli <[email protected]> Date: Sat Dec 30 15:47:38 2023 +0100 chore: lint commit 96c989f Author: Daniele Formichelli <[email protected]> Date: Fri Dec 29 21:34:45 2023 +0100 test: re-enable dependencies acceptance tests * Remove Dependencies.swift support * Remove intermediary graph.json * Fix issues after merging tuist-4 * Remove Dependencies.swift from fixtures * Move Package loading to TuistLoader * Remove TuistDependenciesTesting from FetchServiceTests * Add dump command for package * Add back PackageSettings in app_with_spm_dependencies * Fix missing tests due to missing Package.swift error * Remove platforms from string assertion due to Set non-determinism * Add package settings to multiplatform_app_with_sdk fixture * Remove ProjectDescriptionHelpers import in Package.swift for multiplatform_app_with_sdk * Update platforms for multiplatform_app_with_sdk fixture * Remove deprecated APIs * Fix Test Compilation * Update test fixture tempalte to multiplatform API * Migrate fixtures to `destinations` api * Migrate fixtures to `deploymentTargets` apis * Update manifest helper methods * Update fixture generator to use `destinations` * Update to use a tuist 4 version of this template repo * Fixing a couple fixtures * Fix Tuist helper method to use correct signature * Update doc comments * More missed callsites * Remove Cache from ProjectDescription (tuist#5833) * Fix missing macro case in switch * Remove binary cache-related models from TuistCore * chore: fix warnings * Change ProjectDescription model constructors to static functions (tuist#5843) * Remove public inits in favor of static constructors * Fix tests * Lint * Fix remaining tests * Skip loading default helpers if equal to srcroot * Fix lint issue * Fix infinite loop in app_with_spm_dependencies fixture * Lint * Remove unnecessary force try * Fix generate acceptance tests * Fix test acceptance tests * Rename cache directory name (tuist#5842) * Rename cache directory name * Rename cache categories * Fix compilation issues * Fix CleanServiceTests --------- Co-authored-by: Daniele Formichelli <[email protected]> * Bump Minimum Swift to 5.9 * Autoformat code style - Update .swiftformat - Ignore unwanted rules * Fix failing tests * Simplify tuist init (tuist#5853) * Simplify tuist init * Address PR feedback * Add Package.swift, update init message * Update tabs * Remove Package.swift --------- Co-authored-by: Daniele Formichelli <[email protected]> Co-authored-by: Dimash <[email protected]> Co-authored-by: fortmarek <[email protected]> Co-authored-by: Charles Pisciotta <[email protected]> Co-authored-by: Mike Simons <[email protected]> Co-authored-by: Mike Simons <[email protected]>
hiltonc · Jan 31, 2024 · a61e6e5 · a61e6e5
1 parent 3771c26
commit a61e6e5
Show file tree

Hide file tree

Showing 554 changed files with 1,919 additions and 14,238 deletions.
diff --git a/.github/workflows/tuist.yml b/.github/workflows/tuist.yml
@@ -79,12 +79,6 @@ jobs:
         run: tuist cache print-hashes --xcframeworks
       - name: Cache warm
         run: tuist cache warm --xcframeworks
-      - uses: actions/upload-artifact@v4
-        if: ${{ always() }}
-        with:
-          name: cache-warm-x86_64.xcodebuild.log
-          path: |
-            /tmp/tuist/**
 
   acceptance_tests:
     name: Run ${{ matrix.feature }}

diff --git a/.swiftformat b/.swiftformat
@@ -3,9 +3,11 @@
 --symlinks ignore
 --exclude Tests/XCTestManifests.swift,Sources/TuistSupport/Vendored,fixtures/Targets/SlothCreator,Sources/TuistAutomation/XcodeBuild/XcodeBuildController.swift
 --exclude fixtures/tuist_plugin
+--disable conditionalAssignment
 --disable hoistAwait
 --disable hoistTry
---swiftversion 5.7
+--disable redundantReturn
+--swiftversion 5.9
 --minversion 0.53.0
 
 # format options

diff --git a/.vscode/launch.json b/.vscode/launch.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -23,9 +23,10 @@
   },
   "editor.defaultFormatter": "esbenp.prettier-vscode",
   "files.exclude": {
+    "**/.build/": true,
+    "**/.DS_Store": true,
     "**/.git": true,
-    "**/node_modules": true,
-    "**/.DS_Store": true
+    "**/node_modules": true
   },
   "spellright.language": [
     "en"

diff --git a/.xcode-version b/.xcode-version
@@ -1 +1 @@
-15.1
+15.2
diff --git a/.xcode-version-libraries b/.xcode-version-libraries
@@ -1 +1 @@
-14.1
+15.2
diff --git a/Package.resolved b/Package.resolved
@@ -37,12 +37,12 @@
       }
     },
     {
-      "identity" : "cryptoswift",
+      "identity" : "difference",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/krzyzanowskim/CryptoSwift.git",
+      "location" : "https://github.com/krzysztofzablocki/Difference.git",
       "state" : {
-        "revision" : "db51c407d3be4a051484a141bf0bff36c43d3b1e",
-        "version" : "1.8.0"
+        "revision" : "f627d00718033c3d7888acd5f4e3524a843db1cf",
+        "version" : "1.0.2"
       }
     },
     {

diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.7
+// swift-tools-version:5.9
 
 import PackageDescription
 
@@ -75,7 +75,6 @@ var targets: [Target] = [
             "ProjectAutomation",
             "TuistLoader",
             "TuistScaffold",
-            "TuistSigning",
             "TuistDependencies",
             "GraphViz",
             "TuistMigration",
@@ -93,20 +92,6 @@ var targets: [Target] = [
             "ProjectAutomation",
         ]
     ),
-    .target(
-        name: "TuistEnvKit",
-        dependencies: [
-            argumentParserDependency,
-            swiftToolsSupportDependency,
-            "TuistSupport",
-        ]
-    ),
-    .executableTarget(
-        name: "tuistenv",
-        dependencies: [
-            "TuistEnvKit",
-        ]
-    ),
     .target(
         name: "ProjectDescription",
         dependencies: []
@@ -132,6 +117,7 @@ var targets: [Target] = [
             "TuistSupport",
             "TuistGraph",
             swiftToolsSupportDependency,
+            "Difference",
         ],
         linkerSettings: [.linkedFramework("XCTest")]
     ),
@@ -190,16 +176,6 @@ var targets: [Target] = [
             "TuistSupport",
         ]
     ),
-    .target(
-        name: "TuistSigning",
-        dependencies: [
-            "TuistCore",
-            "TuistGraph",
-            "TuistSupport",
-            "CryptoSwift",
-            swiftToolsSupportDependency,
-        ]
-    ),
     .target(
         name: "TuistDependencies",
         dependencies: [
@@ -285,7 +261,6 @@ let package = Package(
         .executable(name: "tuistbenchmark", targets: ["tuistbenchmark"]),
         .executable(name: "tuistfixturegenerator", targets: ["tuistfixturegenerator"]),
         .executable(name: "tuist", targets: ["tuist"]),
-        .executable(name: "tuistenv", targets: ["tuistenv"]),
         .library(
             name: "ProjectDescription",
             type: .dynamic,
@@ -340,10 +315,6 @@ let package = Package(
             name: "TuistAutomation",
             targets: ["TuistAutomation"]
         ),
-        .library(
-            name: "TuistSigning",
-            targets: ["TuistSigning"]
-        ),
         .library(
             name: "TuistDependencies",
             targets: ["TuistDependencies"]
@@ -378,13 +349,13 @@ let package = Package(
         .package(url: "https://github.com/weichsel/ZIPFoundation", from: "0.9.17"),
         .package(url: "https://github.com/httpswift/swifter.git", revision: "1e4f51c92d7ca486242d8bf0722b99de2c3531aa"),
         .package(url: "https://github.com/kishikawakatsumi/KeychainAccess", from: "4.2.2"),
-        .package(url: "https://github.com/krzyzanowskim/CryptoSwift", from: "1.8.0"),
         .package(url: "https://github.com/stencilproject/Stencil", exact: "0.15.1"),
         .package(url: "https://github.com/SwiftDocOrg/GraphViz", exact: "0.2.0"),
         .package(url: "https://github.com/SwiftGen/StencilSwiftKit", exact: "2.10.1"),
         .package(url: "https://github.com/SwiftGen/SwiftGen", exact: "6.6.2"),
         .package(url: "https://github.com/tuist/XcodeProj", exact: "8.15.0"),
         .package(url: "https://github.com/cpisciotta/xcbeautify", from: "1.4.0"),
+        .package(url: "https://github.com/krzysztofzablocki/Difference.git", from: "1.0.2"),
     ],
     targets: targets
 )
diff --git a/Project.swift b/Project.swift
@@ -15,13 +15,6 @@ func releaseSettings() -> SettingsDictionary {
 
 func targets() -> [Target] {
     let executableTargets = [
-        Target.target(
-            name: "tuistenv",
-            product: .commandLineTool,
-            dependencies: [
-                .target(name: "TuistEnvKit"),
-            ]
-        ),
         Target.target(
             name: "tuist",
             product: .commandLineTool,
@@ -93,6 +86,7 @@ func targets() -> [Target] {
                 .external(name: "Logging"),
                 .external(name: "ZIPFoundation"),
                 .external(name: "Swifter"),
+                .external(name: "Difference"),
             ],
             testingDependencies: [
                 .target(name: "TuistCore"),
@@ -111,7 +105,6 @@ func targets() -> [Target] {
                 .target(name: "ProjectAutomation"),
                 .target(name: "TuistLoader"),
                 .target(name: "TuistScaffold"),
-                .target(name: "TuistSigning"),
                 .target(name: "TuistDependencies"),
                 .target(name: "TuistMigration"),
                 .target(name: "TuistAsyncQueue"),
@@ -134,8 +127,6 @@ func targets() -> [Target] {
                 .target(name: "TuistGeneratorTesting"),
                 .target(name: "TuistScaffoldTesting"),
                 .target(name: "TuistAutomationTesting"),
-                .target(name: "TuistSigningTesting"),
-                .target(name: "TuistDependenciesTesting"),
                 .target(name: "TuistMigrationTesting"),
                 .target(name: "TuistAsyncQueueTesting"),
                 .target(name: "TuistGraphTesting"),
@@ -155,19 +146,6 @@ func targets() -> [Target] {
                 .external(name: "XcodeProj"),
             ]
         ),
-        Target.module(
-            name: "TuistEnvKit",
-            hasTesting: false,
-            dependencies: [
-                .target(name: "TuistSupport"),
-                .external(name: "ArgumentParser"),
-                .external(name: "SwiftToolsSupport"),
-                .external(name: "SystemPackage"),
-            ],
-            testDependencies: [
-                .target(name: "TuistSupportTesting"),
-            ]
-        ),
         Target.module(
             name: "TuistGraph",
             dependencies: [
@@ -248,7 +226,6 @@ func targets() -> [Target] {
                 .target(name: "TuistCoreTesting"),
                 .target(name: "TuistSupportTesting"),
                 .target(name: "TuistGraphTesting"),
-                .target(name: "TuistSigningTesting"),
                 .external(name: "XcodeProj"),
             ]
         ),
@@ -370,26 +347,6 @@ func targets() -> [Target] {
             hasTesting: false,
             dependencies: []
         ),
-        Target.module(
-            name: "TuistSigning",
-            hasIntegrationTests: false,
-            dependencies: [
-                .target(name: "TuistCore"),
-                .target(name: "TuistGraph"),
-                .target(name: "TuistSupport"),
-                .external(name: "CryptoSwift"),
-                .external(name: "SwiftToolsSupport"),
-                .external(name: "SystemPackage"),
-            ],
-            testDependencies: [
-                .target(name: "TuistSupportTesting"),
-                .target(name: "TuistCoreTesting"),
-                .target(name: "TuistGraphTesting"),
-            ],
-            testingDependencies: [
-                .target(name: "TuistGraphTesting"),
-            ]
-        ),
         Target.module(
             name: "TuistAnalytics",
             hasTests: false,
@@ -438,6 +395,7 @@ func targets() -> [Target] {
         ),
         Target.module(
             name: "TuistDependencies",
+            hasTesting: false,
             dependencies: [
                 .target(name: "ProjectDescription"),
                 .target(name: "TuistCore"),

diff --git a/Sources/ProjectAutomation/Project.swift b/Sources/ProjectAutomation/Project.swift
@@ -8,7 +8,7 @@ public struct Project: Codable, Equatable {
     /// The absolute path of the project.
     public let path: String
 
-    /// Indicates whether the project is imported through `Dependencies.swift`.
+    /// Indicates whether the project is imported through `Package.swift`.
     public let isExternal: Bool
 
     /// The Swift packages that this project depends on.