Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:
required: true
apis:
description: 'CSV of apis to build and test'
default: 'analytics,app_check,auth,database,dynamic_links,firestore,functions,gma,installations,messaging,remote_config,storage,ump'
default: 'analytics,app_check,auth,database,dynamic_links,firestore,functions,installations,messaging,remote_config,storage,ump'
required: true
operating_systems:
description: 'CSV of VMs to run on'
Expand Down Expand Up @@ -186,7 +186,7 @@ jobs:
# list. Then we can use fromJson to define the field in the matrix for the tests job.
if [[ "${{ github.event.schedule }}" == "0 9 * * *" ]]; then
# at 1am PST/2am PDT. Running integration tests and generate test report for all testapps except firestore
apis="analytics,app_check,auth,database,dynamic_links,functions,gma,installations,messaging,remote_config,storage,ump"
apis="analytics,app_check,auth,database,dynamic_links,functions,installations,messaging,remote_config,storage,ump"
echo "::warning ::Running main nightly tests"
elif [[ "${{ github.event.schedule }}" == "0 10 * * *" || "${{ github.event.schedule }}" == "0 11 * * *" ]]; then
# at 2am PST/3am PDT and 3am PST/4am PDT. Running integration tests for firestore and generate test report.
Expand Down
13 changes: 3 additions & 10 deletions .github/workflows/update-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ on:
updateiOS:
description: 'update iOS dependencies?'
default: 1
includeGMA:
description: 'include GMA?'
default: 0
triggerTests:
description: 'trigger tests on PR?'
default: 1
Expand Down Expand Up @@ -68,20 +65,16 @@ jobs:

