Move Model and Transformation Targets into Separate Package.

.github/workflows/cov.yml

@@ -41,7 +41,7 @@ jobs:
         uses: mattpolzin/swift-codecov-action@0.7.3
         id: cov
         with:
-          MINIMUM_COVERAGE: 98
+          MINIMUM_COVERAGE: 95
 
       - name: Post Positive Result
         if: ${{ success() }}

Package.swift

@@ -5,76 +5,57 @@ import PackageDescription
 
 /// Package definition.
 let package = Package(
-    name: "VHDLMachineTransformations",
+    name: "LLFSMGenerate",
     products: [
         // Products define the executables and libraries a package produces, making them visible to other
         // packages.
-        .library(
-            name: "VHDLMachineTransformations",
-            targets: ["VHDLMachineTransformations", "JavascriptModel"]
-        ),
         .executable(
             name: "llfsmgenerate",
-            targets: ["MachineGenerator", "VHDLMachineTransformations", "JavascriptModel"]
+            targets: ["MachineGenerator"]
         )
     ],
     dependencies: [
         .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.3.0"),
-        .package(url: "https://github.com/mipalgu/VHDLMachines", from: "3.1.0"),
+        .package(url: "https://github.com/mipalgu/VHDLMachines", from: "4.0.1"),
         .package(url: "https://github.com/mipalgu/VHDLParsing", from: "2.4.0"),
         .package(url: "https://github.com/apple/swift-argument-parser", from: "1.3.0"),
-        .package(url: "https://github.com/mipalgu/VHDLKripkeStructureGenerator.git", from: "0.2.1"),
-        .package(url: "https://github.com/CPSLabGU/SwiftUtils.git", from: "0.1.0")
+        .package(url: "https://github.com/mipalgu/VHDLKripkeStructureGenerator.git", from: "0.2.2"),
+        .package(url: "https://github.com/CPSLabGU/SwiftUtils.git", from: "0.1.0"),
+        .package(url: "https://github.com/CPSLabGU/VHDLJSModels", from: "1.0.0")
     ],
     targets: [
         // Targets are the basic building blocks of a package, defining a module or a test suite.
         // Targets can depend on other targets in this package and products from dependencies.
-        .target(
-            name: "JavascriptModel"
-        ),
         .executableTarget(
             name: "MachineGenerator",
             dependencies: [
-                .target(name: "JavascriptModel"),
-                .target(name: "VHDLMachineTransformations"),
                 .product(name: "ArgumentParser", package: "swift-argument-parser"),
                 .product(name: "VHDLMachines", package: "VHDLMachines"),
                 .product(name: "VHDLParsing", package: "VHDLParsing"),
                 .product(name: "VHDLKripkeStructureGenerator", package: "VHDLKripkeStructureGenerator"),
-                .product(name: "SwiftUtils", package: "SwiftUtils")
-            ]
-        ),
-        .target(
-            name: "VHDLMachineTransformations",
-            dependencies: [
-                .target(name: "JavascriptModel"),
-                .product(name: "VHDLMachines", package: "VHDLMachines"),
-                .product(name: "VHDLParsing", package: "VHDLParsing")
+                .product(name: "SwiftUtils", package: "SwiftUtils"),
+                .product(name: "VHDLJSModels", package: "VHDLJSModels")
             ]
         ),
-        .testTarget(name: "JavascriptModelTests", dependencies: ["JavascriptModel"]),
         .testTarget(
             name: "MachineGeneratorTests",
             dependencies: [
                 .target(name: "MachineGenerator"),
-                .target(name: "JavascriptModel"),
-                .target(name: "VHDLMachineTransformations"),
                 .product(name: "VHDLMachines", package: "VHDLMachines"),
                 .product(name: "VHDLParsing", package: "VHDLParsing"),
                 .product(name: "ArgumentParser", package: "swift-argument-parser"),
                 .product(name: "VHDLKripkeStructureGenerator", package: "VHDLKripkeStructureGenerator"),
                 .product(name: "SwiftUtils", package: "SwiftUtils"),
+                .product(name: "VHDLJSModels", package: "VHDLJSModels"),
                 "TestHelpers"
             ]
         ),
         .testTarget(
             name: "TestHelpers",
-            dependencies: ["VHDLMachineTransformations", "VHDLParsing", "VHDLMachines", "JavascriptModel"]
-        ),
-        .testTarget(
-            name: "VHDLMachineTransformationsTests",
             dependencies: [
-                "VHDLMachineTransformations", "VHDLParsing", "VHDLMachines", "JavascriptModel", "TestHelpers"
+                .product(name: "VHDLMachines", package: "VHDLMachines"),
+                .product(name: "VHDLParsing", package: "VHDLParsing"),
+                .product(name: "VHDLJSModels", package: "VHDLJSModels")
             ]
         )
     ]