Merge IID removal code to master (#7814)

Author: charlotteliang

FirebaseMessaging.podspec

@@ -38,11 +38,10 @@ device, and it is completely free.
     base_dir + 'Sources/**/*.[mh]',
     'Interop/Analytics/Public/*.h',
     'FirebaseCore/Sources/Private/*.h',
+    'FirebaseInstallations/Source/Library/Private/*.h',
     'Firebase/InstanceID/Private/*.h',
     'Firebase/InstanceID/Public/*.h',
-    'FirebaseInstallations/Source/Library/Private/*.h',
   ]
-  s.requires_arc = base_dir + 'Sources/*.m'
   s.public_header_files = base_dir + 'Sources/Public/FirebaseMessaging/*.h'
   s.library = 'sqlite3'
   s.pod_target_xcconfig = {
@@ -54,8 +53,9 @@ device, and it is completely free.
   s.tvos.framework = 'SystemConfiguration'
   s.osx.framework = 'SystemConfiguration'
   s.weak_framework = 'UserNotifications'
-  s.dependency 'FirebaseCore', '~> 7.0'
   s.dependency 'FirebaseInstanceID', '~> 7.0'
+  s.dependency 'FirebaseInstallations', '~> 7.0'
+  s.dependency 'FirebaseCore', '~> 7.0'
   s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 7.0'
   s.dependency 'GoogleUtilities/Reachability', '~> 7.0'
   s.dependency 'GoogleUtilities/Environment', '~> 7.0'
@@ -68,7 +68,10 @@ device, and it is completely free.
       :osx => osx_deployment_target,
       :tvos => tvos_deployment_target
     }
-    unit_tests.source_files = 'FirebaseMessaging/Tests/UnitTests*/*.{m,h,swift}'
+    unit_tests.source_files = [
+      'FirebaseMessaging/Tests/UnitTests*/*.{m,h,swift}',
+      'SharedTestUtilities/URLSession/*.[mh]',
+    ]
     unit_tests.requires_app_host = true
     unit_tests.pod_target_xcconfig = {
      'CLANG_ENABLE_OBJC_WEAK' => 'YES'

FirebaseMessaging/Apps/Shared/ContentView.swift

@@ -142,7 +142,6 @@ struct ContentView: View {
             .multilineTextAlignment(.leading)
         }
         .navigationBarTitle("Firebase Messaging")
-
       }.buttonStyle(IdentityButtonStyle())
     }
   }
@@ -338,8 +337,9 @@ struct IdentityButtonStyle: ButtonStyle {
       .padding()
       .foregroundColor(.white)
       .background(Color.yellow)
-      .cornerRadius(40)
+      .cornerRadius(20)
       // Push the button down a bit when it's pressed.
       .scaleEffect(configuration.isPressed ? 0.9 : 1)
+      .font(.footnote)
   }
 }

FirebaseMessaging/Apps/Shared/SceneDelegate.swift

@@ -15,7 +15,6 @@
 import Combine
 import UIKit
 import SwiftUI
-import FirebaseInstanceID
 import FirebaseMessaging
 import FirebaseInstallations
 

FirebaseMessaging/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 2021-04 -- v7.11.0
+- [changed] Refactor Messaging to internally not depending on InstanceID, but can co-exist. Will remove InstanceID dependency in the next Firebase breaking change. (#7814)
+
 # 2021-02 -- v7.7.0
 - [fixed] Fixed an issue in which, when checking storage size before writing to disk, the client was checking document folders that were no longer used. (#7480)