- name: Run update script
run: |
gma_flag=
if [[ ${{ github.event.inputs.includeGMA }} -eq 1 ]]; then
gma_flag="--include_gma"
fi
if [[ ${{ github.event.inputs.updateiOS }} -eq 1 ]]; then
if [[ ${{ github.event.inputs.updateAndroid }} -eq 1 ]]; then
# Update both
echo "Updating all dependencies"
python scripts/update_android_ios_dependencies.py --logfile=${UPDATE_LOGFILE} ${gma_flag}
python scripts/update_android_ios_dependencies.py --logfile=${UPDATE_LOGFILE}
echo "CHOSEN_DEPS=mobile" >> $GITHUB_ENV
else
# Update iOS only
echo "Updating iOS dependencies only"
python scripts/update_android_ios_dependencies.py --skip_android --logfile=${UPDATE_LOGFILE} ${gma_flag}
python scripts/update_android_ios_dependencies.py --skip_android --logfile=${UPDATE_LOGFILE}
echo "CHOSEN_DEPS=iOS" >> $GITHUB_ENV
fi
# iOS: Update Firestore external version to match Firestore Cocoapod version.
Expand Down Expand Up @@ -165,7 +158,7 @@ jobs:
elif [[ ${{ github.event.inputs.updateAndroid }} -eq 1 ]]; then
# Update Android only
echo "Updating Android dependencies only"
python scripts/update_android_ios_dependencies.py --skip_ios --logfile=${UPDATE_LOGFILE} ${gma_flag}
python scripts/update_android_ios_dependencies.py --skip_ios --logfile=${UPDATE_LOGFILE}
echo "CHOSEN_DEPS=Android" >> $GITHUB_ENV
else
echo "::error ::Neither Android nor iOS selected. Exiting."
Expand Down
6 changes: 0 additions & 6 deletions Android/firebase_dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ def firebaseDependenciesMap = [
'dynamic_links' : ['com.google.firebase:firebase-dynamic-links'],
'firestore' : ['com.google.firebase:firebase-firestore'],
'functions' : ['com.google.firebase:firebase-functions'],
'gma' : ['com.google.android.gms:play-services-ads:23.0.0',
'com.google.android.ump:user-messaging-platform:2.2.0'],
'installations' : ['com.google.firebase:firebase-installations'],
'invites' : ['com.google.firebase:firebase-invites'],
// Messaging has an additional local dependency to include.
Expand All @@ -52,7 +50,6 @@ def firebaseResourceDependenciesMap = [
'auth' : [':auth:auth_resources'],
'database' : [':database:database_resources'],
'firestore' : [':firestore:firestore_resources'],
'gma' : [':gma:gma_resources'],
'remote_config' : [':remote_config:remote_config_resources'],
'storage' : [':storage:storage_resources'],
'ump' : [':ump:ump_resources']
Expand Down Expand Up @@ -94,9 +91,6 @@ class Dependencies {
def getFirestore() {
libSet.add('firestore')
}
def getGma() {
libSet.add('gma')
}
def getFunctions() {
libSet.add('functions')
}
Expand Down
8 changes: 1 addition & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@ option(FIREBASE_INCLUDE_FIRESTORE
option(FIREBASE_INCLUDE_FUNCTIONS
"Include the Cloud Functions for Firebase library."
${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
option(FIREBASE_INCLUDE_GMA "Include the GMA library."
${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
option(FIREBASE_INCLUDE_UMP "Include the UMP library."
${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
option(FIREBASE_INCLUDE_INSTALLATIONS
Expand Down Expand Up @@ -125,9 +123,8 @@ if(FIREBASE_CPP_BUILD_TESTS OR FIREBASE_CPP_BUILD_STUB_TESTS)
endif()

if (PLATFORM STREQUAL TVOS OR PLATFORM STREQUAL SIMULATOR_TVOS)
# GMA, UMP, and FDL are not supported on tvOS.
# UMP and FDL are not supported on tvOS.
set(FIREBASE_INCLUDE_DYNAMIC_LINKS OFF)
set(FIREBASE_INCLUDE_GMA OFF)
set(FIREBASE_INCLUDE_UMP OFF)
endif()

Expand Down Expand Up @@ -635,9 +632,6 @@ endif()
if (FIREBASE_INCLUDE_FUNCTIONS)
add_subdirectory(functions)
endif()
if (FIREBASE_INCLUDE_GMA)
add_subdirectory(gma)
endif()
if (FIREBASE_INCLUDE_UMP)
add_subdirectory(ump)
endif()
Expand Down
11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@ iOS, and desktop platforms. It includes the following Firebase libraries:
|[Google Analytics for Firebase](https://firebase.google.com/docs/analytics/)|
|[Firebase Authentication](https://firebase.google.com/docs/auth/)|[Firebase Realtime Database](https://firebase.google.com/docs/database/)|
|[Firebase Dynamic Links](https://firebase.google.com/docs/dynamic-links/)|[Cloud Firestore](https://firebase.google.com/docs/firestore/)|
|[Cloud Functions for Firebase](https://firebase.google.com/docs/functions/)|[Firebase Invites](https://firebase.google.com/docs/invites/)|
|[Firebase Cloud Messaging](https://firebase.google.com/docs/cloud-messaging/)|[Firebase Remote Config](https://firebase.google.com/docs/remote-config/)|
|[Cloud Storage for Firebase](https://firebase.google.com/docs/storage/)|
|[Cloud Functions for Firebase](https://firebase.google.com/docs/functions/)|[Firebase Cloud Messaging](https://firebase.google.com/docs/cloud-messaging/)|
|[Firebase Remote Config](https://firebase.google.com/docs/remote-config/)|[Cloud Storage for Firebase](https://firebase.google.com/docs/storage/)|

<br>

**Note:** The Google Mobile Ads (GMA) C++ SDK has been deprecated and was removed from this SDK.

<br>

Expand Down Expand Up @@ -117,7 +120,6 @@ The CMake following targets are available to build and link with:
| Firebase Dynamic Links | firebase_dynamic_links |
| Cloud Firestore | firebase_firestore |
| Cloud Functions for Firebase | firebase_functions |
| Firebase Invites | firebase_invites |
| Firebase Cloud Messaging | firebase_messaging |
| Firebase Remote Config | firebase_remote_config |
| Cloud Storage for Firebase | firebase_storage |
Expand Down Expand Up @@ -222,7 +224,6 @@ release version of each Firebase library is:
| Firebase Dynamic Links | :dynamic_links:assembleRelease |
| Cloud Firestore | :firestore:assembleRelease |
| Cloud Functions for Firebase | :functions:assembleRelease |
| Firebase Invites | :invites:assembleRelease |
| Firebase Cloud Messaging | :messaging:assembleRelease |
| Firebase Remote Config | :remote_config:assembleRelease |
| Cloud Storage for Firebase | :storage:assembleRelease |
Expand Down
12 changes: 0 additions & 12 deletions app/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -541,17 +541,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(gma_HDRS
${FIREBASE_SOURCE_DIR}/gma/src/include/firebase/gma.h
${FIREBASE_SOURCE_DIR}/gma/src/include/firebase/gma/ad_view.h
${FIREBASE_SOURCE_DIR}/gma/src/include/firebase/gma/interstitial_ad.h
${FIREBASE_SOURCE_DIR}/gma/src/include/firebase/gma/internal/native_ad.h
${FIREBASE_SOURCE_DIR}/gma/src/include/firebase/gma/internal/query_info.h
${FIREBASE_SOURCE_DIR}/gma/src/include/firebase/gma/rewarded_ad.h
${FIREBASE_SOURCE_DIR}/gma/src/include/firebase/gma/types.h
${FIREBASE_SOURCE_DIR}/gma/src/include/firebase/gma/ump.h
${FIREBASE_SOURCE_DIR}/gma/src/include/firebase/gma/ump/consent_info.h
${FIREBASE_SOURCE_DIR}/gma/src/include/firebase/gma/ump/types.h)
set(installations_HDRS
${FIREBASE_SOURCE_DIR}/installations/src/include/firebase/installations.h)
set(messaging_HDRS
Expand Down Expand Up @@ -580,7 +569,6 @@ if (IOS)
${dynamic_links_HDRS}
${firestore_HDRS}
${functions_HDRS}
${gma_HDRS}
${installations_HDRS}
${messaging_HDRS}
${remote_config_HDRS}
Expand Down
2 changes: 1 addition & 1 deletion build_scripts/ios/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ readonly SUPPORTED_PLATFORMS=(device simulator)
readonly SUPPORTED_ARCHITECTURES=(arm64 x86_64)
readonly DEVICE_ARCHITECTURES=(arm64)
readonly SIMULATOR_ARCHITECTURES=(arm64 x86_64)
readonly SUPPORTED_TARGETS=(firebase_analytics firebase_auth firebase_app_check firebase_database firebase_dynamic_links firebase_firestore firebase_functions firebase_gma firebase_installations firebase_messaging firebase_remote_config firebase_storage firebase_ump)
readonly SUPPORTED_TARGETS=(firebase_analytics firebase_auth firebase_app_check firebase_database firebase_dynamic_links firebase_firestore firebase_functions firebase_installations firebase_messaging firebase_remote_config firebase_storage firebase_ump)

# build default value
buildpath="ios_build"
Expand Down
2 changes: 1 addition & 1 deletion build_scripts/packaging.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

# List of all Firebase products to include in the binary SDK package.
readonly -a product_list=(analytics app app_check auth database
dynamic_links firestore functions gma installations messaging
dynamic_links firestore functions installations messaging
remote_config storage ump)
2 changes: 1 addition & 1 deletion docs/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ SORT_GROUP_NAMES = YES
JAVADOC_AUTOBRIEF = YES

# Firebase-specific options.
PREDEFINED = DOXYGEN DOXYGEN_ADMOB FIREBASE_DEPRECATED FIREBASE_NAMESPACE=firebase
PREDEFINED = DOXYGEN FIREBASE_DEPRECATED FIREBASE_NAMESPACE=firebase
MACRO_EXPANSION = YES # Expand FIREBASE_DEPRECATED macros.
EXPAND_ONLY_PREDEF = YES # Expand FIREBASE_DEPRECATED macros.
VERBATIM_HEADERS = NO
Expand Down
156 changes: 0 additions & 156 deletions gma/CMakeLists.txt

This file was deleted.

Loading
Loading