Skip to content

Commit e53c851

Browse files
authored
Update minimum SPM dep versions for GU and GDT (#8835)
1 parent 1689772 commit e53c851

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,12 @@ let package = Package(
149149
.package(
150150
name: "GoogleDataTransport",
151151
url: "https://github.com/google/GoogleDataTransport.git",
152-
"9.1.1" ..< "10.0.0"
152+
"9.1.2" ..< "10.0.0"
153153
),
154154
.package(
155155
name: "GoogleUtilities",
156156
url: "https://github.com/google/GoogleUtilities.git",
157-
"7.5.2" ..< "8.0.0"
157+
"7.6.0" ..< "8.0.0"
158158
),
159159
.package(
160160
name: "GTMSessionFetcher",

SwiftPMTests/swift-test/main.swift

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,14 @@ class importTest: XCTestCase {
6565
#endif
6666
XCTAssertFalse(GULAppEnvironmentUtil.isAppExtension())
6767
XCTAssertNil(FirebaseApp.app())
68-
XCTAssertEqual(GULAppEnvironmentUtil.deviceModel(), "x86_64")
68+
#if os(macOS) || targetEnvironment(macCatalyst)
69+
// Device model should now return the appropriate hardware model on macOS.
70+
XCTAssertNotEqual(GULAppEnvironmentUtil.deviceModel(), "x86_64")
71+
#else
72+
// Device model should show up as x86_64 for iOS, tvOS, and watchOS
73+
// simulators.
74+
XCTAssertEqual(GULAppEnvironmentUtil.deviceModel(), "x86_64")
75+
#endif
6976

7077
let versionParts = FirebaseVersion().split(separator: ".")
7178
XCTAssert(versionParts.count == 3)

0 commit comments

Comments
 (0)