Skip to content

Commit 4acaa04

Browse files
authored
Remove deprecated Dynamic Links library (#1774)
1 parent 2d52424 commit 4acaa04

File tree

81 files changed

+26
-7194
lines changed

Some content is hidden

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

81 files changed

+26
-7194
lines changed

.github/workflows/cpp-packaging.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -889,7 +889,7 @@ jobs:
889889
-w integration_tests.yml \
890890
-p test_packaged_sdk ${{ github.run_id }} \
891891
-p use_expanded_matrix ${USE_EXPANDED_MATRIX} \
892-
-p apis "analytics,app_check,auth,database,dynamic_links,functions,installations,messaging,remote_config,storage" \
892+
-p apis "analytics,app_check,auth,database,functions,installations,messaging,remote_config,storage" \
893893
-p test_pull_request nightly-packaging \
894894
-s 10 \
895895
-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: 'analytics,app_check,auth,database,dynamic_links,firestore,functions,installations,messaging,remote_config,storage,ump'
20+
default: 'analytics,app_check,auth,database,firestore,functions,installations,messaging,remote_config,storage,ump'
2121
required: true
2222
operating_systems:
2323
description: 'CSV of VMs to run on'
@@ -186,7 +186,7 @@ jobs:
186186
# list. Then we can use fromJson to define the field in the matrix for the tests job.
187187
if [[ "${{ github.event.schedule }}" == "0 9 * * *" ]]; then
188188
# at 1am PST/2am PDT. Running integration tests and generate test report for all testapps except firestore
189-
apis="analytics,app_check,auth,database,dynamic_links,functions,installations,messaging,remote_config,storage,ump"
189+
apis="analytics,app_check,auth,database,functions,installations,messaging,remote_config,storage,ump"
190190
echo "::warning ::Running main nightly tests"
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.

AGENTS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ API documentation.
451451
Firebase project's Realtime Database rules. Without these indexes, queries
452452
may fail or not return expected results.
453453
* **iOS Method Swizzling**: Be aware that some Firebase products on iOS
454-
(e.g., Dynamic Links, Cloud Messaging) use method swizzling to
454+
(e.g., Cloud Messaging) use method swizzling to
455455
automatically attach handlers to your `AppDelegate`. While this simplifies
456456
integration, it can occasionally be a factor to consider when debugging app
457457
delegate behavior or integrating with other libraries that also perform

Android/firebase_dependencies.gradle

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,9 @@ def firebaseDependenciesMap = [
2424
'analytics' : ['com.google.firebase:firebase-analytics'],
2525
'auth' : ['com.google.firebase:firebase-auth'],
2626
'database' : ['com.google.firebase:firebase-database'],
27-
'dynamic_links' : ['com.google.firebase:firebase-dynamic-links'],
2827
'firestore' : ['com.google.firebase:firebase-firestore'],
2928
'functions' : ['com.google.firebase:firebase-functions'],
3029
'installations' : ['com.google.firebase:firebase-installations'],
31-
'invites' : ['com.google.firebase:firebase-invites'],
3230
// Messaging has an additional local dependency to include.
3331
'messaging' : ['com.google.firebase:firebase-messaging',
3432
'firebase_cpp_sdk.messaging:messaging_java',
@@ -44,8 +42,7 @@ def firebaseDependenciesMap = [
4442
// A map of library to the gradle resources that they depend upon.
4543
def firebaseResourceDependenciesMap = [
4644
'app' : [':app:app_resources',
47-
':app:google_api_resources',
48-
':app:invites_resources'],
45+
':app:google_api_resources'],
4946
'app_check' : [':app_check:app_check_resources'],
5047
'auth' : [':auth:auth_resources'],
5148
'database' : [':database:database_resources'],
@@ -85,9 +82,6 @@ class Dependencies {
8582
def getDatabase() {
8683
libSet.add('database')
8784
}
88-
def getDynamicLinks() {
89-
libSet.add('dynamic_links')
90-
}
9185
def getFirestore() {
9286
libSet.add('firestore')
9387
}
@@ -97,9 +91,6 @@ class Dependencies {
9791
def getInstallations() {
9892
libSet.add('installations')
9993
}
100-
def getInvites() {
101-
libSet.add('invites')
102-
}
10394
def getMessaging() {
10495
libSet.add('messaging')
10596
}

CMakeLists.txt

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ option(FIREBASE_INCLUDE_AUTH "Include the Firebase Authentication library."
3939
option(FIREBASE_INCLUDE_DATABASE
4040
"Include the Firebase Realtime Database library."
4141
${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
42-
option(FIREBASE_INCLUDE_DYNAMIC_LINKS
43-
"Include the Firebase Dynamic Links library."
44-
${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
4542
option(FIREBASE_INCLUDE_FIRESTORE
4643
"Include the Cloud Firestore library."
4744
${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
@@ -123,8 +120,7 @@ if(FIREBASE_CPP_BUILD_TESTS OR FIREBASE_CPP_BUILD_STUB_TESTS)
123120
endif()
124121

125122
if (PLATFORM STREQUAL TVOS OR PLATFORM STREQUAL SIMULATOR_TVOS)
126-
# UMP and FDL are not supported on tvOS.
127-
set(FIREBASE_INCLUDE_DYNAMIC_LINKS OFF)
123+
# UMP is not supported on tvOS.
128124
set(FIREBASE_INCLUDE_UMP OFF)
129125
endif()
130126

@@ -622,9 +618,6 @@ endif()
622618
if (FIREBASE_INCLUDE_DATABASE)
623619
add_subdirectory(database)
624620
endif()
625-
if (FIREBASE_INCLUDE_DYNAMIC_LINKS)
626-
add_subdirectory(dynamic_links)
627-
endif()
628621
if (FIREBASE_INCLUDE_FIRESTORE)
629622
add_subdirectory(firestore)
630623
add_dependencies(FIREBASE_GENERATED_HEADERS FIREBASE_FIRESTORE_GENERATED_HEADERS)

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ iOS, and desktop platforms. It includes the following Firebase libraries:
99
|--|--|
1010
|[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/)|
12-
|[Firebase Dynamic Links](https://firebase.google.com/docs/dynamic-links/)|[Cloud Firestore](https://firebase.google.com/docs/firestore/)|
12+
|[Cloud Firestore](https://firebase.google.com/docs/firestore/)|
1313
|[Cloud Functions for Firebase](https://firebase.google.com/docs/functions/)|[Firebase Cloud Messaging](https://firebase.google.com/docs/cloud-messaging/)|
1414
|[Firebase Remote Config](https://firebase.google.com/docs/remote-config/)|[Cloud Storage for Firebase](https://firebase.google.com/docs/storage/)|
1515

@@ -113,7 +113,6 @@ The CMake following targets are available to build and link with:
113113
| Google Analytics for Firebase | firebase_analytics |
114114
| Firebase Authentication | firebase_auth |
115115
| Firebase Realtime Database | firebase_database |
116-
| Firebase Dynamic Links | firebase_dynamic_links |
117116
| Cloud Firestore | firebase_firestore |
118117
| Cloud Functions for Firebase | firebase_functions |
119118
| Firebase Cloud Messaging | firebase_messaging |
@@ -217,7 +216,6 @@ release version of each Firebase library is:
217216
| Google Analytics for Firebase | :analytics:assembleRelease |
218217
| Firebase Authentication | :auth:assembleRelease |
219218
| Firebase Realtime Database | :database:assembleRelease |
220-
| Firebase Dynamic Links | :dynamic_links:assembleRelease |
221219
| Cloud Firestore | :firestore:assembleRelease |
222220
| Cloud Functions for Firebase | :functions:assembleRelease |
223221
| Firebase Cloud Messaging | :messaging:assembleRelease |

android_build_files/generate_proguard.gradle

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -103,23 +103,11 @@ def defineGenerateProguardFile(String subproject, String buildType,
103103
}
104104
FileTree proguardFileTree = fileTree("$proguardSearchDir")
105105
.matching({ include "**/*.pro" })
106-
// The app directory contains invites, which we don't want to include in
107-
// the app proguard file.
108-
if ("${subproject}" == "app") {
109-
proguardFileTree = proguardFileTree.matching({ exclude "*invites*" })
110-
}
111106
// We don't want to include proguard files from any external libraries.
112107
proguardFileTree =
113108
proguardFileTree.matching({ exclude "**/external/src/**" })
114109
Set<File> proguardSet = proguardFileTree.getFiles()
115110

116-
// On the other hand, if building dynamic_links or invites, we want to
117-
// include the invites proguard file contained in app.
118-
if ("${subproject}" == "dynamic_links" || "${subproject}" == "invites") {
119-
FileTree invitesResourceTree = fileTree("$proguardSearchDir/../app")
120-
.matching({ include "**/invites_resources.pro" })
121-
proguardSet.addAll(invitesResourceTree.getFiles())
122-
}
123111
// The proguard file generated from the C++ library might not be in the
124112
// search directory, so add it if it is missing.
125113
File cppProguardFile = new File(cppProguard)

app/CMakeLists.txt

Lines changed: 4 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,6 @@ binary_to_array("google_api_resources"
3333
"${CMAKE_CURRENT_LIST_DIR}/google_api_resources/build/google_api_resources_lib.jar"
3434
"google_api"
3535
"${FIREBASE_GEN_FILE_DIR}/app")
36-
firebase_cpp_gradle(":app:invites_resources:generateDexJarRelease"
37-
"${CMAKE_CURRENT_LIST_DIR}/invites_resources/build/invites_resources_lib.jar")
38-
binary_to_array("invites_resources"
39-
"${CMAKE_CURRENT_LIST_DIR}/invites_resources/build/invites_resources_lib.jar"
40-
"firebase_invites"
41-
"${FIREBASE_GEN_FILE_DIR}/app")
4236

4337
# Generate version.h
4438
set(version_header_dir ${FIREBASE_GEN_FILE_DIR}/app/src/include/firebase)
@@ -142,33 +136,17 @@ else()
142136
set(mutex_SRCS src/mutex_pthread.cc)
143137
endif()
144138

145-
set(invites_SRCS
146-
src/invites/cached_receiver.cc
147-
src/invites/invites_receiver_internal.cc)
148-
149139
set(app_android_SRCS
150140
src/app_android.cc
151141
src/google_play_services/availability_android.cc
152142
${app_resources_source}
153143
${google_api_resources_source}
154-
${invites_resources_source}
155-
src/invites/android/invites_receiver_internal_android.cc
156-
src/invites/android/invites_android_helper.cc
157144
src/uuid.cc)
158145
set(app_ios_SRCS
159146
src/app_ios.mm
160147
src/util_apple.mm
161148
src/util_ios.mm
162-
src/invites/ios/invites_receiver_internal_ios.mm
163-
src/invites/ios/invites_ios_startup.mm
164149
src/uuid_ios_darwin.mm)
165-
if (PLATFORM STREQUAL TVOS OR PLATFORM STREQUAL SIMULATOR_TVOS)
166-
# TVOS does not have a web browser and does not support dynamic links.
167-
# Remove these files if we are building for TVOS.
168-
list(REMOVE_ITEM app_ios_SRCS
169-
src/invites/ios/invites_receiver_internal_ios.mm
170-
src/invites/ios/invites_ios_startup.mm)
171-
endif()
172150

173151

174152
# Flatbuffer schemas used by the desktop implementation.
@@ -195,7 +173,6 @@ build_flatbuffers("${desktop_flatbuffers_schemas}"
195173

196174
set(app_desktop_SRCS
197175
src/app_desktop.cc
198-
src/invites/stub/invites_receiver_internal_stub.cc
199176
src/variant_util.cc
200177
src/heartbeat/date_provider.cc
201178
src/heartbeat/heartbeat_storage_desktop.cc
@@ -286,11 +263,7 @@ set(utility_common_HDRS
286263
set(utility_android_HDRS)
287264
set(utility_ios_HDRS)
288265
set(utility_desktop_HDRS
289-
src/variant_util.h
290-
src/invites/cached_receiver.h
291-
src/invites/invites_receiver_internal.h
292-
src/invites/receiver_interface.h
293-
src/invites/sender_receiver_interface.h)
266+
src/variant_util.h)
294267
if(ANDROID)
295268
set(utility_HDRS
296269
"${utility_common_HDRS}"
@@ -307,15 +280,10 @@ endif()
307280

308281
set(app_android_HDRS
309282
${app_resources_header}
310-
${google_api_resources_header}
311-
${invites_resources_header}
312-
src/invites/android/invites_android_helper.h
313-
src/invites/android/invites_receiver_internal_android.h)
283+
${google_api_resources_header})
314284
set(app_ios_HDRS
315-
src/app_ios.h
316-
src/invites/ios/invites_receiver_internal_ios.h)
317-
set(app_desktop_HDRS
318-
src/invites/stub/invites_receiver_internal_stub.h)
285+
src/app_ios.h)
286+
set(app_desktop_HDRS)
319287
if(ANDROID)
320288
set(app_platform_HDRS
321289
"${app_android_HDRS}")
@@ -344,7 +312,6 @@ add_library(firebase_app STATIC
344312
${log_SRCS}
345313
${log_HDRS}
346314
${common_SRCS}
347-
${invites_SRCS}
348315
${mutex_SRCS}
349316
${app_platform_SRCS}
350317
${internal_HDRS}
@@ -419,7 +386,6 @@ elseif(IOS)
419386
POD_NAMES
420387
.
421388
FirebaseCore
422-
FirebaseDynamicLinks
423389
FirebaseInstanceID
424390
)
425391
else()
@@ -504,9 +470,6 @@ if (IOS)
504470
${FIREBASE_SOURCE_DIR}/database/src/include/firebase/database/mutable_data.h
505471
${FIREBASE_SOURCE_DIR}/database/src/include/firebase/database/query.h
506472
${FIREBASE_SOURCE_DIR}/database/src/include/firebase/database/transaction.h)
507-
set(dynamic_links_HDRS
508-
${FIREBASE_SOURCE_DIR}/dynamic_links/src/include/firebase/dynamic_links.h
509-
${FIREBASE_SOURCE_DIR}/dynamic_links/src/include/firebase/dynamic_links/components.h)
510473
set(firestore_HDRS
511474
${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore.h
512475
${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/aggregate_query.h
@@ -566,7 +529,6 @@ if (IOS)
566529
${app_check_HDRS}
567530
${auth_HDRS}
568531
${database_HDRS}
569-
${dynamic_links_HDRS}
570532
${firestore_HDRS}
571533
${functions_HDRS}
572534
${installations_HDRS}

app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ project.afterEvaluate {
8080
generateProguardFile('app')
8181
setupDexDependencies(':app:app_resources')
8282
setupDexDependencies(':app:google_api_resources')
83-
setupDexDependencies(':app:invites_resources')
8483
project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) {
8584
enabled = false
8685
}

app/invites_resources/build.gradle

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

0 commit comments

Comments
 (0)