Skip to content

Commit 2612857

Browse files
committed
Merge Prometheus and PrometheusMetrics so we're only using one library instead of two
1 parent 0d04bb8 commit 2612857

File tree

4 files changed

+6
-10
lines changed

4 files changed

+6
-10
lines changed

Package.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ let package = Package(
88
.library(
99
name: "SwiftPrometheus",
1010
targets: ["Prometheus"]),
11+
.executable(
12+
name: "PrometheusExample",
13+
targets: ["PrometheusExample"]),
1114
],
1215
dependencies: [
1316
.package(url: "https://github.com/apple/swift-metrics.git", from: "1.0.0"),
@@ -16,15 +19,12 @@ let package = Package(
1619
targets: [
1720
.target(
1821
name: "Prometheus",
19-
dependencies: ["NIOConcurrencyHelpers"]),
20-
.target(
21-
name: "PrometheusMetrics",
22-
dependencies: ["Prometheus", "CoreMetrics"]),
22+
dependencies: ["CoreMetrics", "NIOConcurrencyHelpers"]),
2323
.target(
2424
name: "PrometheusExample",
25-
dependencies: ["PrometheusMetrics", "Metrics"]),
25+
dependencies: ["Prometheus", "Metrics"]),
2626
.testTarget(
2727
name: "SwiftPrometheusTests",
28-
dependencies: ["Prometheus", "PrometheusMetrics"]),
28+
dependencies: ["Prometheus"]),
2929
]
3030
)

Sources/PrometheusMetrics/PrometheusMetrics.swift renamed to Sources/Prometheus/PrometheusMetrics.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import Prometheus
21
import CoreMetrics
32

43
private class MetricsCounter: CounterHandler {

Sources/PrometheusExample/main.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import Prometheus
22
import Metrics
3-
import PrometheusMetrics
4-
import Foundation
53

64
let myProm = PrometheusClient()
75

Tests/SwiftPrometheusTests/PrometheusMetricsTests.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import XCTest
22
@testable import Prometheus
33
@testable import CoreMetrics
4-
@testable import PrometheusMetrics
54

65
final class PrometheusMetricsTests: XCTestCase {
76

0 commit comments

Comments
 (0)