From bcaadb243b464cd96fa665207260354c4f753350 Mon Sep 17 00:00:00 2001 From: Allison <42279346+allisonbm92@users.noreply.github.com> Date: Thu, 11 Jul 2019 14:51:49 -0800 Subject: [PATCH 1/5] 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. --- .../com/google/firebase/functions/HttpsCallOptions.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/firebase-functions/src/main/java/com/google/firebase/functions/HttpsCallOptions.java b/firebase-functions/src/main/java/com/google/firebase/functions/HttpsCallOptions.java index 436297772d9..b046aeaa3d3 100644 --- a/firebase-functions/src/main/java/com/google/firebase/functions/HttpsCallOptions.java +++ b/firebase-functions/src/main/java/com/google/firebase/functions/HttpsCallOptions.java @@ -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(); } } From 79980256cac71c7427de25ff94271303ae3f03eb Mon Sep 17 00:00:00 2001 From: Sebastian Schmidt Date: Thu, 11 Jul 2019 21:22:01 -0700 Subject: [PATCH 2/5] Report the correct version for the RTDB (#605) --- firebase-database/CHANGELOG.md | 6 +++++- .../java/com/google/firebase/database/FirebaseDatabase.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/firebase-database/CHANGELOG.md b/firebase-database/CHANGELOG.md index 4d78b54219d..fd471bf017d 100644 --- a/firebase-database/CHANGELOG.md +++ b/firebase-database/CHANGELOG.md @@ -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. diff --git a/firebase-database/src/main/java/com/google/firebase/database/FirebaseDatabase.java b/firebase-database/src/main/java/com/google/firebase/database/FirebaseDatabase.java index 179b783bcc4..1b925fbb3a7 100644 --- a/firebase-database/src/main/java/com/google/firebase/database/FirebaseDatabase.java +++ b/firebase-database/src/main/java/com/google/firebase/database/FirebaseDatabase.java @@ -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; From 7f47528bd3569c74d20cea2b6e7ed75e4f6b3ae4 Mon Sep 17 00:00:00 2001 From: Rodrigo Lazo Paz Date: Fri, 12 Jul 2019 12:55:22 -0400 Subject: [PATCH 3/5] 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. --- firebase-abt/firebase-abt.gradle | 1 - .../java/com/google/firebase/abt/component/package-info.java | 4 ++++ .../src/main/java/com/google/firebase/abt/package-info.java | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 firebase-abt/src/main/java/com/google/firebase/abt/component/package-info.java create mode 100644 firebase-abt/src/main/java/com/google/firebase/abt/package-info.java diff --git a/firebase-abt/firebase-abt.gradle b/firebase-abt/firebase-abt.gradle index 77431ea921b..ef8062aa6b5 100644 --- a/firebase-abt/firebase-abt.gradle +++ b/firebase-abt/firebase-abt.gradle @@ -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. diff --git a/firebase-abt/src/main/java/com/google/firebase/abt/component/package-info.java b/firebase-abt/src/main/java/com/google/firebase/abt/component/package-info.java new file mode 100644 index 00000000000..6491ee4816e --- /dev/null +++ b/firebase-abt/src/main/java/com/google/firebase/abt/component/package-info.java @@ -0,0 +1,4 @@ +/** + * @hide + */ +package com.google.firebase.abt.component; diff --git a/firebase-abt/src/main/java/com/google/firebase/abt/package-info.java b/firebase-abt/src/main/java/com/google/firebase/abt/package-info.java new file mode 100644 index 00000000000..4f40cfa6c26 --- /dev/null +++ b/firebase-abt/src/main/java/com/google/firebase/abt/package-info.java @@ -0,0 +1,4 @@ +/** + * @hide + */ +package com.google.firebase.abt; From 11a4cbb32d1f8d8d2e29c58bf939479ec4bb3f94 Mon Sep 17 00:00:00 2001 From: Rodrigo Lazo Paz Date: Fri, 12 Jul 2019 13:15:16 -0400 Subject: [PATCH 4/5] Address review comments. --- .../firebase/abt/component/package-info.java | 18 ++++++++++++++++++ .../com/google/firebase/abt/package-info.java | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/firebase-abt/src/main/java/com/google/firebase/abt/component/package-info.java b/firebase-abt/src/main/java/com/google/firebase/abt/component/package-info.java index 6491ee4816e..017e84ba8ef 100644 --- a/firebase-abt/src/main/java/com/google/firebase/abt/component/package-info.java +++ b/firebase-abt/src/main/java/com/google/firebase/abt/component/package-info.java @@ -1,4 +1,22 @@ +<<<<<<< Updated upstream /** * @hide */ +======= +// Copyright 2019 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +/** @hide */ +>>>>>>> Stashed changes package com.google.firebase.abt.component; diff --git a/firebase-abt/src/main/java/com/google/firebase/abt/package-info.java b/firebase-abt/src/main/java/com/google/firebase/abt/package-info.java index 4f40cfa6c26..af1de7a64fb 100644 --- a/firebase-abt/src/main/java/com/google/firebase/abt/package-info.java +++ b/firebase-abt/src/main/java/com/google/firebase/abt/package-info.java @@ -1,4 +1,22 @@ +<<<<<<< Updated upstream /** * @hide */ +======= +// Copyright 2019 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +/** @hide */ +>>>>>>> Stashed changes package com.google.firebase.abt; From edaad2a5b810835316d50235b321b101cf95f9b0 Mon Sep 17 00:00:00 2001 From: Rodrigo Lazo Paz Date: Fri, 12 Jul 2019 13:27:59 -0400 Subject: [PATCH 5/5] Remove merge markers. --- .../com/google/firebase/abt/component/package-info.java | 6 ------ .../src/main/java/com/google/firebase/abt/package-info.java | 6 ------ 2 files changed, 12 deletions(-) diff --git a/firebase-abt/src/main/java/com/google/firebase/abt/component/package-info.java b/firebase-abt/src/main/java/com/google/firebase/abt/component/package-info.java index 017e84ba8ef..8a4e84c74d5 100644 --- a/firebase-abt/src/main/java/com/google/firebase/abt/component/package-info.java +++ b/firebase-abt/src/main/java/com/google/firebase/abt/component/package-info.java @@ -1,8 +1,3 @@ -<<<<<<< Updated upstream -/** - * @hide - */ -======= // Copyright 2019 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,5 +13,4 @@ // limitations under the License. /** @hide */ ->>>>>>> Stashed changes package com.google.firebase.abt.component; diff --git a/firebase-abt/src/main/java/com/google/firebase/abt/package-info.java b/firebase-abt/src/main/java/com/google/firebase/abt/package-info.java index af1de7a64fb..fe707dc44c9 100644 --- a/firebase-abt/src/main/java/com/google/firebase/abt/package-info.java +++ b/firebase-abt/src/main/java/com/google/firebase/abt/package-info.java @@ -1,8 +1,3 @@ -<<<<<<< Updated upstream -/** - * @hide - */ -======= // Copyright 2019 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,5 +13,4 @@ // limitations under the License. /** @hide */ ->>>>>>> Stashed changes package com.google.firebase.abt;