Fix package manifests

ordo-one · Jun 1, 2023 · cb4a765 · cb4a765
1 parent 36940bc
commit cb4a765
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 41 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -1,5 +1,14 @@
 {
   "pins" : [
+    {
+      "identity" : "package-benchmark",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/ordo-one/package-benchmark",
+      "state" : {
+        "revision" : "874ee0c184a4e89be111349b8dab2e61b6773937",
+        "version" : "1.6.1"
+      }
+    },
     {
       "identity" : "package-datetime",
       "kind" : "remoteSourceControl",
@@ -50,8 +59,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-atomics",
       "state" : {
-        "revision" : "ff3d2212b6b093db7f177d0855adbc4ef9c5f036",
-        "version" : "1.0.3"
+        "revision" : "6c89474e62719ddcc1e9614989fff2f68208fe10",
+        "version" : "1.1.0"
       }
     },
     {

diff --git a/Package.swift b/Package.swift
@@ -15,8 +15,8 @@ let package = Package(
 
     dependencies: [
 //        .package(url: "https://github.com/ordo-one/package-benchmark", branch: "main"),
-        .package(path: "../package-benchmark"),
-//        .package(url: "https://github.com/ordo-one/package-benchmark", .upToNextMajor(from: "1.0.0")),
+//        .package(path: "../package-benchmark"),
+        .package(url: "https://github.com/ordo-one/package-benchmark", .upToNextMajor(from: "1.0.0")),
         .package(url: "https://github.com/swift-extras/swift-extras-json.git", .upToNextMajor(from: "0.6.0")),
     ],
 
@@ -33,60 +33,72 @@ let package = Package(
             name: "Minimal",
             dependencies: [
                 .product(name: "Benchmark", package: "package-benchmark"),
-                .product(name: "BenchmarkPlugin", package: "package-benchmark"),
             ],
-            path: "Benchmarks/Minimal"
+            path: "Benchmarks/Minimal",
+            plugins: [
+                .plugin(name: "BenchmarkPlugin", package: "package-benchmark"),
+            ]
         ),
 
         // Sample showing wide range of API usage
         .executableTarget(
             name: "Samples",
             dependencies: [
                 .product(name: "Benchmark", package: "package-benchmark"),
-                .product(name: "BenchmarkPlugin", package: "package-benchmark"),
                 "PackageBenchmarkSamples",
             ],
-            path: "Benchmarks/Samples"
+            path: "Benchmarks/Samples",
+            plugins: [
+                .plugin(name: "BenchmarkPlugin", package: "package-benchmark"),
+            ]
         ),
 
         // Some miscellaneous tests for edge conditions
         .executableTarget(
             name: "Miscellaneous",
             dependencies: [
                 .product(name: "Benchmark", package: "package-benchmark"),
-                .product(name: "BenchmarkPlugin", package: "package-benchmark"),
             ],
-            path: "Benchmarks/Miscellaneous"
+            path: "Benchmarks/Miscellaneous",
+            plugins: [
+                .plugin(name: "BenchmarkPlugin", package: "package-benchmark"),
+            ]
         ),
 
         // One test for problems with memory measurements
         .executableTarget(
             name: "MemoryOne",
             dependencies: [
                 .product(name: "Benchmark", package: "package-benchmark"),
-                .product(name: "BenchmarkPlugin", package: "package-benchmark"),
             ],
-            path: "Benchmarks/MemoryOne"
+            path: "Benchmarks/MemoryOne",
+            plugins: [
+                .plugin(name: "BenchmarkPlugin", package: "package-benchmark"),
+            ]
         ),
 
         // Another test for problems with memory measurements
         .executableTarget(
             name: "MemoryTwo",
             dependencies: [
                 .product(name: "Benchmark", package: "package-benchmark"),
-                .product(name: "BenchmarkPlugin", package: "package-benchmark"),
             ],
-            path: "Benchmarks/MemoryTwo"
+            path: "Benchmarks/MemoryTwo",
+            plugins: [
+                .plugin(name: "BenchmarkPlugin", package: "package-benchmark"),
+            ]
         ),
 
         // Some test benchmarks on Foundation
         .executableTarget(
             name: "Foundation-Benchmark",
             dependencies: [
                 .product(name: "Benchmark", package: "package-benchmark"),
-                .product(name: "BenchmarkPlugin", package: "package-benchmark"),
             ],
-            path: "Benchmarks/Foundation"
+            path: "Benchmarks/Foundation",
+            plugins: [
+                .plugin(name: "BenchmarkPlugin", package: "package-benchmark"),
+            ]
         ),
 
         // Benchmarks on external libraries
@@ -95,37 +107,15 @@ let package = Package(
             dependencies: [
                 .product(name: "ExtrasJSON", package: "swift-extras-json"),
                 .product(name: "Benchmark", package: "package-benchmark"),
-                .product(name: "BenchmarkPlugin", package: "package-benchmark"),
             ],
             path: "Benchmarks/External",
             resources: [
                 .process("Resources/example.geojson"),
-
+            ],
+            plugins: [
+                .plugin(name: "BenchmarkPlugin", package: "package-benchmark"),
             ]
         )
     ]
 )
 
-// Benchmark of TestBenchmarkInit
-package.targets += [
-    .executableTarget(
-        name: "TestBenchmarkInit",
-        dependencies: [
-            .product(name: "Benchmark", package: "package-benchmark"),
-            .product(name: "BenchmarkPlugin", package: "package-benchmark")
-        ],
-        path: "Benchmarks/TestBenchmarkInit"
-    ),
-]
-
-// Benchmark of TestBenchmarkInitNew
-package.targets += [
-    .executableTarget(
-        name: "TestBenchmarkInitNew",
-        dependencies: [
-            .product(name: "Benchmark", package: "package-benchmark"),
-            .product(name: "BenchmarkPlugin", package: "package-benchmark")
-        ],
-        path: "Benchmarks/TestBenchmarkInitNew"
-    ),
-]