Skip to content

Commit 925430a

Browse files
authored
Remove deprecated AdMob SDK (in favor of new GMA SDK). (#1285)
* Remove the entire AdMob SDK, including source, headers, and packaging. * Remove AdMob from dependency update script.
1 parent cc5d403 commit 925430a

File tree

220 files changed

+27
-17902
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

220 files changed

+27
-17902
lines changed

.github/workflows/cpp-packaging.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -827,7 +827,7 @@ jobs:
827827
-w integration_tests.yml \
828828
-p test_packaged_sdk ${{ github.run_id }} \
829829
-p use_expanded_matrix ${USE_EXPANDED_MATRIX} \
830-
-p apis "admob,analytics,auth,database,dynamic_links,functions,installations,messaging,remote_config,storage" \
830+
-p apis "analytics,auth,database,dynamic_links,functions,installations,messaging,remote_config,storage" \
831831
-p test_pull_request nightly-packaging \
832832
-s 10 \
833833
-A ${verbose_flag}

.github/workflows/integration_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
required: true
1818
apis:
1919
description: 'CSV of apis to build and test'
20-
default: 'admob,analytics,auth,database,dynamic_links,firestore,functions,gma,installations,messaging,remote_config,storage'
20+
default: 'analytics,auth,database,dynamic_links,firestore,functions,gma,installations,messaging,remote_config,storage'
2121
required: true
2222
operating_systems:
2323
description: 'CSV of VMs to run on'
@@ -187,7 +187,7 @@ jobs:
187187
# list. Then we can use fromJson to define the field in the matrix for the tests job.
188188
if [[ "${{ github.event.schedule }}" == "0 9 * * *" ]]; then
189189
# at 1am PST/2am PDT. Running integration tests and generate test report for all testapps except firestore
190-
apis="admob,analytics,auth,database,dynamic_links,functions,gma,installations,messaging,remote_config,storage"
190+
apis="analytics,auth,database,dynamic_links,functions,gma,installations,messaging,remote_config,storage"
191191
elif [[ "${{ github.event.schedule }}" == "0 10 * * *" || "${{ github.event.schedule }}" == "0 11 * * *" ]]; then
192192
# at 2am PST/3am PDT and 3am PST/4am PDT. Running integration tests for firestore and generate test report.
193193
apis="firestore"

Android/firebase_dependencies.gradle

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ def firebaseDependenciesMap = [
2121
'com.google.firebase:firebase-appcheck-debug',
2222
'com.google.firebase:firebase-appcheck-playintegrity'],
2323
'play_services' : ['com.google.android.gms:play-services-base:18.2.0'],
24-
'admob' : ['com.google.firebase:firebase-ads:19.8.0',
25-
'com.google.firebase:firebase-analytics'],
2624
'analytics' : ['com.google.firebase:firebase-analytics'],
2725
'auth' : ['com.google.firebase:firebase-auth'],
2826
'database' : ['com.google.firebase:firebase-database'],
@@ -49,7 +47,6 @@ def firebaseResourceDependenciesMap = [
4947
':app:google_api_resources',
5048
':app:invites_resources'],
5149
'app_check' : [':app_check:app_check_resources'],
52-
'admob' : [':admob:admob_resources'],
5350
'auth' : [':auth:auth_resources'],
5451
'database' : [':database:database_resources'],
5552
'firestore' : [':firestore:firestore_resources'],
@@ -75,9 +72,6 @@ class Dependencies {
7572
def getAppWithoutPlayServices() {
7673
libSet.add('app')
7774
}
78-
def getAdmob() {
79-
libSet.add('admob')
80-
}
8175
def getAnalytics() {
8276
libSet.add('analytics')
8377
}
@@ -124,7 +118,7 @@ class Dependencies {
124118

125119
// Extension to handle which Firebase C++ dependencies are being added to the
126120
// gradle project.
127-
// They are added via: firebaseCpp.dependencies "admob", "analytics", ...
121+
// They are added via: firebaseCpp.dependencies "auth", "analytics", ...
128122
class FirebaseCppExtension {
129123
Dependencies dependencies = new Dependencies()
130124

CMakeLists.txt

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ option(FIREBASE_INCLUDE_LIBRARY_DEFAULT
2828
"Should each library be included by default." ON)
2929
# Different options to enable/disable each library being included during
3030
# configuration.
31-
option(FIREBASE_INCLUDE_ADMOB "Include the AdMob library."
32-
${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
3331
option(FIREBASE_INCLUDE_ANALYTICS
3432
"Include the Google Analytics for Firebase library."
3533
${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
@@ -125,8 +123,7 @@ if(FIREBASE_CPP_BUILD_TESTS OR FIREBASE_CPP_BUILD_STUB_TESTS)
125123
endif()
126124

127125
if (PLATFORM STREQUAL TVOS OR PLATFORM STREQUAL SIMULATOR_TVOS)
128-
# AdMob, GMA and FDL are not supported on tvOS.
129-
set(FIREBASE_INCLUDE_ADMOB OFF)
126+
# GMA and FDL are not supported on tvOS.
130127
set(FIREBASE_INCLUDE_DYNAMIC_LINKS OFF)
131128
set(FIREBASE_INCLUDE_GMA OFF)
132129
endif()
@@ -593,9 +590,6 @@ else()
593590
)
594591
endif()
595592

596-
if (FIREBASE_INCLUDE_ADMOB)
597-
add_subdirectory(admob)
598-
endif()
599593
if (FIREBASE_INCLUDE_ANALYTICS)
600594
add_subdirectory(analytics)
601595
add_dependencies(FIREBASE_GENERATED_HEADERS FIREBASE_ANALYTICS_GENERATED_HEADERS)

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ iOS, and desktop platforms. It includes the following Firebase libraries:
77

88
|||
99
|--|--|
10-
|[AdMob](https://firebase.google.com/docs/admob/)|[Google Analytics for Firebase](https://firebase.google.com/docs/analytics/)|
10+
|[Google Analytics for Firebase](https://firebase.google.com/docs/analytics/)|
1111
|[Firebase Authentication](https://firebase.google.com/docs/auth/)|[Firebase Realtime Database](https://firebase.google.com/docs/database/)|
1212
|[Firebase Dynamic Links](https://firebase.google.com/docs/dynamic-links/)|[Cloud Firestore](https://firebase.google.com/docs/firestore/)|
1313
|[Cloud Functions for Firebase](https://firebase.google.com/docs/functions/)|[Firebase Invites](https://firebase.google.com/docs/invites/)|
@@ -111,7 +111,6 @@ The CMake following targets are available to build and link with:
111111
| Feature | CMake Target |
112112
| ------- | ------------ |
113113
| App (base library) | firebase_app |
114-
| AdMob | firebase_admob |
115114
| Google Analytics for Firebase | firebase_analytics |
116115
| Firebase Authentication | firebase_auth |
117116
| Firebase Realtime Database | firebase_database |
@@ -217,7 +216,6 @@ release version of each Firebase library is:
217216
| Feature | Gradle Target |
218217
| ------- | ------------- |
219218
| App (base library) | :app:assembleRelease |
220-
| AdMob | :admob:assembleRelease |
221219
| Google Analytics for Firebase | :analytics:assembleRelease |
222220
| Firebase Authentication | :auth:assembleRelease |
223221
| Firebase Realtime Database | :database:assembleRelease |

admob/CMakeLists.txt

Lines changed: 0 additions & 129 deletions
This file was deleted.

admob/admob_additional.pro

Lines changed: 0 additions & 2 deletions
This file was deleted.

admob/admob_resources/AndroidManifest.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

admob/admob_resources/build.gradle

Lines changed: 0 additions & 58 deletions
This file was deleted.

admob/admob_resources/ios_headers/CPPLINT.cfg

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)