Merge branch 'main' into varconst/remove-stlport

Author: var-const

.github/workflows/integration_tests.yml

@@ -14,7 +14,7 @@ on:
         required: true
       apis:
         description: 'CSV of apis to build and test'
-        default: 'admob,analytics,auth,database,dynamic_links,firestore,functions,installations,instance_id,messaging,remote_config,storage'
+        default: 'admob,analytics,auth,database,dynamic_links,firestore,functions,installations,messaging,remote_config,storage'
         required: true
       operating_systems:
         description: 'CSV of VMs to run on'

Android/firebase_dependencies.gradle

@@ -29,8 +29,6 @@ def firebaseDependenciesMap = [
   'functions' : ['com.google.firebase:firebase-functions:19.2.0'],
   'installations' : ['com.google.firebase:firebase-installations:16.3.5',
                      'com.google.android.gms:play-services-base:17.6.0'],
-  'instance_id' : ['com.google.firebase:firebase-iid:21.1.0',
-                   'com.google.android.gms:play-services-base:17.6.0'],
   'invites' : ['com.google.firebase:firebase-invites:17.0.0'],
   // Messaging has an additional local dependency to include.
   'messaging' : ['com.google.firebase:firebase-messaging:21.1.0',
@@ -95,9 +93,6 @@ class Dependencies {
   def getInstallations() {
     libSet.add('installations')
   }
-  def getInstanceId() {
-    libSet.add('instance_id')
-  }
   def getInvites() {
     libSet.add('invites')
   }

CMakeLists.txt

@@ -48,9 +48,6 @@ option(FIREBASE_INCLUDE_FUNCTIONS
 option(FIREBASE_INCLUDE_INSTALLATIONS
        "Include the Firebase Installations library."
        ${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
-option(FIREBASE_INCLUDE_INSTANCE_ID
-       "Include the Firebase Instance ID library."
-       ${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
 option(FIREBASE_INCLUDE_MESSAGING
        "Include the Firebase Cloud Messaging library."
        ${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
@@ -554,9 +551,6 @@ endif()
 if (FIREBASE_INCLUDE_INSTALLATIONS)
   add_subdirectory(installations)
 endif()
-if (FIREBASE_INCLUDE_INSTANCE_ID)
-  add_subdirectory(instance_id)
-endif()
 if (FIREBASE_INCLUDE_MESSAGING)
   add_subdirectory(messaging)
 endif()

app/CMakeLists.txt

@@ -374,7 +374,6 @@ endif()
 if (NOT ANDROID AND NOT IOS)
   # Add the rest subdirectory, so that other libraries can access it
   add_subdirectory(rest)
-  add_subdirectory(instance_id)
 endif()
 
 if(FIREBASE_CPP_BUILD_TESTS)
@@ -484,8 +483,6 @@ if (IOS)
     ${FIREBASE_SOURCE_DIR}/functions/src/include/firebase/functions/callable_reference.h
     ${FIREBASE_SOURCE_DIR}/functions/src/include/firebase/functions/callable_result.h
     ${FIREBASE_SOURCE_DIR}/functions/src/include/firebase/functions/common.h)
-  set(instance_id_HDRS
-    ${FIREBASE_SOURCE_DIR}/instance_id/src/include/firebase/instance_id.h)
   set(installations_HDRS
     ${FIREBASE_SOURCE_DIR}/installations/src/include/firebase/installations.h)
   set(messaging_HDRS
@@ -509,7 +506,6 @@ if (IOS)
     ${dynamic_links_HDRS}
     ${firestore_HDRS}
     ${functions_HDRS}
-    ${instance_id_HDRS}
     ${installations_HDRS}
     ${messaging_HDRS}
     ${remote_config_HDRS}