Remove swift-bundler as package dependency.

* The preferred method is that users install the bundler locally using the instructions here: https://swiftbundler.dev/documentation/swiftbundler/installation#Manual-installation Signed-off-by: furby™ <[email protected]>
wabiverse · Aug 14, 2024 · a93afc6 · a93afc6
1 parent 487ffa4
commit a93afc6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 234 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -1,33 +1,6 @@
 {
-  "originHash" : "74c77a1e963dd1d75a86e538d2dba86cb6529d4e5e8158f691a4e582e83971e9",
+  "originHash" : "912604f76e421a385106670da68e757144a557379bcf9e006b45eb9bfe533a92",
   "pins" : [
-    {
-      "identity" : "aexml",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/tadija/AEXML.git",
-      "state" : {
-        "revision" : "38f7d00b23ecd891e1ee656fa6aeebd6ba04ecc3",
-        "version" : "4.6.1"
-      }
-    },
-    {
-      "identity" : "graphviz",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/SwiftDocOrg/GraphViz.git",
-      "state" : {
-        "revision" : "70bebcf4597b9ce33e19816d6bbd4ba9b7bdf038",
-        "version" : "0.2.0"
-      }
-    },
-    {
-      "identity" : "jsonutilities",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/yonaskolb/JSONUtilities.git",
-      "state" : {
-        "revision" : "128d2ffc22467f69569ef8ff971683e2393191a0",
-        "version" : "4.2.0"
-      }
-    },
     {
       "identity" : "metaversepythonframework",
       "kind" : "remoteSourceControl",
@@ -46,15 +19,6 @@
         "version" : "1.26.2"
       }
     },
-    {
-      "identity" : "pathkit",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/kylef/PathKit.git",
-      "state" : {
-        "revision" : "3bfd2737b700b9a36565a8c94f4ad2b050a5e574",
-        "version" : "1.0.1"
-      }
-    },
     {
       "identity" : "pythonkit",
       "kind" : "remoteSourceControl",
@@ -63,186 +27,6 @@
         "revision" : "43647b36cacb99558e57ef98e97ef598f91d1164",
         "version" : "0.5.0"
       }
-    },
-    {
-      "identity" : "rainbow",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/onevcat/Rainbow",
-      "state" : {
-        "revision" : "626c3d4b6b55354b4af3aa309f998fae9b31a3d9",
-        "version" : "3.2.0"
-      }
-    },
-    {
-      "identity" : "spectre",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/kylef/Spectre.git",
-      "state" : {
-        "revision" : "26cc5e9ae0947092c7139ef7ba612e34646086c7",
-        "version" : "0.10.1"
-      }
-    },
-    {
-      "identity" : "swift-arg-parser",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/wabiverse/swift-arg-parser",
-      "state" : {
-        "revision" : "41fc1c8f8482e321d46164df28c6ef672a42bc85",
-        "version" : "1.2.4"
-      }
-    },
-    {
-      "identity" : "swift-argument-parser",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-argument-parser.git",
-      "state" : {
-        "revision" : "41982a3656a71c768319979febd796c6fd111d5c",
-        "version" : "1.5.0"
-      }
-    },
-    {
-      "identity" : "swift-bundler",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/furby-tm/swift-bundler",
-      "state" : {
-        "revision" : "42d095fd8501e4df5b8a6439771f9912f31b8741",
-        "version" : "2.0.9"
-      }
-    },
-    {
-      "identity" : "swift-case-paths",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/pointfreeco/swift-case-paths",
-      "state" : {
-        "revision" : "76d7791b5bda47df7e3d4690c4c3aaf089730707",
-        "version" : "1.2.1"
-      }
-    },
-    {
-      "identity" : "swift-cmark",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-cmark.git",
-      "state" : {
-        "revision" : "f218e5d7691f78b55bfa39b367763f4612486c35",
-        "version" : "0.3.0"
-      }
-    },
-    {
-      "identity" : "swift-format",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-format",
-      "state" : {
-        "revision" : "83248b4fa37919f78ffbd4650946759bcc54c2b5",
-        "version" : "509.0.0"
-      }
-    },
-    {
-      "identity" : "swift-log",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-log",
-      "state" : {
-        "revision" : "532d8b529501fb73a2455b179e0bbb6d49b652ed",
-        "version" : "1.5.3"
-      }
-    },
-    {
-      "identity" : "swift-markdown",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-markdown.git",
-      "state" : {
-        "revision" : "e4f95e2dc23097a1a9a1dfdfe3fe3ee44de77378",
-        "version" : "0.3.0"
-      }
-    },
-    {
-      "identity" : "swift-overture",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/pointfreeco/swift-overture",
-      "state" : {
-        "revision" : "7977acd7597f413717058acc1e080731249a1d7e",
-        "version" : "0.5.0"
-      }
-    },
-    {
-      "identity" : "swift-parsing",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/pointfreeco/swift-parsing",
-      "state" : {
-        "revision" : "a0e7d73f462c1c38c59dc40a3969ac40cea42950",
-        "version" : "0.13.0"
-      }
-    },
-    {
-      "identity" : "swift-syntax",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-syntax",
-      "state" : {
-        "revision" : "43c802fb7f96e090dde015344a94b5e85779eff1",
-        "version" : "509.1.0"
-      }
-    },
-    {
-      "identity" : "swiftcli",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/jakeheis/SwiftCLI.git",
-      "state" : {
-        "revision" : "2e949055d9797c1a6bddcda0e58dada16cc8e970",
-        "version" : "6.0.3"
-      }
-    },
-    {
-      "identity" : "swiftxcodeproj",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/stackotter/SwiftXcodeProj.git",
-      "state" : {
-        "revision" : "46e9b907e3ec66010cf2204594549ff1dc195032",
-        "version" : "8.10.1"
-      }
-    },
-    {
-      "identity" : "tomlkit",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/furby-tm/TOMLKit",
-      "state" : {
-        "revision" : "f2b3e80a19c7fb3d42e3cfda98076cef8f0d1bd7",
-        "version" : "0.5.6"
-      }
-    },
-    {
-      "identity" : "version",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/mxcl/Version.git",
-      "state" : {
-        "revision" : "1fe824b80d89201652e7eca7c9252269a1d85e25",
-        "version" : "2.0.1"
-      }
-    },
-    {
-      "identity" : "xcodegen",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/stackotter/XcodeGen",
-      "state" : {
-        "revision" : "adbf99beb7afb4844774d14e9275da9a503a427c",
-        "version" : "2.35.1"
-      }
-    },
-    {
-      "identity" : "xctest-dynamic-overlay",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
-      "state" : {
-        "revision" : "23cbf2294e350076ea4dbd7d5d047c1e76b03631",
-        "version" : "1.0.2"
-      }
-    },
-    {
-      "identity" : "yams",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/jpsim/Yams.git",
-      "state" : {
-        "revision" : "0d9ee7ea8c4ebd4a489ad7a73d5c6cad55d6fed3",
-        "version" : "5.0.6"
-      }
     }
   ],
   "version" : 3

