Skip to content

Commit

Permalink
review
Browse files Browse the repository at this point in the history
  • Loading branch information
paulb777 committed Sep 19, 2024
1 parent 86b4777 commit 7528abe
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 9 deletions.
1 change: 0 additions & 1 deletion Sources/DataConnectSettings.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import Foundation

@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
public struct DataConnectSettings: Hashable, Equatable {
static let version = "11.3.0-beta"
public private(set) var host: String
public private(set) var port: Int
public private(set) var sslEnabled: Bool
Expand Down
2 changes: 1 addition & 1 deletion Sources/Internal/Component.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ import Foundation
@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
@objc(FIRDataConnectComponent) class DataConnectComponent: NSObject {
@objc class func sdkVersion() -> String {
return DataConnectSettings.version
return Version.version
}
}
20 changes: 20 additions & 0 deletions Sources/Internal/Version.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Copyright 2024 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

import Foundation

@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
struct Version {
static let version = "11.3.0-beta"
}
11 changes: 4 additions & 7 deletions Tests/Unit/UserAgentTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,22 @@ import FirebaseCore
@testable import FirebaseDataConnect

final class UserAgentTests: XCTestCase {
static var defaultApp: FirebaseApp?

static var options: FirebaseOptions = {
let options = FirebaseOptions(googleAppID: "0:0000000000000:ios:0000000000000000",
gcmSenderID: "00000000000000000-00000000000-000000000")
options.projectID = "fdc-test"
options.apiKey = "testDummyApiKey"
options.projectID = "user-agent-test"
options.apiKey = "testUserAgentDummyApiKey"
return options
}()

override class func setUp() {
FirebaseApp.configure(options: options)
defaultApp = FirebaseApp.app()
FirebaseApp.configure(name: "user-agent", options: options)
}

/// Confirm that Data Connect gets added to the user agent.
func testUserAgent() {
let userAgent = FirebaseApp.firebaseUserAgent()
let version = DataConnectSettings.version
let version = Version.version
XCTAssertTrue(userAgent.contains("fire-dc/\(version)"))
}
}

0 comments on commit 7528abe

Please sign in to comment.