Skip to content

Commit 2af7dc2

Browse files
a-mauricea-maurice
committed
Update open source build with recent changes
Updates the pod version numbers, removes iid from app, removes the invites library, adds a requirement on libsecret to the auth CMake file PiperOrigin-RevId: 246434625
1 parent 49c633c commit 2af7dc2

File tree

13 files changed

+43
-33
lines changed

13 files changed

+43
-33
lines changed

‎CMakeLists.txt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ option(FIREBASE_INCLUDE_FUNCTIONS
3131
"Include the Cloud Functions for Firebase library." ON)
3232
option(FIREBASE_INCLUDE_INSTANCE_ID
3333
"Include the Firebase Instance ID library." ON)
34-
option(FIREBASE_INCLUDE_INVITES "Include the Firebase Invites library." ON)
3534
option(FIREBASE_INCLUDE_MESSAGING
3635
"Include the Firebase Cloud Messaging library." ON)
3736
option(FIREBASE_INCLUDE_REMOTE_CONFIG
@@ -270,9 +269,6 @@ endif()
270269
if (FIREBASE_INCLUDE_INSTANCE_ID)
271270
add_subdirectory(instance_id)
272271
endif()
273-
if (FIREBASE_INCLUDE_INVITES)
274-
add_subdirectory(invites)
275-
endif()
276272
if (FIREBASE_INCLUDE_MESSAGING)
277273
add_subdirectory(messaging)
278274
endif()

‎admob/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ if(IOS)
117117
set(pod_target_name "download_admob_pod_headers")
118118
set(pods_dir "${PROJECT_BINARY_DIR}/Pods")
119119
set(pod_list "")
120-
list(APPEND pod_list "'Firebase/AdMob', '5.20.2'")
120+
list(APPEND pod_list "'Firebase/AdMob', '6.0.0'")
121121

122122
setup_pod_headers_target("${pod_target_name}" "${pods_dir}" "${pod_list}")
123123

‎analytics/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ if(IOS)
130130
set(pod_target_name "download_analytics_pod_headers")
131131
set(pods_dir "${PROJECT_BINARY_DIR}/Pods")
132132
set(pod_list "")
133-
list(APPEND pod_list "'Firebase/Core', '5.20.2'")
134-
list(APPEND pod_list "'Firebase/Analytics', '5.20.2'")
133+
list(APPEND pod_list "'Firebase/Core', '6.0.0'")
134+
list(APPEND pod_list "'Firebase/Analytics', '6.0.0'")
135135

136136
setup_pod_headers_target("${pod_target_name}" "${pods_dir}" "${pod_list}")
137137

‎app/CMakeLists.txt‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ set(invites_SRCS
128128

129129
set(app_android_SRCS
130130
src/app_android.cc
131-
src/iid_android.cc
132131
src/google_play_services/availability_android.cc
133132
${app_resources_source}
134133
${google_api_resources_source}
@@ -137,13 +136,11 @@ set(app_android_SRCS
137136
src/invites/android/invites_android_helper.cc)
138137
set(app_ios_SRCS
139138
src/app_ios.mm
140-
src/iid_ios.mm
141139
src/util_ios.mm
142140
src/invites/ios/invites_receiver_internal_ios.mm
143141
src/invites/ios/invites_ios_startup.mm)
144142
set(app_desktop_SRCS
145143
src/app_desktop.cc
146-
src/iid_stub.cc
147144
src/invites/stub/invites_receiver_internal_stub.cc
148145
src/variant_util.cc)
149146
if(ANDROID)
@@ -176,7 +173,6 @@ set(utility_common_HDRS
176173
src/cleanup_notifier.h
177174
src/function_registry.h
178175
src/future_manager.h
179-
src/iid.h
180176
src/log.h
181177
src/mutex.h
182178
src/optional.h
@@ -281,8 +277,8 @@ if(IOS)
281277
set(pod_target_name "download_app_pod_headers")
282278
set(pods_dir "${PROJECT_BINARY_DIR}/Pods")
283279
set(pod_list "")
284-
list(APPEND pod_list "'Firebase/Core', '5.20.2'")
285-
list(APPEND pod_list "'Firebase/DynamicLinks', '5.20.2'")
280+
list(APPEND pod_list "'Firebase/Core', '6.0.0'")
281+
list(APPEND pod_list "'Firebase/DynamicLinks', '6.0.0'")
286282

287283
setup_pod_headers_target("${pod_target_name}" "${pods_dir}" "${pod_list}")
288284

‎auth/CMakeLists.txt‎

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
cmake_minimum_required (VERSION 3.1)
1818
set (CMAKE_CXX_STANDARD 11)
1919

20+
include(FindPkgConfig)
2021
include(binary_to_array)
2122
include(download_pod_headers)
2223

@@ -132,7 +133,8 @@ set(desktop_SRCS
132133
src/desktop/rpcs/sign_up_new_user_request.cc
133134
src/desktop/rpcs/verify_assertion_request.cc
134135
src/desktop/rpcs/verify_custom_token_request.cc
135-
src/desktop/rpcs/verify_password_request.cc)
136+
src/desktop/rpcs/verify_password_request.cc
137+
src/desktop/secure/user_secure_manager.cc)
136138

137139
if(ANDROID)
138140
set(auth_platform_SRCS
@@ -141,18 +143,35 @@ elseif(IOS)
141143
set(auth_platform_SRCS
142144
"${ios_SRCS}")
143145
else()
146+
if(MSVC)
147+
set(desktop_extra_SRCS
148+
src/desktop/secure/user_secure_windows_internal.cc)
149+
elseif(APPLE)
150+
set(desktop_extra_SRCS
151+
src/desktop/secure/user_secure_darwin_internal.mm)
152+
else()
153+
pkg_check_modules(LIBSECRET libsecret-1 REQUIRED)
154+
155+
set(desktop_extra_SRCS
156+
src/desktop/secure/user_secure_linux_internal.cc)
157+
endif()
158+
144159
set(auth_platform_SRCS
145-
"${desktop_SRCS}")
160+
"${desktop_SRCS}"
161+
"${desktop_extra_SRCS}")
146162
endif()
147163

148164
if(ANDROID OR IOS)
149165
set(additional_include_DIR)
150166
set(additional_link_LIB)
167+
set(additional_target_definitions)
151168
else()
152169
set(additional_include_DIR
153-
${flatbuffers_SOURCE_DIR}/include)
170+
${flatbuffers_SOURCE_DIR}/include
171+
${LIBSECRET_INCLUDE_DIRS})
154172
set(additional_link_LIB
155-
firebase_rest_lib)
173+
firebase_rest_lib
174+
${LIBSECRET_LIBRARIES})
156175
endif()
157176

158177
add_library(firebase_auth STATIC
@@ -197,8 +216,8 @@ if(IOS)
197216
set(pod_target_name "download_auth_pod_headers")
198217
set(pods_dir "${PROJECT_BINARY_DIR}/Pods")
199218
set(pod_list "")
200-
list(APPEND pod_list "'Firebase/Core', '5.20.2'")
201-
list(APPEND pod_list "'Firebase/Auth', '5.20.2'")
219+
list(APPEND pod_list "'Firebase/Core', '6.0.0'")
220+
list(APPEND pod_list "'Firebase/Auth', '6.0.0'")
202221

203222
setup_pod_headers_target("${pod_target_name}" "${pods_dir}" "${pod_list}")
204223

‎database/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@ if(IOS)
200200
set(pod_target_name "download_database_pod_headers")
201201
set(pods_dir "${PROJECT_BINARY_DIR}/Pods")
202202
set(pod_list "")
203-
list(APPEND pod_list "'Firebase/Core', '5.20.2'")
204-
list(APPEND pod_list "'Firebase/Database', '5.20.2'")
203+
list(APPEND pod_list "'Firebase/Core', '6.0.0'")
204+
list(APPEND pod_list "'Firebase/Database', '6.0.0'")
205205

206206
setup_pod_headers_target("${pod_target_name}" "${pods_dir}" "${pod_list}")
207207

‎dynamic_links/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ if(IOS)
8989
set(pod_target_name "download_dynamic_links_pod_headers")
9090
set(pods_dir "${PROJECT_BINARY_DIR}/Pods")
9191
set(pod_list "")
92-
list(APPEND pod_list "'Firebase/DynamicLinks', '5.20.2'")
92+
list(APPEND pod_list "'Firebase/DynamicLinks', '6.0.0'")
9393

9494
setup_pod_headers_target("${pod_target_name}" "${pods_dir}" "${pod_list}")
9595

‎functions/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ if(IOS)
106106
set(pod_target_name "download_functions_pod_headers")
107107
set(pods_dir "${PROJECT_BINARY_DIR}/Pods")
108108
set(pod_list "")
109-
list(APPEND pod_list "'Firebase/Core', '5.20.2'")
110-
list(APPEND pod_list "'Firebase/Functions', '5.20.2'")
109+
list(APPEND pod_list "'Firebase/Core', '6.0.0'")
110+
list(APPEND pod_list "'Firebase/Functions', '6.0.0'")
111111

112112
setup_pod_headers_target("${pod_target_name}" "${pods_dir}" "${pod_list}")
113113

‎instance_id/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ if(IOS)
9393
set(pod_target_name "download_instance_id_pod_headers")
9494
set(pods_dir "${PROJECT_BINARY_DIR}/Pods")
9595
set(pod_list "")
96-
list(APPEND pod_list "'Firebase/Core', '5.20.2'")
97-
list(APPEND pod_list "'FirebaseInstanceID', '3.8.1'")
96+
list(APPEND pod_list "'Firebase/Core', '6.0.0'")
97+
list(APPEND pod_list "'FirebaseInstanceID', '4.0.0'")
9898

9999
setup_pod_headers_target("${pod_target_name}" "${pods_dir}" "${pod_list}")
100100

‎messaging/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ if(IOS)
122122
set(pod_target_name "download_messaging_pod_headers")
123123
set(pods_dir "${PROJECT_BINARY_DIR}/Pods")
124124
set(pod_list "")
125-
list(APPEND pod_list "'Firebase/Core', '5.20.2'")
126-
list(APPEND pod_list "'Firebase/Messaging', '5.20.2'")
125+
list(APPEND pod_list "'Firebase/Core', '6.0.0'")
126+
list(APPEND pod_list "'Firebase/Messaging', '6.0.0'")
127127

128128
setup_pod_headers_target("${pod_target_name}" "${pods_dir}" "${pod_list}")
129129

0 commit comments

Comments
 (0)