diff --git a/Package.swift b/Package.swift
@@ -15,9 +15,7 @@ let package = Package(
     .watchOS(.v10),
   ],
   products: getConfig(for: .all).products,
-  dependencies: [
-    .package(url: "https://github.com/furby-tm/swift-bundler", from: "2.0.8"),
-  ] + Arch.OS.packageDeps(),
+  dependencies: Arch.OS.packageDeps(),
   targets: [
     .target(
       name: "Eigen",
@@ -721,19 +719,10 @@ let package = Package(
       ]
     ),
 
-    /*
-      * Run this from the command line via:
-      *
-      * swift package --disable-sandbox plugin bundler run -p macOS MetaversalDemo
-      *
-      * It is pending a pull request which I have submitted here:
-      * https://github.com/stackotter/swift-bundler/issues/34
-      *
-      * Once that is merged, the swift bundler will be included
-      * as a swift plugin to all packages that transitively depend
-      * on this package, the bundler now also supports the bundling
-      * of visionOS and iOS targets, in addition to macOS all from
-      * the command line. */
+    /**
+     * Run this from the command line via:
+     *
+     * swift bundler run -p macOS MetaversalDemo */
     .executableTarget(
       name: "MetaversalDemo",
       dependencies: [

diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ cross-platform applications and games for **ObjCRT**, **GLibRT**, **FreeRT**, **
 
 | Swift Plugins                                                | Description                                                                                                                                                                                         | Usage                                          |
 | ------------------------------------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------- |
-| [SwiftBundler](https://github.com/stackotter/swift-bundler)  | Create cross-platform Swift apps, (Xcode optional!). Turn Swift Packages into fully bundled Swift apps from the comfort of the command line - including **macOS**, **iOS**, and even **visionOS**. | `swift package plugin bundler run -p visionOS` |
+| [SwiftBundler](https://github.com/stackotter/swift-bundler)  | Create cross-platform Swift apps, (Xcode optional!). Turn Swift Packages into fully bundled Swift apps from the comfort of the command line - including **macOS**, **iOS**, and even **visionOS**. | `swift bundler run -p visionOS` |
 
 
 ### Industry Swift Targets