Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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,installations,messaging,remote_config,storage,ump'
default: 'analytics,app_check,auth,database,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,installations,messaging,remote_config,storage,ump"
apis="analytics,app_check,auth,database,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
2 changes: 1 addition & 1 deletion AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ API documentation.
Firebase project's Realtime Database rules. Without these indexes, queries
may fail or not return expected results.
* **iOS Method Swizzling**: Be aware that some Firebase products on iOS
(e.g., Dynamic Links, Cloud Messaging) use method swizzling to
(e.g., Cloud Messaging) use method swizzling to
automatically attach handlers to your `AppDelegate`. While this simplifies
integration, it can occasionally be a factor to consider when debugging app
delegate behavior or integrating with other libraries that also perform
Expand Down
11 changes: 1 addition & 10 deletions Android/firebase_dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,9 @@ 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'],
'installations' : ['com.google.firebase:firebase-installations'],
'invites' : ['com.google.firebase:firebase-invites'],
// Messaging has an additional local dependency to include.
'messaging' : ['com.google.firebase:firebase-messaging',
'firebase_cpp_sdk.messaging:messaging_java',
Expand All @@ -44,8 +42,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 @@ -85,9 +82,6 @@ class Dependencies {
def getDatabase() {
libSet.add('database')
}
def getDynamicLinks() {
libSet.add('dynamic_links')
}
def getFirestore() {
libSet.add('firestore')
}
Expand All @@ -97,9 +91,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 @@ -123,8 +120,7 @@ if(FIREBASE_CPP_BUILD_TESTS OR FIREBASE_CPP_BUILD_STUB_TESTS)
endif()

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

Expand Down Expand Up @@ -622,9 +618,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
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ 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 Firestore](https://firebase.google.com/docs/firestore/)|
|[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/)|

Expand Down Expand Up @@ -113,7 +113,6 @@ The CMake following targets are available to build and link with:
| Google Analytics for Firebase | firebase_analytics |
| Firebase Authentication | firebase_auth |
| Firebase Realtime Database | firebase_database |
| Firebase Dynamic Links | firebase_dynamic_links |
| Cloud Firestore | firebase_firestore |
| Cloud Functions for Firebase | firebase_functions |
| Firebase Cloud Messaging | firebase_messaging |
Expand Down Expand Up @@ -217,7 +216,6 @@ release version of each Firebase library is:
| Google Analytics for Firebase | :analytics:assembleRelease |
| Firebase Authentication | :auth:assembleRelease |
| Firebase Realtime Database | :database:assembleRelease |
| Firebase Dynamic Links | :dynamic_links:assembleRelease |
| Cloud Firestore | :firestore:assembleRelease |
| Cloud Functions for Firebase | :functions:assembleRelease |
| Firebase Cloud Messaging | :messaging:assembleRelease |
Expand Down
12 changes: 0 additions & 12 deletions android_build_files/generate_proguard.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -103,23 +103,11 @@ def defineGenerateProguardFile(String subproject, String buildType,
}
FileTree proguardFileTree = fileTree("$proguardSearchDir")
.matching({ include "**/*.pro" })
// The app directory contains invites, which we don't want to include in
// the app proguard file.
if ("${subproject}" == "app") {
proguardFileTree = proguardFileTree.matching({ exclude "*invites*" })
}
// We don't want to include proguard files from any external libraries.
proguardFileTree =
proguardFileTree.matching({ exclude "**/external/src/**" })
Set<File> proguardSet = proguardFileTree.getFiles()

// On the other hand, if building dynamic_links or invites, we want to
// include the invites proguard file contained in app.
if ("${subproject}" == "dynamic_links" || "${subproject}" == "invites") {
FileTree invitesResourceTree = fileTree("$proguardSearchDir/../app")
.matching({ include "**/invites_resources.pro" })
proguardSet.addAll(invitesResourceTree.getFiles())
}
// The proguard file generated from the C++ library might not be in the
// search directory, so add it if it is missing.
File cppProguardFile = new File(cppProguard)
Expand Down
46 changes: 4 additions & 42 deletions app/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +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)
Expand Down Expand Up @@ -142,33 +136,17 @@ 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)
endif()


# Flatbuffer schemas used by the desktop implementation.
Expand All @@ -195,7 +173,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 +263,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 +280,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 +312,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 +386,6 @@ elseif(IOS)
POD_NAMES
.
FirebaseCore
FirebaseDynamicLinks
FirebaseInstanceID
)
else()
Expand Down Expand Up @@ -504,9 +470,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 @@ -566,7 +529,6 @@ if (IOS)
${app_check_HDRS}
${auth_HDRS}
${database_HDRS}
${dynamic_links_HDRS}
${firestore_HDRS}
${functions_HDRS}
${installations_HDRS}
Expand Down
1 change: 0 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ project.afterEvaluate {
generateProguardFile('app')
setupDexDependencies(':app:app_resources')
setupDexDependencies(':app:google_api_resources')
setupDexDependencies(':app:invites_resources')
project.tasks.withType(com.android.build.gradle.internal.tasks.CheckAarMetadataTask) {
enabled = false
}
Expand Down
72 changes: 0 additions & 72 deletions app/invites_resources/build.gradle

This file was deleted.

Loading
Loading