Skip to content

Commit 6b06df9

Browse files
Remove Dynamic Links and Invites
This commit removes the deprecated Dynamic Links SDK and all related Invites code from the Firebase C++ SDK. Changes made: - Deleted the `dynamic_links` directory. - Deleted `app/src/invites/` and `app/invites_resources/`. - Updated CMakeLists.txt files (root, app, release_build_files) to remove references to `dynamic_links` and `invites`. - Updated Gradle build files (Android/firebase_dependencies.gradle, release_build_files/Android/firebase_dependencies.gradle, settings.gradle) to remove `dynamic_links` and `invites` dependencies and resource references. - Updated build scripts (build_scripts/ios/build.sh, build_scripts/packaging.conf) to remove `dynamic_links`. - Updated GitHub Actions workflows (.github/workflows/cpp-packaging.yml, .github/workflows/integration_tests.yml) to remove `dynamic_links`. Next steps involve removing test configurations and documentation related to Dynamic Links and Invites.
1 parent 648848c commit 6b06df9

File tree

61 files changed

+12
-6959
lines changed

Some content is hidden

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

61 files changed

+12
-6959
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,gma,installations,messaging,remote_config,storage,ump'
20+
default: 'analytics,app_check,auth,database,firestore,functions,gma,installations,messaging,remote_config,storage,ump'
2121
required: true
2222
operating_systems:
2323
description: 'CSV of VMs to run on'
@@ -185,7 +185,7 @@ jobs:
185185
# list. Then we can use fromJson to define the field in the matrix for the tests job.
186186
if [[ "${{ github.event.schedule }}" == "0 9 * * *" ]]; then
187187
# at 1am PST/2am PDT. Running integration tests and generate test report for all testapps except firestore
188-
apis="analytics,app_check,auth,database,dynamic_links,functions,gma,installations,messaging,remote_config,storage,ump"
188+
apis="analytics,app_check,auth,database,functions,gma,installations,messaging,remote_config,storage,ump"
189189
echo "::warning ::Running main nightly tests"
190190
elif [[ "${{ github.event.schedule }}" == "0 10 * * *" || "${{ github.event.schedule }}" == "0 11 * * *" ]]; then
191191
# at 2am PST/3am PDT and 3am PST/4am PDT. Running integration tests for firestore and generate test report.

