Skip to content

Commit 323a344

Browse files
committed
remove jazzy
1 parent 40100b8 commit 323a344

File tree

5 files changed

+40
-18
lines changed

5 files changed

+40
-18
lines changed

[email protected]

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,22 @@ let package = Package(
2727
targets: [
2828
.target(
2929
name: "SystemMetrics",
30-
dependencies: ["CoreMetrics"]
30+
dependencies: [
31+
.product(name: "CoreMetrics", package: "swift-metrics"),
32+
]
3133
),
3234
.target(
3335
name: "MetricsTestUtils",
34-
dependencies: ["Metrics", "CoreMetrics"]
36+
dependencies: [
37+
.product(name: "Metrics", package: "swift-metrics"),
38+
.product(name: "CoreMetrics", package: "swift-metrics"),
39+
]
3540
),
3641
.testTarget(
3742
name: "SystemMetricsTests",
38-
dependencies: ["SystemMetrics"]
43+
dependencies: [
44+
"SystemMetrics"
45+
]
3946
),
4047
]
4148
)

[email protected]

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,22 @@ let package = Package(
2727
targets: [
2828
.target(
2929
name: "SystemMetrics",
30-
dependencies: ["CoreMetrics"]
30+
dependencies: [
31+
.product(name: "CoreMetrics", package: "swift-metrics"),
32+
]
3133
),
3234
.target(
3335
name: "MetricsTestUtils",
34-
dependencies: ["Metrics", "CoreMetrics"]
36+
dependencies: [
37+
.product(name: "Metrics", package: "swift-metrics"),
38+
.product(name: "CoreMetrics", package: "swift-metrics"),
39+
]
3540
),
3641
.testTarget(
3742
name: "SystemMetricsTests",
38-
dependencies: ["SystemMetrics"]
43+
dependencies: [
44+
"SystemMetrics"
45+
]
3946
),
4047
]
4148
)

[email protected]

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,22 @@ let package = Package(
2727
targets: [
2828
.target(
2929
name: "SystemMetrics",
30-
dependencies: ["CoreMetrics"]
30+
dependencies: [
31+
.product(name: "CoreMetrics", package: "swift-metrics"),
32+
]
3133
),
3234
.target(
3335
name: "MetricsTestUtils",
34-
dependencies: ["Metrics", "CoreMetrics"]
36+
dependencies: [
37+
.product(name: "Metrics", package: "swift-metrics"),
38+
.product(name: "CoreMetrics", package: "swift-metrics"),
39+
]
3540
),
3641
.testTarget(
3742
name: "SystemMetricsTests",
38-
dependencies: ["SystemMetrics"]
43+
dependencies: [
44+
"SystemMetrics"
45+
]
3946
),
4047
]
4148
)

[email protected]

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,22 @@ let package = Package(
2727
targets: [
2828
.target(
2929
name: "SystemMetrics",
30-
dependencies: ["CoreMetrics"]
30+
dependencies: [
31+
.product(name: "CoreMetrics", package: "swift-metrics"),
32+
]
3133
),
3234
.target(
3335
name: "MetricsTestUtils",
34-
dependencies: ["Metrics", "CoreMetrics"]
36+
dependencies: [
37+
.product(name: "Metrics", package: "swift-metrics"),
38+
.product(name: "CoreMetrics", package: "swift-metrics"),
39+
]
3540
),
3641
.testTarget(
3742
name: "SystemMetricsTests",
38-
dependencies: ["SystemMetrics"]
43+
dependencies: [
44+
"SystemMetrics"
45+
]
3946
),
4047
]
4148
)

docker/Dockerfile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@ ENV LANGUAGE en_US.UTF-8
1616
RUN apt-get update && apt-get install -y wget
1717
RUN apt-get update && apt-get install -y lsof dnsutils netcat-openbsd net-tools curl jq # used by integration tests
1818

19-
# ruby and jazzy for docs generation
20-
RUN apt-get update && apt-get install -y ruby ruby-dev libsqlite3-dev build-essential
21-
# jazzy no longer works on xenial as ruby is too old.
22-
RUN if [ "${ubuntu_version}" = "focal" ] ; then echo "gem: --no-document" > ~/.gemrc; fi
23-
RUN if [ "${ubuntu_version}" = "focal" ] ; then gem install jazzy; fi
24-
2519
# tools
2620
RUN mkdir -p $HOME/.tools
2721
RUN echo 'export PATH="$HOME/.tools:$PATH"' >> $HOME/.profile

0 commit comments

Comments
 (0)