Skip to content

re-generate rtdb's api.txt and fail build if an error occurs parsing the file #1692

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.

Sign up for GitHub

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

Merged
merged 8 commits into from
Jun 19, 2020
Merged

re-generate rtdb's api.txt and fail build if an error occurs parsing the file #1692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c621f5b
Unified emulator settings for Firestore
samtstern Jun 19, 2020
07c0658
chore(firebase-database): re-generate api.txt
thatfiredev Jun 19, 2020
430dd43
chore(buildSrc): fail build if the current api.txt cannot be parsed
thatfiredev Jun 19, 2020
b307898
Merge branch 'master' into ss-firestore-emulator-settings
samtstern Jun 19, 2020
fe4d670
Merge branch 'ss-firestore-emulator-settings' of https://github.com/f…
thatfiredev Jun 19, 2020
587dfc3
hide the database emulator
thatfiredev Jun 19, 2020
8917eef
chore(firebase-database): re-generate api.txt with hidden method
thatfiredev Jun 19, 2020
5584a65
Revert "Unified emulator settings for Firestore"
thatfiredev Jun 19, 2020
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
1 change: 0 additions & 1 deletion buildSrc/src/main/java/com/google/firebase/gradle/plugins/apiinfo/ApiInformationTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@ void execute() {
args.addAll(Arrays.asList("--baseline", getBaselineFile().getAbsolutePath()));
}
spec.setArgs(args);
spec.setIgnoreExitValue(true);
try {
spec.setStandardOutput(new FileOutputStream(getOutputFile()));
} catch (FileNotFoundException e) {
Expand Down
4 changes: 2 additions & 2 deletions firebase-database/api.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,9 @@ package com.google.firebase.database {

public class ServerValue {
ctor public ServerValue();
method @NonNull public static final Object increment(long);
method @NonNull public static final Object increment(double);
field @NonNull public static final java.util.Map<java.lang.String,java.lang.String> TIMESTAMP;
field @NonNull public static final Object increment(double);
field @NonNull public static final Object increment(long);
}

@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE}) public @interface ThrowOnExtraProperties {
Expand Down
8 changes: 8 additions & 0 deletions firebase-database/src/main/java/com/google/firebase/database/FirebaseDatabase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import com.google.firebase.database.core.utilities.Utilities;
import com.google.firebase.database.core.utilities.Validation;
import com.google.firebase.emulators.EmulatedServiceSettings;
import com.google.firebase.emulators.EmulatorSettings;
import com.google.firebase.emulators.FirebaseEmulator;

/**
Expand All @@ -39,6 +40,13 @@
*/
public class FirebaseDatabase {

/**
* Emulator identifier. See {@link FirebaseApp#enableEmulators(EmulatorSettings)}
*
* <p>TODO(samstern): Un-hide this once Firestore, Database, and Functions are implemented
*
* @hide
*/
public static final FirebaseEmulator EMULATOR = FirebaseEmulator.forName("database");

private static final String SDK_VERSION = BuildConfig.VERSION_NAME;
Expand Down