Android/firebase_dependencies.gradle

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ 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
'gma' : ['com.google.android.gms:play-services-ads:23.0.0',
@@ -46,8 +45,7 @@ def firebaseDependenciesMap = [
4645
// A map of library to the gradle resources that they depend upon.
4746
def firebaseResourceDependenciesMap = [
4847
'app' : [':app:app_resources',
49-
':app:google_api_resources',
50-
':app:invites_resources'],
48+
':app:google_api_resources'],
5149
'app_check' : [':app_check:app_check_resources'],
5250
'auth' : [':auth:auth_resources'],
5351
'database' : [':database:database_resources'],
@@ -88,9 +86,6 @@ class Dependencies {
8886
def getDatabase() {
8987
libSet.add('database')
9088
}
91-
def getDynamicLinks() {
92-
libSet.add('dynamic_links')
93-
}
9489
def getFirestore() {
9590
libSet.add('firestore')
9691
}
@@ -103,9 +98,6 @@ class Dependencies {
10398
def getInstallations() {
10499
libSet.add('installations')
105100
}
106-
def getInvites() {
107-
libSet.add('invites')
108-
}
109101
def getMessaging() {
110102
libSet.add('messaging')
111103
}

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})
@@ -125,8 +122,7 @@ if(FIREBASE_CPP_BUILD_TESTS OR FIREBASE_CPP_BUILD_STUB_TESTS)
125122
endif()
126123

127124
if (PLATFORM STREQUAL TVOS OR PLATFORM STREQUAL SIMULATOR_TVOS)
128-
# GMA, UMP, and FDL are not supported on tvOS.
129-
set(FIREBASE_INCLUDE_DYNAMIC_LINKS OFF)
125+
# GMA and UMP are not supported on tvOS.
130126
set(FIREBASE_INCLUDE_GMA OFF)
131127
set(FIREBASE_INCLUDE_UMP OFF)
132128
endif()
@@ -625,9 +621,6 @@ endif()
625621
if (FIREBASE_INCLUDE_DATABASE)
626622
add_subdirectory(database)
627623
endif()
628-
if (FIREBASE_INCLUDE_DYNAMIC_LINKS)
629-
add_subdirectory(dynamic_links)
630-
endif()
631624
if (FIREBASE_INCLUDE_FIRESTORE)
632625
add_subdirectory(firestore)
633626
add_dependencies(FIREBASE_GENERATED_HEADERS FIREBASE_FIRESTORE_GENERATED_HEADERS)

app/CMakeLists.txt

Lines changed: 5 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +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")
42-
4336
# Generate version.h
4437
set(version_header_dir ${FIREBASE_GEN_FILE_DIR}/app/src/include/firebase)
4538
set(version_header ${version_header_dir}/version.h)
@@ -142,32 +135,21 @@ else()
142135
set(mutex_SRCS src/mutex_pthread.cc)
143136
endif()
144137

145-
set(invites_SRCS
146-
src/invites/cached_receiver.cc
147-
src/invites/invites_receiver_internal.cc)
148-
149138
set(app_android_SRCS
150139
src/app_android.cc
151140
src/google_play_services/availability_android.cc
152141
${app_resources_source}
153142
${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
157143
src/uuid.cc)
158144
set(app_ios_SRCS
159145
src/app_ios.mm
160146
src/util_apple.mm
161147
src/util_ios.mm
162-
src/invites/ios/invites_receiver_internal_ios.mm
163-
src/invites/ios/invites_ios_startup.mm
164148
src/uuid_ios_darwin.mm)
165149
if (PLATFORM STREQUAL TVOS OR PLATFORM STREQUAL SIMULATOR_TVOS)
166150
# TVOS does not have a web browser and does not support dynamic links.
167151
# 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)
152+
# list(REMOVE_ITEM app_ios_SRCS) # No items to remove anymore
171153
endif()
172154

173155

@@ -195,7 +177,6 @@ build_flatbuffers("${desktop_flatbuffers_schemas}"
195177

196178
set(app_desktop_SRCS
197179
src/app_desktop.cc
198-
src/invites/stub/invites_receiver_internal_stub.cc
199180
src/variant_util.cc
200181
src/heartbeat/date_provider.cc
201182
src/heartbeat/heartbeat_storage_desktop.cc
@@ -286,11 +267,7 @@ set(utility_common_HDRS
286267
set(utility_android_HDRS)
287268
set(utility_ios_HDRS)
288269
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)
270+
src/variant_util.h)
294271
if(ANDROID)
295272
set(utility_HDRS
296273
"${utility_common_HDRS}"
@@ -307,15 +284,10 @@ endif()
307284

308285
set(app_android_HDRS
309286
${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)
287+
${google_api_resources_header})
314288
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)
289+
src/app_ios.h)
290+
set(app_desktop_HDRS)
319291
if(ANDROID)
320292
set(app_platform_HDRS
321293
"${app_android_HDRS}")
@@ -344,7 +316,6 @@ add_library(firebase_app STATIC
344316
${log_SRCS}
345317
${log_HDRS}
346318
${common_SRCS}
347-
${invites_SRCS}
348319
${mutex_SRCS}
349320
${app_platform_SRCS}
350321
${internal_HDRS}
@@ -419,7 +390,6 @@ elseif(IOS)
419390
POD_NAMES
420391
.
421392
FirebaseCore
422-
FirebaseDynamicLinks
423393
FirebaseInstanceID
424394
)
425395
else()
@@ -504,9 +474,6 @@ if (IOS)
504474
${FIREBASE_SOURCE_DIR}/database/src/include/firebase/database/mutable_data.h
505475
${FIREBASE_SOURCE_DIR}/database/src/include/firebase/database/query.h
506476
${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)
510477
set(firestore_HDRS
511478
${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore.h
512479
${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/aggregate_query.h
@@ -577,7 +544,6 @@ if (IOS)
577544
${app_check_HDRS}
578545
${auth_HDRS}
579546
${database_HDRS}
580-
${dynamic_links_HDRS}
581547
${firestore_HDRS}
582548
${functions_HDRS}
583549
${gma_HDRS}

app/invites_resources/build.gradle

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

0 commit comments

Comments
 (0)