Skip to content

Commit 720a028

Browse files
author
Ignacio Bonafonte
authored
Merge pull request #391 from nachoBonafonte/main
Fix support for tvOS was broken when adding watchOS support
2 parents cd22c5d + 0d2e986 commit 720a028

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

[email protected]

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ let package = Package(
3131
.executable(name: "simpleExporter", targets: ["SimpleExporter"]),
3232
.executable(name: "OTLPExporter", targets: ["OTLPExporter"]),
3333
.executable(name: "OTLPHTTPExporter", targets: ["OTLPHTTPExporter"]),
34-
.executable(name: "loggingTracer", targets: ["LoggingTracer"]),
34+
.executable(name: "loggingTracer", targets: ["LoggingTracer"])
3535
],
3636
dependencies: [
3737
.package(url: "https://github.com/undefinedlabs/opentracing-objc", from: "0.5.2"),
@@ -57,7 +57,7 @@ let package = Package(
5757
.target(name: "NetworkStatus",
5858
dependencies: [
5959
"OpenTelemetryApi",
60-
.product(name: "Reachability", package: "Reachability.swift", condition: .when(platforms: [.iOS, .macOS, .macCatalyst, .linux]))
60+
.product(name: "Reachability", package: "Reachability.swift", condition: .when(platforms: [.iOS, .macOS, .tvOS, .macCatalyst, .linux]))
6161
],
6262
path: "Sources/Instrumentation/NetworkStatus",
6363
linkerSettings: [.linkedFramework("CoreTelephony", .when(platforms: [.iOS], configuration: nil))]),
@@ -80,7 +80,7 @@ let package = Package(
8080
.target(name: "JaegerExporter",
8181
dependencies: [
8282
"OpenTelemetrySdk",
83-
.product(name: "Thrift", package: "Thrift-Swift", condition: .when(platforms: [.iOS, .macOS, .macCatalyst, .linux]))
83+
.product(name: "Thrift", package: "Thrift-Swift", condition: .when(platforms: [.iOS, .macOS, .tvOS, .macCatalyst, .linux]))
8484
],
8585
path: "Sources/Exporters/Jaeger"),
8686
.target(name: "ZipkinExporter",
@@ -111,7 +111,7 @@ let package = Package(
111111
.testTarget(name: "NetworkStatusTests",
112112
dependencies: [
113113
"NetworkStatus",
114-
.product(name: "Reachability", package: "Reachability.swift", condition: .when(platforms: [.iOS, .macOS, .macCatalyst, .linux]))
114+
.product(name: "Reachability", package: "Reachability.swift", condition: .when(platforms: [.iOS, .macOS, .tvOS, .macCatalyst, .linux]))
115115
],
116116
path: "Tests/InstrumentationTests/NetworkStatusTests"),
117117
.testTarget(name: "OpenTelemetryApiTests",
@@ -148,9 +148,9 @@ let package = Package(
148148
path: "Tests/ExportersTests/Prometheus"),
149149
.testTarget(name: "OpenTelemetryProtocolExporterTests",
150150
dependencies: ["OpenTelemetryProtocolExporter",
151-
.product(name: "NIO", package: "swift-nio"),
152-
.product(name: "NIOHTTP1", package: "swift-nio"),
153-
.product(name: "NIOTestUtils", package: "swift-nio")],
151+
.product(name: "NIO", package: "swift-nio"),
152+
.product(name: "NIOHTTP1", package: "swift-nio"),
153+
.product(name: "NIOTestUtils", package: "swift-nio")],
154154
path: "Tests/ExportersTests/OpenTelemetryProtocol"),
155155
.testTarget(name: "InMemoryExporterTests",
156156
dependencies: ["InMemoryExporter"],
@@ -203,6 +203,6 @@ let package = Package(
203203
dependencies: ["URLSessionInstrumentation", "StdoutExporter"],
204204
path: "Examples/Network Sample",
205205
exclude: ["README.md"]
206-
),
206+
)
207207
]
208208
)

0 commit comments

Comments
 (0)