Skip to content

Commit 5aaeb56

Browse files
Feedback - use GoogleUtilities, remove prints.
1 parent 8dafb52 commit 5aaeb56

File tree

2 files changed

+6
-20
lines changed

2 files changed

+6
-20
lines changed

Sources/Internal/Version.swift

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,18 @@
1414

1515
import Foundation
1616

17+
import GoogleUtilities_Environment
18+
1719
@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
1820
struct Version {
1921
static let sdkVersion = "11.3.0-beta"
2022

2123
// returns value of form gl-PLATFORM_NAME/PLATFORM_VERSION
2224
static func platformVersionHeader() -> String {
23-
let version = ProcessInfo.processInfo.operatingSystemVersion
24-
let versionString = "\(version.majorVersion).\(version.minorVersion).\(version.patchVersion)"
25-
#if os(iOS)
26-
return "gl-ios/\(versionString)"
27-
#elseif os(watchOS)
28-
return "gl-watchos/\(versionString)"
29-
#elseif os(tvOS)
30-
return "gl-tvos/\(versionString)"
31-
#elseif os(macOS)
32-
return "gl-macos/\(versionString)"
33-
#else
34-
return ""
35-
#endif
25+
let versionString = GULAppEnvironmentUtil.systemVersion()
26+
let platformName = GULAppEnvironmentUtil.applePlatform()
27+
28+
return "gl-\(platformName)/\(versionString)"
3629
}
3730

3831
// returns the build time major version of swift

Tests/Unit/HeaderTests.swift

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,6 @@ final class HeaderTests: XCTestCase {
6363
let values = callOptions.customMetadata.values(
6464
forHeader: GrpcClient.RequestHeaders.googApiClient, canonicalForm: false
6565
)
66-
for value in values {
67-
print("value \(value)")
68-
}
69-
print("values \(values)")
7066
let contains = values
7167
.contains {
7268
$0 ==
@@ -84,9 +80,6 @@ final class HeaderTests: XCTestCase {
8480
let values = callOptions.customMetadata.values(
8581
forHeader: GrpcClient.RequestHeaders.googApiClient, canonicalForm: false
8682
)
87-
for value in values {
88-
print("value \(value)")
89-
}
9083
let contains = values
9184
.contains {
9285
$0 ==

0 commit comments

Comments
 (0)