Skip to content

Commit 1fa769c

Browse files
authored
@hide abt public classes (#609)
* Fix timeouts in Functions. (#606) This commit resolves #604 by setting both the read and call timeouts. The connect and write timeouts are left at their default values of 10 seconds. * Report the correct version for the RTDB (#605) * Add missing package-info.java files for A/B Testing. The SDK doesn't have user-visible API, so it should be correctly annotated with javadoc's @hide.
1 parent 1557b09 commit 1fa769c

File tree

6 files changed

+43
-4
lines changed

6 files changed

+43
-4
lines changed

firebase-abt/firebase-abt.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ plugins {
2020
firebaseLibrary {
2121
testLab.enabled = false
2222
publishSources = true
23-
staticAnalysis.disableKotlinInteropLint()
2423
}
2524

2625
// TODO(issue/568): Remove this once legacy logic is removed from Remote Config.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// Copyright 2019 Google LLC
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
/** @hide */
16+
package com.google.firebase.abt.component;
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// Copyright 2019 Google LLC
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
/** @hide */
16+
package com.google.firebase.abt;

firebase-database/CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
# Unreleased
1+
# 18.0.1
2+
- [changed] The SDK now reports the correct version number (via
3+
`FirebaseDatabase.getSdkVersion()`).
4+
5+
# 17.0.0
26
- [changed] Added `@RestrictTo` annotations to discourage the use of APIs that
37
are not public. This affects internal APIs that were previously obfuscated
48
and are not mentioned in our documentation.

firebase-database/src/main/java/com/google/firebase/database/FirebaseDatabase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
*/
3737
public class FirebaseDatabase {
3838

39-
private static final String SDK_VERSION = "3.0.0";
39+
private static final String SDK_VERSION = BuildConfig.VERSION_NAME;
4040

4141
private final FirebaseApp app;
4242
private final RepoInfo repoInfo;

firebase-functions/src/main/java/com/google/firebase/functions/HttpsCallOptions.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ public long getTimeout() {
5050

5151
/** Creates a new OkHttpClient with these options applied to it. */
5252
OkHttpClient apply(OkHttpClient client) {
53-
return client.newBuilder().callTimeout(timeout, timeoutUnits).build();
53+
return client
54+
.newBuilder()
55+
.callTimeout(timeout, timeoutUnits)
56+
.readTimeout(timeout, timeoutUnits)
57+
.build();
5458
}
5559
}

0 commit comments

Comments
 (0)