Skip to content

@Hide abt public classes #609

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

Merged
merged 5 commits into from
Jul 12, 2019
Merged
Show file tree
Hide file tree
Changes from 3 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
1 change: 0 additions & 1 deletion firebase-abt/firebase-abt.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ plugins {
firebaseLibrary {
testLab.enabled = false
publishSources = true
staticAnalysis.disableKotlinInteropLint()
}

// TODO(issue/568): Remove this once legacy logic is removed from Remote Config.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/**
* @hide
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the whole comment needs to be on one line, let's see if google-java-format fails on this.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PTAL

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there is a merge conflict in both files, pls double check

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

*/
package com.google.firebase.abt.component;
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/**
* @hide
*/
package com.google.firebase.abt;
6 changes: 5 additions & 1 deletion firebase-database/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
# Unreleased
# 18.0.1
- [changed] The SDK now reports the correct version number (via
`FirebaseDatabase.getSdkVersion()`).

# 17.0.0
- [changed] Added `@RestrictTo` annotations to discourage the use of APIs that
are not public. This affects internal APIs that were previously obfuscated
and are not mentioned in our documentation.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
@PublicApi
public class FirebaseDatabase {

private static final String SDK_VERSION = "3.0.0";
private static final String SDK_VERSION = BuildConfig.VERSION_NAME;

private final FirebaseApp app;
private final RepoInfo repoInfo;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ public long getTimeout() {

/** Creates a new OkHttpClient with these options applied to it. */
OkHttpClient apply(OkHttpClient client) {
return client.newBuilder().callTimeout(timeout, timeoutUnits).build();
return client
.newBuilder()
.callTimeout(timeout, timeoutUnits)
.readTimeout(timeout, timeoutUnits)
.build();
}
}