Skip to content

Remove Dynamic Links and Invites #1766

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion .github/workflows/cpp-packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -889,7 +889,7 @@ jobs:
-w integration_tests.yml \
-p test_packaged_sdk ${{ github.run_id }} \
-p use_expanded_matrix ${USE_EXPANDED_MATRIX} \
-p apis "analytics,app_check,auth,database,dynamic_links,functions,installations,messaging,remote_config,storage" \
-p apis "analytics,app_check,auth,database,functions,installations,messaging,remote_config,storage" \
-p test_pull_request nightly-packaging \
-s 10 \
-A ${verbose_flag}
Expand Down
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,firestore,functions,gma,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,functions,gma,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
10 changes: 1 addition & 9 deletions Android/firebase_dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ def firebaseDependenciesMap = [
'analytics' : ['com.google.firebase:firebase-analytics'],
'auth' : ['com.google.firebase:firebase-auth'],
'database' : ['com.google.firebase:firebase-database'],
'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',
Expand All @@ -46,8 +45,7 @@ def firebaseDependenciesMap = [
// A map of library to the gradle resources that they depend upon.
def firebaseResourceDependenciesMap = [
'app' : [':app:app_resources',
':app:google_api_resources',
':app:invites_resources'],
':app:google_api_resources'],
'app_check' : [':app_check:app_check_resources'],
'auth' : [':auth:auth_resources'],
'database' : [':database:database_resources'],
Expand Down Expand Up @@ -88,9 +86,6 @@ class Dependencies {
def getDatabase() {
libSet.add('database')
}
def getDynamicLinks() {
libSet.add('dynamic_links')
}
def getFirestore() {
libSet.add('firestore')
}
Expand All @@ -103,9 +98,6 @@ class Dependencies {
def getInstallations() {
libSet.add('installations')
}
def getInvites() {
libSet.add('invites')
}
def getMessaging() {
libSet.add('messaging')
}
Expand Down
9 changes: 1 addition & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@ option(FIREBASE_INCLUDE_AUTH "Include the Firebase Authentication library."
option(FIREBASE_INCLUDE_DATABASE
"Include the Firebase Realtime Database library."
${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
option(FIREBASE_INCLUDE_DYNAMIC_LINKS
"Include the Firebase Dynamic Links library."
${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
option(FIREBASE_INCLUDE_FIRESTORE
"Include the Cloud Firestore library."
${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
Expand Down Expand Up @@ -125,8 +122,7 @@ 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.
set(FIREBASE_INCLUDE_DYNAMIC_LINKS OFF)
# GMA and UMP are not supported on tvOS.
set(FIREBASE_INCLUDE_GMA OFF)
set(FIREBASE_INCLUDE_UMP OFF)
endif()
Expand Down Expand Up @@ -625,9 +621,6 @@ endif()
if (FIREBASE_INCLUDE_DATABASE)
add_subdirectory(database)
endif()
if (FIREBASE_INCLUDE_DYNAMIC_LINKS)
add_subdirectory(dynamic_links)
endif()
if (FIREBASE_INCLUDE_FIRESTORE)
add_subdirectory(firestore)
add_dependencies(FIREBASE_GENERATED_HEADERS FIREBASE_FIRESTORE_GENERATED_HEADERS)
Expand Down
44 changes: 5 additions & 39 deletions app/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,6 @@ binary_to_array("google_api_resources"
"${CMAKE_CURRENT_LIST_DIR}/google_api_resources/build/google_api_resources_lib.jar"
"google_api"
"${FIREBASE_GEN_FILE_DIR}/app")
firebase_cpp_gradle(":app:invites_resources:generateDexJarRelease"
"${CMAKE_CURRENT_LIST_DIR}/invites_resources/build/invites_resources_lib.jar")
binary_to_array("invites_resources"
"${CMAKE_CURRENT_LIST_DIR}/invites_resources/build/invites_resources_lib.jar"
"firebase_invites"
"${FIREBASE_GEN_FILE_DIR}/app")

# Generate version.h
set(version_header_dir ${FIREBASE_GEN_FILE_DIR}/app/src/include/firebase)
set(version_header ${version_header_dir}/version.h)
Expand Down Expand Up @@ -142,32 +135,21 @@ else()
set(mutex_SRCS src/mutex_pthread.cc)
endif()

set(invites_SRCS
src/invites/cached_receiver.cc
src/invites/invites_receiver_internal.cc)

set(app_android_SRCS
src/app_android.cc
src/google_play_services/availability_android.cc
${app_resources_source}
${google_api_resources_source}
${invites_resources_source}
src/invites/android/invites_receiver_internal_android.cc
src/invites/android/invites_android_helper.cc
src/uuid.cc)
set(app_ios_SRCS
src/app_ios.mm
src/util_apple.mm
src/util_ios.mm
src/invites/ios/invites_receiver_internal_ios.mm
src/invites/ios/invites_ios_startup.mm
src/uuid_ios_darwin.mm)
if (PLATFORM STREQUAL TVOS OR PLATFORM STREQUAL SIMULATOR_TVOS)
# TVOS does not have a web browser and does not support dynamic links.
# Remove these files if we are building for TVOS.
list(REMOVE_ITEM app_ios_SRCS
src/invites/ios/invites_receiver_internal_ios.mm
src/invites/ios/invites_ios_startup.mm)
# list(REMOVE_ITEM app_ios_SRCS) # No items to remove anymore
endif()


Expand Down Expand Up @@ -195,7 +177,6 @@ build_flatbuffers("${desktop_flatbuffers_schemas}"

set(app_desktop_SRCS
src/app_desktop.cc
src/invites/stub/invites_receiver_internal_stub.cc
src/variant_util.cc
src/heartbeat/date_provider.cc
src/heartbeat/heartbeat_storage_desktop.cc
Expand Down Expand Up @@ -286,11 +267,7 @@ set(utility_common_HDRS
set(utility_android_HDRS)
set(utility_ios_HDRS)
set(utility_desktop_HDRS
src/variant_util.h
src/invites/cached_receiver.h
src/invites/invites_receiver_internal.h
src/invites/receiver_interface.h
src/invites/sender_receiver_interface.h)
src/variant_util.h)
if(ANDROID)
set(utility_HDRS
"${utility_common_HDRS}"
Expand All @@ -307,15 +284,10 @@ endif()

set(app_android_HDRS
${app_resources_header}
${google_api_resources_header}
${invites_resources_header}
src/invites/android/invites_android_helper.h
src/invites/android/invites_receiver_internal_android.h)
${google_api_resources_header})
set(app_ios_HDRS
src/app_ios.h
src/invites/ios/invites_receiver_internal_ios.h)
set(app_desktop_HDRS
src/invites/stub/invites_receiver_internal_stub.h)
src/app_ios.h)
set(app_desktop_HDRS)
if(ANDROID)
set(app_platform_HDRS
"${app_android_HDRS}")
Expand Down Expand Up @@ -344,7 +316,6 @@ add_library(firebase_app STATIC
${log_SRCS}
${log_HDRS}
${common_SRCS}
${invites_SRCS}
${mutex_SRCS}
${app_platform_SRCS}
${internal_HDRS}
Expand Down Expand Up @@ -419,7 +390,6 @@ elseif(IOS)
POD_NAMES
.
FirebaseCore
FirebaseDynamicLinks
FirebaseInstanceID
)
else()
Expand Down Expand Up @@ -504,9 +474,6 @@ if (IOS)
${FIREBASE_SOURCE_DIR}/database/src/include/firebase/database/mutable_data.h
${FIREBASE_SOURCE_DIR}/database/src/include/firebase/database/query.h
${FIREBASE_SOURCE_DIR}/database/src/include/firebase/database/transaction.h)
set(dynamic_links_HDRS
${FIREBASE_SOURCE_DIR}/dynamic_links/src/include/firebase/dynamic_links.h
${FIREBASE_SOURCE_DIR}/dynamic_links/src/include/firebase/dynamic_links/components.h)
set(firestore_HDRS
${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore.h
${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/aggregate_query.h
Expand Down Expand Up @@ -577,7 +544,6 @@ if (IOS)
${app_check_HDRS}
${auth_HDRS}
${database_HDRS}
${dynamic_links_HDRS}
${firestore_HDRS}
${functions_HDRS}
${gma_HDRS}
Expand Down
72 changes: 0 additions & 72 deletions app/invites_resources/build.gradle

This file was deleted.

Loading
Loading