File tree Expand file tree Collapse file tree 5 files changed +40
-18
lines changed Expand file tree Collapse file tree 5 files changed +40
-18
lines changed Original file line number Diff line number Diff line change @@ -27,15 +27,22 @@ let package = Package(
27
27
targets: [
28
28
. target(
29
29
name: " SystemMetrics " ,
30
- dependencies: [ " CoreMetrics " ]
30
+ dependencies: [
31
+ . product( name: " CoreMetrics " , package : " swift-metrics " ) ,
32
+ ]
31
33
) ,
32
34
. target(
33
35
name: " MetricsTestUtils " ,
34
- dependencies: [ " Metrics " , " CoreMetrics " ]
36
+ dependencies: [
37
+ . product( name: " Metrics " , package : " swift-metrics " ) ,
38
+ . product( name: " CoreMetrics " , package : " swift-metrics " ) ,
39
+ ]
35
40
) ,
36
41
. testTarget(
37
42
name: " SystemMetricsTests " ,
38
- dependencies: [ " SystemMetrics " ]
43
+ dependencies: [
44
+ " SystemMetrics "
45
+ ]
39
46
) ,
40
47
]
41
48
)
Original file line number Diff line number Diff line change @@ -27,15 +27,22 @@ let package = Package(
27
27
targets: [
28
28
. target(
29
29
name: " SystemMetrics " ,
30
- dependencies: [ " CoreMetrics " ]
30
+ dependencies: [
31
+ . product( name: " CoreMetrics " , package : " swift-metrics " ) ,
32
+ ]
31
33
) ,
32
34
. target(
33
35
name: " MetricsTestUtils " ,
34
- dependencies: [ " Metrics " , " CoreMetrics " ]
36
+ dependencies: [
37
+ . product( name: " Metrics " , package : " swift-metrics " ) ,
38
+ . product( name: " CoreMetrics " , package : " swift-metrics " ) ,
39
+ ]
35
40
) ,
36
41
. testTarget(
37
42
name: " SystemMetricsTests " ,
38
- dependencies: [ " SystemMetrics " ]
43
+ dependencies: [
44
+ " SystemMetrics "
45
+ ]
39
46
) ,
40
47
]
41
48
)
Original file line number Diff line number Diff line change @@ -27,15 +27,22 @@ let package = Package(
27
27
targets: [
28
28
. target(
29
29
name: " SystemMetrics " ,
30
- dependencies: [ " CoreMetrics " ]
30
+ dependencies: [
31
+ . product( name: " CoreMetrics " , package : " swift-metrics " ) ,
32
+ ]
31
33
) ,
32
34
. target(
33
35
name: " MetricsTestUtils " ,
34
- dependencies: [ " Metrics " , " CoreMetrics " ]
36
+ dependencies: [
37
+ . product( name: " Metrics " , package : " swift-metrics " ) ,
38
+ . product( name: " CoreMetrics " , package : " swift-metrics " ) ,
39
+ ]
35
40
) ,
36
41
. testTarget(
37
42
name: " SystemMetricsTests " ,
38
- dependencies: [ " SystemMetrics " ]
43
+ dependencies: [
44
+ " SystemMetrics "
45
+ ]
39
46
) ,
40
47
]
41
48
)
Original file line number Diff line number Diff line change @@ -27,15 +27,22 @@ let package = Package(
27
27
targets: [
28
28
. target(
29
29
name: " SystemMetrics " ,
30
- dependencies: [ " CoreMetrics " ]
30
+ dependencies: [
31
+ . product( name: " CoreMetrics " , package : " swift-metrics " ) ,
32
+ ]
31
33
) ,
32
34
. target(
33
35
name: " MetricsTestUtils " ,
34
- dependencies: [ " Metrics " , " CoreMetrics " ]
36
+ dependencies: [
37
+ . product( name: " Metrics " , package : " swift-metrics " ) ,
38
+ . product( name: " CoreMetrics " , package : " swift-metrics " ) ,
39
+ ]
35
40
) ,
36
41
. testTarget(
37
42
name: " SystemMetricsTests " ,
38
- dependencies: [ " SystemMetrics " ]
43
+ dependencies: [
44
+ " SystemMetrics "
45
+ ]
39
46
) ,
40
47
]
41
48
)
Original file line number Diff line number Diff line change @@ -16,12 +16,6 @@ ENV LANGUAGE en_US.UTF-8
16
16
RUN apt-get update && apt-get install -y wget
17
17
RUN apt-get update && apt-get install -y lsof dnsutils netcat-openbsd net-tools curl jq # used by integration tests
18
18
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
-
25
19
# tools
26
20
RUN mkdir -p $HOME/.tools
27
21
RUN echo 'export PATH="$HOME/.tools:$PATH"' >> $HOME/.profile
You can’t perform that action at this time.
0 commit comments