Patch

Author: muukii

Package.resolved

@@ -1,6 +1,15 @@
 {
-  "originHash" : "f688316170c1771e6db10ff04cd9ed454130cdedcd7f04ed4c16bf050623d1ee",
+  "originHash" : "fd63ba598fb7bdb17467c0e757a41f2afdb4c10f98a605d67f8f8168321d4443",
   "pins" : [
+    {
+      "identity" : "normalization",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/VergeGroup/Normalization",
+      "state" : {
+        "revision" : "2cb57bc6ffce81e3ffa2b0781c82f13f00bf1e98",
+        "version" : "1.0.0"
+      }
+    },
     {
       "identity" : "rxswift",
       "kind" : "remoteSourceControl",

Package.swift

@@ -13,7 +13,6 @@ let package = Package(
   products: [
     .library(name: "Verge", targets: ["Verge"]),
     .library(name: "VergeTiny", targets: ["VergeTiny"]),
-    .library(name: "VergeNormalization", targets: ["VergeNormalization"]),
     .library(name: "VergeNormalizationDerived", targets: ["VergeNormalizationDerived"]),
     .library(name: "VergeRx", targets: ["VergeRx"]),
     .library(name: "VergeClassic", targets: ["VergeClassic"]),
@@ -26,6 +25,7 @@ let package = Package(
     .package(url: "https://github.com/VergeGroup/swift-concurrency-task-manager", from: "1.1.0"),
     .package(url: "https://github.com/VergeGroup/TypedIdentifier", from: "2.0.2"),
     .package(url: "https://github.com/VergeGroup/TypedComparator", from: "1.0.0"),
+    .package(url: "https://github.com/VergeGroup/Normalization", from: "1.0.0"),
 
     /// for testing
     .package(url: "https://github.com/nalexn/ViewInspector.git", from: "0.10.0"),
@@ -63,20 +63,11 @@ let package = Package(
         "VergeRx"
       ]
     ),
-    .target(
-      name: "VergeNormalization",
-      dependencies: [
-        "VergeMacros",
-        .product(name: "TypedComparator", package: "TypedComparator"),
-        .product(name: "TypedIdentifier", package: "TypedIdentifier"),
-        .product(name: "HashTreeCollections", package: "swift-collections"),
-      ]
-    ),
     .target(
       name: "VergeNormalizationDerived",
       dependencies: [
         "Verge",
-        "VergeNormalization",
+        .product(name: "Normalization", package: "Normalization"),
         .product(name: "HashTreeCollections", package: "swift-collections"),
       ]
     ),
@@ -92,10 +83,6 @@ let package = Package(
       name: "VergeClassicTests",
       dependencies: ["VergeClassic"]
     ),
-    .testTarget(
-      name: "VergeNormalizationTests",
-      dependencies: ["VergeNormalization"]
-    ),
     .testTarget(
       name: "VergeNormalizationDerivedTests",
       dependencies: ["VergeNormalizationDerived"]