Skip to content

Commit f86cf29

Browse files
committed
Updates for Android (configureWithOptions without firebase setup throws run-time error, not compile-time
1 parent a941c3d commit f86cf29

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

android/src/main/java/io/fullstack/firestack/FirestackModule.java

+4
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ public void configureWithOptions(final ReadableMap params, @Nullable final Callb
5353
FirebaseOptions.Builder builder = new FirebaseOptions.Builder();
5454
FirebaseOptions defaultOptions = FirebaseOptions.fromResource(this.context);
5555

56+
if (defaultOptions == null) {
57+
defaultOptions = new FirebaseOptions.Builder().build();
58+
}
59+
5660
KeySetterFn fn = new KeySetterFn() {
5761
public String setKeyOrDefault(
5862
final String key,

ios/Firestack.xcodeproj/project.pbxproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -250,14 +250,14 @@
250250
FRAMEWORK_SEARCH_PATHS = (
251251
"$(inherited)",
252252
"${BUILT_PRODUCTS_DIR}",
253-
"${PROJECT_DIR}/../../../ios/Pods",
253+
"${PROJECT_DIR}/../../../ios/Pods/**",
254254
);
255255
HEADER_SEARCH_PATHS = (
256256
"$(inherited)",
257257
"$(SRCROOT)/../../React/**",
258258
"$(SRCROOT)/../../node_modules/react-native/React/**",
259259
"$(SRCROOT)/../../react-native/React/**",
260-
"${PROJECT_DIR}/../../../ios/Pods/**",
260+
"${SRCROOT}/../../../ios/Pods/**",
261261
);
262262
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
263263
LIBRARY_SEARCH_PATHS = "$(inherited)";
@@ -278,14 +278,14 @@
278278
FRAMEWORK_SEARCH_PATHS = (
279279
"$(inherited)",
280280
"${BUILT_PRODUCTS_DIR}",
281-
"${PROJECT_DIR}/../../../ios/Pods",
281+
"${PROJECT_DIR}/../../../ios/Pods/**",
282282
);
283283
HEADER_SEARCH_PATHS = (
284284
"$(inherited)",
285285
"$(SRCROOT)/../../React/**",
286286
"$(SRCROOT)/../../node_modules/react-native/React/**",
287287
"$(SRCROOT)/../../react-native/React/**",
288-
"${PROJECT_DIR}/../../../ios/Pods/**",
288+
"${SRCROOT}/../../../ios/Pods/**",
289289
);
290290
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
291291
LIBRARY_SEARCH_PATHS = "$(inherited)";

0 commit comments

Comments
 (0)