Skip to content

Commit 335e647

Browse files
lfkelloggvkryachkodaymxnraymondlamyifanyang
authored
Merge latest master into fad/next (#4247)
* Deflake firebase_common HeartBeat tests. (#4083) The tests relied on `TestOnCompleteListener` that was not safe to call more than once since it was based on a count down latch. So reusing it multiple times would cause await() to return immediately. This change makes it so that a new latch is created for every await() call, making all await() calls work. Fixes: http://b/245956774 * Add Javadoc support to the DackkaPlugin (#4082) * Add util method for copying directories * Add javadoc support to our dackka plugin * Remove the extension check on fromDirectory * Add a note about cache compliance and the javadoc task * Add reference to kotlin stdlib package list (#4093) * Add appcheck-ktx to bom config (#4081) * Removing getRunningAppProcesses since the process_name isn't used (#4057) * Fix Documentation classpath (#4099) b/241795594 * Add projectSpecificSources back to the DackkaPlugin (#4110) * Added extra method for TaskProviders * Added specificSources method back * Revert to dependsOn for docstubs dep * Revamp test harness for macrobenchmark tests (#4071) * Fix dependabot security alerts (#4123) * Make firesite transform cacheable (#4124) * add coroutines-play-services as a transitive dep to firebase-common-ktx (#4044) * add kotlinx-coroutines-play-services as a transitive dep to firebase-common-ktx * Update to Coroutines 1.6.4 * database-ktx: add callbackFlow for eventlisteners (#4012) * add callbackFlow for RTDB's ValueEventListener * add callbackFlow for RTDB's ChildEventListener * delegate trySendBlocking to DefaultRunLoop * add group to ktx.gradle * update api.txt file * Update released versions (#4135) * Upgrade dackkaConfig (#4141) * Add names to all Firebase components (#4117) * Add appcheck's ktx artifact back to package list file (#4142) * Add strict mode testing in firebase-messaging (#4095) * Add gralde property to instrument Fireperf E2E test (#4144) The perf gradle PR is #334 in the gradle repo. b/246802885 * Resolve StrictMode violation in App Check. (#4085) * Resolve StrictMode violation in App Check. * Attempt to fix some tests. * Fix unit tests. * Make `retrieveStoredAppCheckTokenInBackground` private instead of package-private. * Move listener invocations back to the main thread while keeping disk write on background thread. * Refactor to use lambda syntax. * Implemented exponential backoff and max retry with resumable uploads (#4087) * storage-ktx: add callbackFlow for upload/download progress (#4139) * add kotlin flows to storage * update api.txt file * add group to storage/ktx.gradle * Make a best effort attempt to flush reports at crash time (#4112) This should allow us to upload reports for start-up crashes. * Public Count (#4130) * Public Count * Disable prod testing * Long to long * Api.txt * Backfill changelog * Add PR * Fix assertEquals error * Re-write API javadocs for COUNT API (#4143) Co-authored-by: Denver Coneybeare <[email protected]> * [Fireperf][AASA] send `_experiment_app_start_ttid` trace, controlled by RC flag (#4114) * log _experiment_as_ttid * send event and RRC mitigation * add RC wip * modified save to cache when RC fetches * dev-app manifest override * unit test for RCc cache saving * better name and comments * better formatting remoteconfigmanagertest * better comments and added local RC lookup back * Specify unique ref tags in Dackka output (#4149) * Add util methods for gradle projects * Disable Javadoc generation on empty projects * Fix ref path generation in Dackka output * Add documentation for util methods * Update the DackkaPlugin docs * Reduced path to relative from tenant * Reduced ref head path even more * Fixed ref tag path to working solution * Disabled publishJavadoc by default for tests It should be enabled explicitly when being tested anyhow, and causes issues otherwise. Instead of disabling it for the tests that don't need it- this is much quicker and easier to manager. * Add strict mode tests to inappmessaging and inappmessaging-display (#4136) * Fix strict mode violations for appcheck (#4148) * Fix strict mode violations for appcheck * Formatting * Add copyright header * Populate SDKs changelog files (#4070) * first try seeding changelogs * Added unreleased section to CHANGELOG * Fix empty lines between sections * Add missing entries for abt * Update data to include latest releases * Update CHANGELOG.md * Add missing line in unreleased section for perf. * Enable CHANGELOG check globally (#4084) * Enable CHANGELOG check globally * Simplify conditional. * Enable COUNT integration tests, now that backend support has rolled out (#4163) * Remove separation of kotlin directories in dackka (#4166) * Deprecate App Check SafetyNet SDK (#4187) * Add `@Deprecated` annotations to Firebase App Check SafetyNet SDK public API. * Add `@deprecated` tag in the Javadoc as well. * Remove stale entries from Unreleased section. (#4185) * Assign ConfigContainer Builder return values. (#4194) * update bom (#4155) * update bom * update * update * feat(perf-ktx): add trace(name, block) extension function (#4180) * Remove smoke test for app indexing (#4219) App Indexing is deprecated starting BoM 31.0.0 . https://firebase.google.com/support/release-notes/android#bom_v31-0-0 * Bump Robolectric to 4.9 (#4161) * Add plexus-utils for firebase-database tests Looks like firebase-database tests use plexus-utils dependency of Robolectric directly. But this dependency was removed by Robolectric. So this CL adds plexus-utils explictly for firebase-database tests. Signed-off-by: utzcoz <[email protected]> * Bump Robolectric to 4.9 1. Use legacy LooperMode for tests explicitly, because recent Robolectric releases switch to use PAUSED mode default. Before these tests migrate to PAUSED mode, they use LEGACY mode to pass tests. 2. Migrate Assert.assertThat to Truth.assertThat to avoid using removed APIs. 3. All build.gradle use the same robolectricVersion except transport-backend-cct because Robolectric 4.8+ has compatibility problem for TelephonyManager with low compile/targetSdkversion. To keep httpclient compatibility, transport-backend-ccts continues to use Robolectric 4.3.1. 4. Remove unused exclude protobuf-java from Robolectric. 5. Add necessary protobuf-lite dependency on classpath for some ktx modules' tests. Signed-off-by: utzcoz <[email protected]> Signed-off-by: utzcoz <[email protected]> * return exception if modelname is empty (#4226) * Add "create release PR" github action (#4236) This implementation: - Creates the base branch (name is based in user input) - Creates the release branch (name is based in user input) - Creates the release.cfg file in the release branch without adding any SDK (module) to it. It can create the branches based on any existing branch of the repo. * Sync spec tests from web SDK to Android SDK (#4230) * Update versions (#4238) * Update versions * Exclude .github dir from `firebaseContinuousIntegration` paths (#4239) * Performing IN expansion (#4221) * WIP: `in` expansion. * Add composite filter in-expansion test. * Fix formatting. * Run in-expansion as part of DNF computation and add tests. * Add test with nested IN filters with CSI. * Add tests for other cases. * typo fix (#4237) * Firestore: Add test that verifies count query error message when missing index (#4232) * refactor(functions): update firebase-iid to 21.1.0 (#4225) * refactor(functions): update firebase-iid to 21.1.0 * Update CHANGELOG.md * Update CHANGELOG.md * bump firebase-iid-interop to 17.1.0 * exclude firebase-components from firebase-iid dependency Signed-off-by: utzcoz <[email protected]> Co-authored-by: Vladimir Kryachko <[email protected]> Co-authored-by: Daymon <[email protected]> Co-authored-by: Raymond Lam <[email protected]> Co-authored-by: Yifan Yang <[email protected]> Co-authored-by: Rosário Pereira Fernandes <[email protected]> Co-authored-by: emilypgoogle <[email protected]> Co-authored-by: Jeremy Jiang <[email protected]> Co-authored-by: Rosalyn Tan <[email protected]> Co-authored-by: Maneesh Tewani <[email protected]> Co-authored-by: Matthew Robertson <[email protected]> Co-authored-by: wu-hui <[email protected]> Co-authored-by: Denver Coneybeare <[email protected]> Co-authored-by: Leo Zhan <[email protected]> Co-authored-by: Rodrigo Lazo <[email protected]> Co-authored-by: Dana Silver <[email protected]> Co-authored-by: Vinay Guthal <[email protected]> Co-authored-by: utzcoz <[email protected]> Co-authored-by: argzdev <[email protected]> Co-authored-by: Mila <[email protected]> Co-authored-by: Ehsan <[email protected]> Co-authored-by: cherylEnkidu <[email protected]>
1 parent d14f023 commit 335e647

File tree

78 files changed

+1344
-367
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+1344
-367
lines changed

.github/workflows/create_releases.yml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: Create release
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
name:
7+
description: 'Release name'
8+
required: true
9+
type: string
10+
11+
jobs:
12+
create-branches:
13+
runs-on: ubuntu-latest
14+
env:
15+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
16+
steps:
17+
- name: Create base branch
18+
uses: peterjgrainger/[email protected]
19+
with:
20+
branch: '${{ inputs.name }}'
21+
- name: Create release branch
22+
uses: peterjgrainger/[email protected]
23+
with:
24+
branch: '${{ inputs.name }}.release'
25+
26+
create-pull-request:
27+
runs-on: ubuntu-latest
28+
steps:
29+
- uses: actions/checkout@v3
30+
31+
- name: Create release configuration template
32+
run: |
33+
git config user.name 'Create Release GA'
34+
git config user.email '[email protected]'
35+
echo "[release]" > release.cfg
36+
echo "name = ${{ inputs.name }}" >> release.cfg
37+
echo "mode = RELEASE" >> release.cfg
38+
echo "" >> release.cfg
39+
echo "[modules]" >> release.cfg
40+
echo "" >> release.cfg
41+
git add release.cfg
42+
git commit -a -m 'Create release config'
43+
44+
- name: Create Pull Request
45+
uses: peter-evans/create-pull-request@v4
46+
with:
47+
base: '${{ inputs.name }}'
48+
branch: '${{ inputs.name }}.release'
49+
title: '${{ inputs.name}} release'
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=16.0.3
2-
latestReleasedVersion=16.0.2
1+
version=16.1.1
2+
latestReleasedVersion=16.1.0
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=16.0.3
2-
latestReleasedVersion=16.0.2
1+
version=16.1.1
2+
latestReleasedVersion=16.1.0

appcheck/firebase-appcheck-debug/src/test/java/com/google/firebase/appcheck/debug/internal/DebugAppCheckProviderTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,12 @@
4343
import org.mockito.MockitoAnnotations;
4444
import org.robolectric.RobolectricTestRunner;
4545
import org.robolectric.annotation.Config;
46+
import org.robolectric.annotation.LooperMode;
4647

4748
/** Tests for {@link DebugAppCheckProvider}. */
4849
@RunWith(RobolectricTestRunner.class)
4950
@Config(manifest = Config.NONE)
51+
@LooperMode(LooperMode.Mode.LEGACY)
5052
public class DebugAppCheckProviderTest {
5153

5254
private static final String DEBUG_SECRET = "debugSecret";
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=16.0.3
2-
latestReleasedVersion=16.0.2
1+
version=16.1.1
2+
latestReleasedVersion=16.1.0
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=16.0.3
2-
latestReleasedVersion=16.0.2
1+
version=16.1.1
2+
latestReleasedVersion=16.1.0

appcheck/firebase-appcheck-playintegrity/src/test/java/com/google/firebase/appcheck/playintegrity/internal/PlayIntegrityAppCheckProviderTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,12 @@
4747
import org.mockito.MockitoAnnotations;
4848
import org.robolectric.RobolectricTestRunner;
4949
import org.robolectric.annotation.Config;
50+
import org.robolectric.annotation.LooperMode;
5051

5152
/** Tests for {@link PlayIntegrityAppCheckProvider}. */
5253
@RunWith(RobolectricTestRunner.class)
5354
@Config(manifest = Config.NONE)
55+
@LooperMode(LooperMode.Mode.LEGACY)
5456
public class PlayIntegrityAppCheckProviderTest {
5557

5658
private static final String PROJECT_NUMBER = "123456";
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=16.0.3
2-
latestReleasedVersion=16.0.2
1+
version=16.1.1
2+
latestReleasedVersion=16.1.0

appcheck/firebase-appcheck-safetynet/src/test/java/com/google/firebase/appcheck/safetynet/internal/SafetyNetAppCheckProviderTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,12 @@
4646
import org.mockito.MockitoAnnotations;
4747
import org.robolectric.RobolectricTestRunner;
4848
import org.robolectric.annotation.Config;
49+
import org.robolectric.annotation.LooperMode;
4950

5051
/** Tests for {@link SafetyNetAppCheckProvider}. */
5152
@RunWith(RobolectricTestRunner.class)
5253
@Config(manifest = Config.NONE)
54+
@LooperMode(LooperMode.Mode.LEGACY)
5355
public class SafetyNetAppCheckProviderTest {
5456

5557
private static final String API_KEY = "apiKey";
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=16.0.3
2-
latestReleasedVersion=16.0.2
1+
version=16.1.1
2+
latestReleasedVersion=16.1.0

appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/internal/DefaultFirebaseAppCheckTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,12 @@
4141
import org.mockito.MockitoAnnotations;
4242
import org.robolectric.RobolectricTestRunner;
4343
import org.robolectric.annotation.Config;
44+
import org.robolectric.annotation.LooperMode;
4445

4546
/** Tests for {@link DefaultFirebaseAppCheck}. */
4647
@RunWith(RobolectricTestRunner.class)
4748
@Config(manifest = Config.NONE)
49+
@LooperMode(LooperMode.Mode.LEGACY)
4850
public class DefaultFirebaseAppCheckTest {
4951

5052
private static final String EXCEPTION_TEXT = "exceptionText";

appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/internal/DefaultTokenRefresherTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,10 @@
3333
import org.mockito.Mock;
3434
import org.mockito.MockitoAnnotations;
3535
import org.robolectric.RobolectricTestRunner;
36+
import org.robolectric.annotation.LooperMode;
3637

3738
@RunWith(RobolectricTestRunner.class)
39+
@LooperMode(LooperMode.Mode.LEGACY)
3840
public class DefaultTokenRefresherTest {
3941

4042
private static final long TIME_TO_REFRESH_MILLIS = 1000L;

build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ ext {
5151
supportAnnotationsVersion = '28.0.0'
5252
googleTruthVersion = '1.1.2'
5353
grpcVersion = '1.48.1'
54-
robolectricVersion = '4.3.1'
54+
robolectricVersion = '4.9'
5555
protocVersion = '3.17.3'
5656
javaliteVersion = '3.17.3'
5757
}
@@ -66,6 +66,7 @@ firebaseContinuousIntegration {
6666
ignorePaths = [
6767
/.*\.gitignore$/,
6868
/.*\/.*.md$/,
69+
/.*\.github.*/,
6970
]
7071
}
7172

buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/BomGeneratorTask.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,12 @@ public class BomGeneratorTask extends DefaultTask {
5858
"com.google.firebase:firebase-appcheck-playintegrity",
5959
"com.google.firebase:firebase-appcheck-safetynet",
6060
"com.google.firebase:firebase-appcheck",
61-
"com.google.firebase:firebase-appindexing",
6261
"com.google.firebase:firebase-auth",
6362
"com.google.firebase:firebase-auth-ktx",
6463
"com.google.firebase:firebase-common",
6564
"com.google.firebase:firebase-common-ktx",
6665
"com.google.firebase:firebase-config",
6766
"com.google.firebase:firebase-config-ktx",
68-
"com.google.firebase:firebase-core",
6967
"com.google.firebase:firebase-crashlytics",
7068
"com.google.firebase:firebase-crashlytics-ktx",
7169
"com.google.firebase:firebase-crashlytics-ndk",
@@ -78,7 +76,6 @@ public class BomGeneratorTask extends DefaultTask {
7876
"com.google.firebase:firebase-firestore-ktx",
7977
"com.google.firebase:firebase-functions",
8078
"com.google.firebase:firebase-functions-ktx",
81-
"com.google.firebase:firebase-iid",
8279
"com.google.firebase:firebase-inappmessaging",
8380
"com.google.firebase:firebase-inappmessaging-display",
8481
"com.google.firebase:firebase-inappmessaging-display-ktx",
@@ -109,6 +106,9 @@ public class BomGeneratorTask extends DefaultTask {
109106
"firebase-appcheck-interop",
110107
"firebase-appdistribution-gradle",
111108
"firebase-appindexing-license",
109+
"firebase-appindexing",
110+
"firebase-iid",
111+
"firebase-core",
112112
"firebase-auth-common",
113113
"firebase-auth-impl",
114114
"firebase-auth-interop",

firebase-abt/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=21.0.3
2-
latestReleasedVersion=21.0.2
1+
version=21.1.1
2+
latestReleasedVersion=21.1.0

firebase-appdistribution-api/src/test/java/com/google/firebase/appdistribution/internal/FirebaseAppDistributionProxyTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,10 @@
3333
import org.junit.runner.RunWith;
3434
import org.robolectric.Robolectric;
3535
import org.robolectric.RobolectricTestRunner;
36+
import org.robolectric.annotation.LooperMode;
3637

3738
@RunWith(RobolectricTestRunner.class)
39+
@LooperMode(LooperMode.Mode.LEGACY)
3840
public class FirebaseAppDistributionProxyTest {
3941

4042
private FirebaseAppDistribution firebaseAppDistribution;

firebase-appdistribution/firebase-appdistribution.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ dependencies {
5151
runtimeOnly project(':firebase-installations')
5252

5353
testImplementation 'junit:junit:4.13.2'
54-
testImplementation "org.robolectric:robolectric:4.8.1"
54+
testImplementation "org.robolectric:robolectric:$robolectricVersion"
5555
testImplementation "com.google.truth:truth:$googleTruthVersion"
5656
testImplementation 'org.mockito:mockito-inline:3.4.0'
5757
testImplementation 'androidx.test:core:1.2.0'

firebase-common/data-collection-tests/src/test/java/com/google/firebase/DataCollectionPostNDefaultDisabledTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@
2727
import org.junit.Test;
2828
import org.junit.runner.RunWith;
2929
import org.robolectric.annotation.Config;
30+
import org.robolectric.annotation.LooperMode;
3031

3132
@RunWith(AndroidJUnit4.class)
3233
@Config(sdk = 25)
34+
@LooperMode(LooperMode.Mode.LEGACY)
3335
public class DataCollectionPostNDefaultDisabledTest {
3436

3537
@Test

firebase-common/data-collection-tests/src/test/java/com/google/firebase/DataCollectionPreNDefaultDisabledTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.junit.Test;
2626
import org.junit.runner.RunWith;
2727
import org.robolectric.annotation.Config;
28+
import org.robolectric.annotation.LooperMode;
2829

2930
@RunWith(AndroidJUnit4.class)
3031
@Config(sdk = 19)
@@ -81,6 +82,7 @@ public void setDataCollectionDefaultEnabledTrue_shouldUpdateSharedPrefs() {
8182
}
8283

8384
@Test
85+
@LooperMode(LooperMode.Mode.LEGACY)
8486
public void setDataCollectionDefaultEnabledTrue_shouldEmitEvents() {
8587
withApp(
8688
app -> {

firebase-common/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
version=20.1.3
2-
latestReleasedVersion=20.1.2
1+
version=20.2.1
2+
latestReleasedVersion=20.2.0
33
android.enableUnitTestBinaryResources=true

firebase-config/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# limitations under the License.
1515
#
1616

17-
version=21.1.3
18-
latestReleasedVersion=21.1.2
17+
version=21.2.1
18+
latestReleasedVersion=21.2.0
1919
android.enableUnitTestBinaryResources=true
2020

firebase-config/src/test/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282
import org.mockito.MockitoAnnotations;
8383
import org.robolectric.RobolectricTestRunner;
8484
import org.robolectric.annotation.Config;
85+
import org.robolectric.annotation.LooperMode;
8586
import org.skyscreamer.jsonassert.JSONAssert;
8687

8788
/**
@@ -93,6 +94,7 @@
9394
@Config(
9495
manifest = Config.NONE,
9596
shadows = {ShadowPreconditions.class})
97+
@LooperMode(LooperMode.Mode.LEGACY)
9698
public final class FirebaseRemoteConfigTest {
9799
private static final String APP_ID = "1:14368190084:android:09cb977358c6f241";
98100
private static final String API_KEY = "AIzaSyabcdefghijklmnopqrstuvwxyz1234567";

firebase-config/src/test/java/com/google/firebase/remoteconfig/RemoteConfigComponentTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import org.mockito.MockitoAnnotations;
4949
import org.robolectric.RobolectricTestRunner;
5050
import org.robolectric.annotation.Config;
51+
import org.robolectric.annotation.LooperMode;
5152

5253
/**
5354
* Unit tests for the Firebase Remote Config Component.
@@ -92,6 +93,7 @@ public void setUp() {
9293
}
9394

9495
@Test
96+
@LooperMode(LooperMode.Mode.LEGACY)
9597
public void frc2p_doesNotCallAbt() throws Exception {
9698

9799
FirebaseRemoteConfig fireperfFrc =
@@ -106,6 +108,7 @@ public void frc2p_doesNotCallAbt() throws Exception {
106108
}
107109

108110
@Test
111+
@LooperMode(LooperMode.Mode.LEGACY)
109112
public void frcNonMainFirebaseApp_doesNotCallAbt() throws Exception {
110113

111114
when(mockFirebaseApp.getName()).thenReturn("secondary");

firebase-config/src/test/java/com/google/firebase/remoteconfig/internal/ConfigFetchHandlerTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@
9090
import org.mockito.MockitoAnnotations;
9191
import org.robolectric.RobolectricTestRunner;
9292
import org.robolectric.annotation.Config;
93+
import org.robolectric.annotation.LooperMode;
9394
import org.skyscreamer.jsonassert.JSONAssert;
9495

9596
/**
@@ -99,6 +100,7 @@
99100
*/
100101
@RunWith(RobolectricTestRunner.class)
101102
@Config(manifest = Config.NONE)
103+
@LooperMode(LooperMode.Mode.LEGACY)
102104
public class ConfigFetchHandlerTest {
103105
private static final String INSTALLATION_ID = "'fL71_VyL3uo9jNMWu1L60S";
104106
private static final String INSTALLATION_AUTH_TOKEN =
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=18.2.14
2-
latestReleasedVersion=18.2.13
1+
version=18.3.2
2+
latestReleasedVersion=18.3.13

firebase-crashlytics/firebase-crashlytics.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ dependencies {
7979

8080
testImplementation 'androidx.test:runner:1.4.0'
8181
testImplementation 'androidx.test:core:1.4.0'
82-
testImplementation "org.robolectric:robolectric:4.5"
82+
testImplementation "org.robolectric:robolectric:$robolectricVersion"
8383
testImplementation 'junit:junit:4.13.2'
8484
testImplementation 'org.mockito:mockito-core:3.4.3'
8585

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=18.2.14
2-
latestReleasedVersion=18.2.13
1+
version=18.3.2
2+
latestReleasedVersion=18.3.13

firebase-database/firebase-database.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ dependencies {
100100

101101
testImplementation 'junit:junit:4.12'
102102
testImplementation 'org.mockito:mockito-core:2.25.0'
103+
testImplementation 'org.codehaus.plexus:plexus-utils:3.4.2'
103104
testImplementation "org.robolectric:robolectric:$robolectricVersion"
104105
testImplementation 'com.firebase:firebase-token-generator:2.0.0'
105106
testImplementation 'com.fasterxml.jackson.core:jackson-core:2.9.8'

firebase-database/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
version=20.0.7
16-
latestReleasedVersion=20.0.6
15+
version=20.1.1
16+
latestReleasedVersion=20.1.0
1717
android.enableUnitTestBinaryResources=true
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version=18.1.7
2-
latestReleasedVersion=18.1.6
1+
version=18.1.8
2+
latestReleasedVersion=18.1.7
33
android.enableUnitTestBinaryResources=true
44

firebase-dynamic-links/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
version=21.0.3
16-
latestReleasedVersion=21.0.2
15+
version=21.1.1
16+
latestReleasedVersion=21.1.0
1717
android.enableUnitTestBinaryResources=true

firebase-firestore/firebase-firestore.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,7 @@ dependencies {
150150
testImplementation 'androidx.test:core:1.2.0'
151151
testImplementation "org.hamcrest:hamcrest-junit:2.0.0.0"
152152
testImplementation 'org.mockito:mockito-core:2.25.0'
153-
testImplementation ("org.robolectric:robolectric:4.8.2") {
154-
exclude group: 'com.google.protobuf', module: 'protobuf-java'
155-
}
153+
testImplementation "org.robolectric:robolectric:$robolectricVersion"
156154
testImplementation "com.google.truth:truth:$googleTruthVersion"
157155
testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.9.8'
158156
testImplementation 'com.google.guava:guava-testlib:12.0-rc2'

firebase-firestore/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=24.3.2
2-
latestReleasedVersion=24.3.1
1+
version=24.4.1
2+
latestReleasedVersion=24.4.0

firebase-firestore/ktx/ktx.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ dependencies {
5959
implementation 'androidx.annotation:annotation:1.1.0'
6060
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
6161
implementation 'com.google.android.gms:play-services-basement:18.1.0'
62+
testCompileOnly "com.google.protobuf:protobuf-java:$protocVersion"
6263
testImplementation project(':firebase-database-collection')
6364
testImplementation 'org.mockito:mockito-core:2.25.0'
6465
testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.9.8'

0 commit comments

Comments
 (0)