Skip to content

Commit db4cb23

Browse files
lfkellogglfkellogg
committed
Merge branch 'master' into lk/merge-master-into-fad-next
2 parents d14f023 + d939e63 commit db4cb23

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'

‎appcheck/firebase-appcheck-debug-testing/gradle.properties

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/gradle.properties

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";

‎appcheck/firebase-appcheck-interop/gradle.properties

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/gradle.properties

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";

‎appcheck/firebase-appcheck-safetynet/gradle.properties

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";

‎appcheck/firebase-appcheck/gradle.properties

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 =

‎firebase-crashlytics-ndk/gradle.properties

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

‎firebase-crashlytics/gradle.properties

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

‎firebase-datatransport/gradle.properties

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)