Remove Swift flag from user agent (#8215)

Author: paulb777

FirebaseCore/Sources/FIRFirebaseUserAgent.m

@@ -91,8 +91,6 @@ - (void)reset {
   NSDictionary<NSString *, id> *info = [[NSBundle mainBundle] infoDictionary];
   NSString *xcodeVersion = info[@"DTXcodeBuild"];
   NSString *appleSdkVersion = info[@"DTSDKBuild"];
-
-  NSString *swiftFlagValue = [GULAppEnvironmentUtil hasSwiftRuntime] ? @"true" : @"false";
   NSString *isFromAppstoreFlagValue = [GULAppEnvironmentUtil isFromAppStore] ? @"true" : @"false";
 
   components[@"apple-platform"] = [GULAppEnvironmentUtil applePlatform];
@@ -101,7 +99,6 @@ - (void)reset {
   components[@"deploy"] = [GULAppEnvironmentUtil deploymentType];
   components[@"device"] = [GULAppEnvironmentUtil deviceModel];
   components[@"os-version"] = [GULAppEnvironmentUtil systemVersion];
-  components[@"swift"] = swiftFlagValue;
   components[@"xcode"] = xcodeVersion;
 
   return [components copy];

FirebaseCore/Tests/SwiftUnit/FirebaseAppTests.swift

@@ -31,10 +31,6 @@ class FirebaseAppTests: XCTestCase {
     FirebaseApp.resetApps()
   }
 
-  func testSwiftFlagWithSwift() {
-    XCTAssertTrue(FirebaseApp.firebaseUserAgent().contains("swift"))
-  }
-
   func testConfigure() throws {
     expectAppConfigurationNotification(appName: Constants.App.defaultName, isDefaultApp: true)
 
@@ -331,8 +327,15 @@ class FirebaseAppTests: XCTestCase {
 
   // MARK: - Firebase User Agent
 
-  func testFirebaseUserAgent_SwiftRuntime() {
-    XCTAssertTrue(FirebaseApp.firebaseUserAgent().contains("swift/true"))
+  func testUserAgent() {
+    let agent = FirebaseApp.firebaseUserAgent()
+    XCTAssertTrue(agent.contains("apple-platform"))
+    XCTAssertTrue(agent.contains("apple-sdk"))
+    XCTAssertTrue(agent.contains("appstore"))
+    XCTAssertTrue(agent.contains("deploy"))
+    XCTAssertTrue(agent.contains("device"))
+    XCTAssertTrue(agent.contains("os-version"))
+    XCTAssertTrue(agent.contains("xcode"))
   }
 
   // MARK: - Helpers

FirebaseCore/Tests/Unit/FIRAppTest.m

@@ -841,10 +841,6 @@ - (void)testRegisterLibrary_RegisteringNonConformingLibrary {
   XCTAssertFalse([[FIRApp firebaseUserAgent] containsString:@"InvalidLibrary`/1.0.0"]);
 }
 
-- (void)testFirebaseUserAgent_SwiftFlagWithNoSwift {
-  XCTAssertTrue([[FIRApp firebaseUserAgent] containsString:@"swift/false"]);
-}
-
 - (void)testFirebaseUserAgent_ApplePlatformFlag {
   // When a Catalyst app is run on macOS then both `TARGET_OS_MACCATALYST` and `TARGET_OS_IOS` are
   // `true`.