Merge pull request #5 from justeattakeaway/yaml-support

Add Yaml support

.swiftpm/xcode/xcshareddata/xcschemes/GeneratePackage.xcscheme

@@ -67,15 +67,15 @@
             isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
-            argument = "--path Example/Packages/Example"
+            argument = "--spec Example/Packages/Example.yaml"
             isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
-            argument = "--dependencies-path Example/Config/RemoteDependencies.json"
+            argument = "--dependencies Example/Config/Dependencies.yaml"
             isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
-            argument = "--template-path Templates/Package.stencil"
+            argument = "--template Templates/Package.stencil"
             isEnabled = "YES">
          </CommandLineArgument>
       </CommandLineArguments>

Example/Config/RemoteDependencies.json → Example/Config/Dependencies.json

@@ -21,4 +21,4 @@
             "branch": "master"
         }
     ]
-}
+}

Example/Config/Dependencies.yaml

@@ -0,0 +1,13 @@
+dependencies:
+- name: RemoteDependencyA
+  url: https://github.com/DependencyA
+  version: 1.0.0
+- name: RemoteDependencyB
+  url: https://github.com/DependencyB
+  version: 2.0.0
+- name: RemoteDependencyC
+  url: https://github.com/DependencyC
+  revision: abcde1235kjh
+- name: RemoteDependencyD
+  url: https://github.com/DependencyC
+  branch: master

Example/Packages/Example/Example.json → Example/Packages/Example.json

@@ -69,4 +69,4 @@
       "path": "../LocalXCFramework.xcframework"
     }
   ]
-}
+}

Example/Packages/Example.yaml

@@ -0,0 +1,38 @@
+name: Example
+platforms:
+  - ".iOS(.v15)"
+  - ".macOS(.v13)"
+swiftToolsVersion: '5.10'
+swiftLanguageVersions:
+  - '5.10'
+  - '6.0'
+products:
+  - productType: library
+    name: Example
+    targets:
+      - Example
+localDependencies:
+  - name: MyLocalFramework
+    path: "../MyFrameworks"
+remoteDependencies:
+  - name: RemoteDependencyA
+  - name: RemoteDependencyB
+  - name: RemoteDependencyC
+targets:
+  - name: Example
+    targetType: target
+    dependencies:
+      - name: RemoteDependencyA
+    sourcesPath: Framework/Sources
+    resourcesPath: Resources
+  - name: UnitTests
+    targetType: testTarget
+    dependencies:
+      - name: Example
+        isTarget: true
+      - name: RemoteDependencyB
+    sourcesPath: Tests/Sources
+    resourcesPath: Resources
+localBinaryTargets:
+  - name: LocalXCFramework
+    path: "../LocalXCFramework.xcframework"

Package.resolved

@@ -71,6 +71,15 @@
         "revision" : "9f39744e025c7d377987f30b03770805dcb0bcd1",
         "version" : "1.1.4"
       }
+    },
+    {
+      "identity" : "yams",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/jpsim/Yams.git",
+      "state" : {
+        "revision" : "3036ba9d69cf1fd04d433527bc339dc0dc75433d",
+        "version" : "5.1.3"
+      }
     }
   ],
   "version" : 2

Package.swift

@@ -12,7 +12,8 @@ let package = Package(
     dependencies: [
         .package(url: "https://github.com/apple/swift-argument-parser", from: "1.1.2"),
         .package(url: "https://github.com/SwiftGen/StencilSwiftKit", from: "2.8.0"),
-        .package(url: "https://github.com/JohnSundell/ShellOut", from: "2.3.0")
+        .package(url: "https://github.com/JohnSundell/ShellOut", from: "2.3.0"),
+        .package(url: "https://github.com/jpsim/Yams.git", from: "5.0.6")
     ],
     targets: [
         .executableTarget(
@@ -21,14 +22,15 @@ let package = Package(
                 .product(name: "ArgumentParser", package: "swift-argument-parser"),
                 .product(name: "ShellOut", package: "ShellOut"),
                 .product(name: "StencilSwiftKit", package: "StencilSwiftKit"),
+                .product(name: "Yams", package: "Yams")
             ],
             path: "Sources"),
         .testTarget(
             name: "PackageGeneratorTests",
             dependencies: ["PackageGenerator"],
             path: "Tests",
             resources: [
-                .process("Resources")
+                .copy("Resources")
             ]
         )
     ]