Skip to content

Merge latest master into fad/next #4247

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 48 commits into from
Oct 26, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
39930de
Deflake firebase_common HeartBeat tests. (#4083)
vkryachko Sep 14, 2022
0c11f12
Add Javadoc support to the DackkaPlugin (#4082)
daymxn Sep 14, 2022
6bc2882
Add reference to kotlin stdlib package list (#4093)
daymxn Sep 15, 2022
6a566dd
Add appcheck-ktx to bom config (#4081)
vkryachko Sep 15, 2022
6df92b9
Removing getRunningAppProcesses since the process_name isn't used (#4…
raymondlam Sep 15, 2022
607dafc
Fix Documentation classpath (#4099)
vkryachko Sep 19, 2022
65356d8
Add projectSpecificSources back to the DackkaPlugin (#4110)
daymxn Sep 19, 2022
523730a
Revamp test harness for macrobenchmark tests (#4071)
yifanyang Sep 20, 2022
6caf590
Fix dependabot security alerts (#4123)
yifanyang Sep 21, 2022
ed10eb5
Make firesite transform cacheable (#4124)
daymxn Sep 21, 2022
4f24be3
add coroutines-play-services as a transitive dep to firebase-common-k…
thatfiredev Sep 23, 2022
3872957
database-ktx: add callbackFlow for eventlisteners (#4012)
thatfiredev Sep 23, 2022
802f937
Update released versions (#4135)
yifanyang Sep 23, 2022
5f501c5
Upgrade dackkaConfig (#4141)
daymxn Sep 23, 2022
7273b29
Add names to all Firebase components (#4117)
yifanyang Sep 23, 2022
c1fe187
Add appcheck's ktx artifact back to package list file (#4142)
daymxn Sep 23, 2022
fdb88d7
Add strict mode testing in firebase-messaging (#4095)
emilypgoogle Sep 23, 2022
d1ea5b6
Add gralde property to instrument Fireperf E2E test (#4144)
jeremyjiang-dev Sep 26, 2022
d0045e3
Resolve StrictMode violation in App Check. (#4085)
rosalyntan Sep 26, 2022
988ff71
Implemented exponential backoff and max retry with resumable uploads …
maneesht Sep 26, 2022
4131616
storage-ktx: add callbackFlow for upload/download progress (#4139)
thatfiredev Sep 26, 2022
1d344e8
Make a best effort attempt to flush reports at crash time (#4112)
mrober Sep 27, 2022
f2e4bd0
Public Count (#4130)
wu-hui Sep 27, 2022
6300987
[Fireperf][AASA] send `_experiment_app_start_ttid` trace, controlled …
leotianlizhan Sep 28, 2022
3bf2c19
Specify unique ref tags in Dackka output (#4149)
daymxn Sep 29, 2022
b2cbd70
Add strict mode tests to inappmessaging and inappmessaging-display (#…
emilypgoogle Sep 30, 2022
f05d34b
Fix strict mode violations for appcheck (#4148)
emilypgoogle Sep 30, 2022
7ca9c98
Populate SDKs changelog files (#4070)
rlazo Oct 3, 2022
ee13f03
Enable CHANGELOG check globally (#4084)
rlazo Oct 3, 2022
ab87571
Enable COUNT integration tests, now that backend support has rolled o…
dconeybe Oct 4, 2022
fa4adcf
Remove separation of kotlin directories in dackka (#4166)
daymxn Oct 4, 2022
1e38243
Deprecate App Check SafetyNet SDK (#4187)
rosalyntan Oct 7, 2022
79fcab2
Remove stale entries from Unreleased section. (#4185)
rlazo Oct 11, 2022
f89b09b
Assign ConfigContainer Builder return values. (#4194)
danasilver Oct 11, 2022
c21a2b0
update bom (#4155)
VinayGuthal Oct 12, 2022
dc5f291
feat(perf-ktx): add trace(name, block) extension function (#4180)
thatfiredev Oct 13, 2022
83969d7
Remove smoke test for app indexing (#4219)
yifanyang Oct 18, 2022
2253cd4
Bump Robolectric to 4.9 (#4161)
utzcoz Oct 19, 2022
6df2784
return exception if modelname is empty (#4226)
argzdev Oct 21, 2022
7861837
Add "create release PR" github action (#4236)
rlazo Oct 24, 2022
ae3bdb8
Sync spec tests from web SDK to Android SDK (#4230)
milaGGL Oct 24, 2022
d35d044
Update versions (#4238)
rlazo Oct 25, 2022
0ad4074
Exclude .github dir from `firebaseContinuousIntegration` paths (#4239)
rlazo Oct 25, 2022
9a80448
Performing IN expansion (#4221)
ehsannas Oct 25, 2022
aafdd1e
typo fix (#4237)
cherylEnkidu Oct 25, 2022
50fae3c
Firestore: Add test that verifies count query error message when miss…
dconeybe Oct 26, 2022
d939e63
refactor(functions): update firebase-iid to 21.1.0 (#4225)
thatfiredev Oct 26, 2022
db4cb23
Merge branch 'master' into lk/merge-master-into-fad-next
lfkellogg Oct 26, 2022
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
49 changes: 49 additions & 0 deletions .github/workflows/create_releases.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Create release

on:
workflow_dispatch:
inputs:
name:
description: 'Release name'
required: true
type: string

jobs:
create-branches:
runs-on: ubuntu-latest
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
- name: Create base branch
uses: peterjgrainger/[email protected]
with:
branch: '${{ inputs.name }}'
- name: Create release branch
uses: peterjgrainger/[email protected]
with:
branch: '${{ inputs.name }}.release'

create-pull-request:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Create release configuration template
run: |
git config user.name 'Create Release GA'
git config user.email '[email protected]'
echo "[release]" > release.cfg
echo "name = ${{ inputs.name }}" >> release.cfg
echo "mode = RELEASE" >> release.cfg
echo "" >> release.cfg
echo "[modules]" >> release.cfg
echo "" >> release.cfg
git add release.cfg
git commit -a -m 'Create release config'

- name: Create Pull Request
uses: peter-evans/create-pull-request@v4
with:
base: '${{ inputs.name }}'
branch: '${{ inputs.name }}.release'
title: '${{ inputs.name}} release'
4 changes: 2 additions & 2 deletions appcheck/firebase-appcheck-debug-testing/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version=16.0.3
latestReleasedVersion=16.0.2
version=16.1.1
latestReleasedVersion=16.1.0
4 changes: 2 additions & 2 deletions appcheck/firebase-appcheck-debug/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version=16.0.3
latestReleasedVersion=16.0.2
version=16.1.1
latestReleasedVersion=16.1.0
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,12 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
import org.robolectric.annotation.LooperMode;

/** Tests for {@link DebugAppCheckProvider}. */
@RunWith(RobolectricTestRunner.class)
@Config(manifest = Config.NONE)
@LooperMode(LooperMode.Mode.LEGACY)
public class DebugAppCheckProviderTest {

private static final String DEBUG_SECRET = "debugSecret";
Expand Down
4 changes: 2 additions & 2 deletions appcheck/firebase-appcheck-interop/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version=16.0.3
latestReleasedVersion=16.0.2
version=16.1.1
latestReleasedVersion=16.1.0
4 changes: 2 additions & 2 deletions appcheck/firebase-appcheck-playintegrity/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version=16.0.3
latestReleasedVersion=16.0.2
version=16.1.1
latestReleasedVersion=16.1.0
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,12 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
import org.robolectric.annotation.LooperMode;

/** Tests for {@link PlayIntegrityAppCheckProvider}. */
@RunWith(RobolectricTestRunner.class)
@Config(manifest = Config.NONE)
@LooperMode(LooperMode.Mode.LEGACY)
public class PlayIntegrityAppCheckProviderTest {

private static final String PROJECT_NUMBER = "123456";
Expand Down
4 changes: 2 additions & 2 deletions appcheck/firebase-appcheck-safetynet/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version=16.0.3
latestReleasedVersion=16.0.2
version=16.1.1
latestReleasedVersion=16.1.0
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,12 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
import org.robolectric.annotation.LooperMode;

/** Tests for {@link SafetyNetAppCheckProvider}. */
@RunWith(RobolectricTestRunner.class)
@Config(manifest = Config.NONE)
@LooperMode(LooperMode.Mode.LEGACY)
public class SafetyNetAppCheckProviderTest {

private static final String API_KEY = "apiKey";
Expand Down
4 changes: 2 additions & 2 deletions appcheck/firebase-appcheck/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version=16.0.3
latestReleasedVersion=16.0.2
version=16.1.1
latestReleasedVersion=16.1.0
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,12 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
import org.robolectric.annotation.LooperMode;

/** Tests for {@link DefaultFirebaseAppCheck}. */
@RunWith(RobolectricTestRunner.class)
@Config(manifest = Config.NONE)
@LooperMode(LooperMode.Mode.LEGACY)
public class DefaultFirebaseAppCheckTest {

private static final String EXCEPTION_TEXT = "exceptionText";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,10 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.LooperMode;

@RunWith(RobolectricTestRunner.class)
@LooperMode(LooperMode.Mode.LEGACY)
public class DefaultTokenRefresherTest {

private static final long TIME_TO_REFRESH_MILLIS = 1000L;
Expand Down
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ ext {
supportAnnotationsVersion = '28.0.0'
googleTruthVersion = '1.1.2'
grpcVersion = '1.48.1'
robolectricVersion = '4.3.1'
robolectricVersion = '4.9'
protocVersion = '3.17.3'
javaliteVersion = '3.17.3'
}
Expand All @@ -66,6 +66,7 @@ firebaseContinuousIntegration {
ignorePaths = [
/.*\.gitignore$/,
/.*\/.*.md$/,
/.*\.github.*/,
]
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,12 @@ public class BomGeneratorTask extends DefaultTask {
"com.google.firebase:firebase-appcheck-playintegrity",
"com.google.firebase:firebase-appcheck-safetynet",
"com.google.firebase:firebase-appcheck",
"com.google.firebase:firebase-appindexing",
"com.google.firebase:firebase-auth",
"com.google.firebase:firebase-auth-ktx",
"com.google.firebase:firebase-common",
"com.google.firebase:firebase-common-ktx",
"com.google.firebase:firebase-config",
"com.google.firebase:firebase-config-ktx",
"com.google.firebase:firebase-core",
"com.google.firebase:firebase-crashlytics",
"com.google.firebase:firebase-crashlytics-ktx",
"com.google.firebase:firebase-crashlytics-ndk",
Expand All @@ -78,7 +76,6 @@ public class BomGeneratorTask extends DefaultTask {
"com.google.firebase:firebase-firestore-ktx",
"com.google.firebase:firebase-functions",
"com.google.firebase:firebase-functions-ktx",
"com.google.firebase:firebase-iid",
"com.google.firebase:firebase-inappmessaging",
"com.google.firebase:firebase-inappmessaging-display",
"com.google.firebase:firebase-inappmessaging-display-ktx",
Expand Down Expand Up @@ -109,6 +106,9 @@ public class BomGeneratorTask extends DefaultTask {
"firebase-appcheck-interop",
"firebase-appdistribution-gradle",
"firebase-appindexing-license",
"firebase-appindexing",
"firebase-iid",
"firebase-core",
"firebase-auth-common",
"firebase-auth-impl",
"firebase-auth-interop",
Expand Down
4 changes: 2 additions & 2 deletions firebase-abt/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version=21.0.3
latestReleasedVersion=21.0.2
version=21.1.1
latestReleasedVersion=21.1.0
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,10 @@
import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.LooperMode;

@RunWith(RobolectricTestRunner.class)
@LooperMode(LooperMode.Mode.LEGACY)
public class FirebaseAppDistributionProxyTest {

private FirebaseAppDistribution firebaseAppDistribution;
Expand Down
2 changes: 1 addition & 1 deletion firebase-appdistribution/firebase-appdistribution.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ dependencies {
runtimeOnly project(':firebase-installations')

testImplementation 'junit:junit:4.13.2'
testImplementation "org.robolectric:robolectric:4.8.1"
testImplementation "org.robolectric:robolectric:$robolectricVersion"
testImplementation "com.google.truth:truth:$googleTruthVersion"
testImplementation 'org.mockito:mockito-inline:3.4.0'
testImplementation 'androidx.test:core:1.2.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,11 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.annotation.Config;
import org.robolectric.annotation.LooperMode;

@RunWith(AndroidJUnit4.class)
@Config(sdk = 25)
@LooperMode(LooperMode.Mode.LEGACY)
public class DataCollectionPostNDefaultDisabledTest {

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.annotation.Config;
import org.robolectric.annotation.LooperMode;

@RunWith(AndroidJUnit4.class)
@Config(sdk = 19)
Expand Down Expand Up @@ -81,6 +82,7 @@ public void setDataCollectionDefaultEnabledTrue_shouldUpdateSharedPrefs() {
}

@Test
@LooperMode(LooperMode.Mode.LEGACY)
public void setDataCollectionDefaultEnabledTrue_shouldEmitEvents() {
withApp(
app -> {
Expand Down
4 changes: 2 additions & 2 deletions firebase-common/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version=20.1.3
latestReleasedVersion=20.1.2
version=20.2.1
latestReleasedVersion=20.2.0
android.enableUnitTestBinaryResources=true
4 changes: 2 additions & 2 deletions firebase-config/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.
#

version=21.1.3
latestReleasedVersion=21.1.2
version=21.2.1
latestReleasedVersion=21.2.0
android.enableUnitTestBinaryResources=true

Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
import org.robolectric.annotation.LooperMode;
import org.skyscreamer.jsonassert.JSONAssert;

/**
Expand All @@ -93,6 +94,7 @@
@Config(
manifest = Config.NONE,
shadows = {ShadowPreconditions.class})
@LooperMode(LooperMode.Mode.LEGACY)
public final class FirebaseRemoteConfigTest {
private static final String APP_ID = "1:14368190084:android:09cb977358c6f241";
private static final String API_KEY = "AIzaSyabcdefghijklmnopqrstuvwxyz1234567";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
import org.robolectric.annotation.LooperMode;

/**
* Unit tests for the Firebase Remote Config Component.
Expand Down Expand Up @@ -92,6 +93,7 @@ public void setUp() {
}

@Test
@LooperMode(LooperMode.Mode.LEGACY)
public void frc2p_doesNotCallAbt() throws Exception {

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

@Test
@LooperMode(LooperMode.Mode.LEGACY)
public void frcNonMainFirebaseApp_doesNotCallAbt() throws Exception {

when(mockFirebaseApp.getName()).thenReturn("secondary");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
import org.robolectric.annotation.LooperMode;
import org.skyscreamer.jsonassert.JSONAssert;

/**
Expand All @@ -99,6 +100,7 @@
*/
@RunWith(RobolectricTestRunner.class)
@Config(manifest = Config.NONE)
@LooperMode(LooperMode.Mode.LEGACY)
public class ConfigFetchHandlerTest {
private static final String INSTALLATION_ID = "'fL71_VyL3uo9jNMWu1L60S";
private static final String INSTALLATION_AUTH_TOKEN =
Expand Down
4 changes: 2 additions & 2 deletions firebase-crashlytics-ndk/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version=18.2.14
latestReleasedVersion=18.2.13
version=18.3.2
latestReleasedVersion=18.3.13
2 changes: 1 addition & 1 deletion firebase-crashlytics/firebase-crashlytics.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ dependencies {

testImplementation 'androidx.test:runner:1.4.0'
testImplementation 'androidx.test:core:1.4.0'
testImplementation "org.robolectric:robolectric:4.5"
testImplementation "org.robolectric:robolectric:$robolectricVersion"
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.mockito:mockito-core:3.4.3'

Expand Down
4 changes: 2 additions & 2 deletions firebase-crashlytics/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version=18.2.14
latestReleasedVersion=18.2.13
version=18.3.2
latestReleasedVersion=18.3.13
1 change: 1 addition & 0 deletions firebase-database/firebase-database.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ dependencies {

testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.25.0'
testImplementation 'org.codehaus.plexus:plexus-utils:3.4.2'
testImplementation "org.robolectric:robolectric:$robolectricVersion"
testImplementation 'com.firebase:firebase-token-generator:2.0.0'
testImplementation 'com.fasterxml.jackson.core:jackson-core:2.9.8'
Expand Down
4 changes: 2 additions & 2 deletions firebase-database/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

version=20.0.7
latestReleasedVersion=20.0.6
version=20.1.1
latestReleasedVersion=20.1.0
android.enableUnitTestBinaryResources=true
4 changes: 2 additions & 2 deletions firebase-datatransport/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version=18.1.7
latestReleasedVersion=18.1.6
version=18.1.8
latestReleasedVersion=18.1.7
android.enableUnitTestBinaryResources=true

4 changes: 2 additions & 2 deletions firebase-dynamic-links/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

version=21.0.3
latestReleasedVersion=21.0.2
version=21.1.1
latestReleasedVersion=21.1.0
android.enableUnitTestBinaryResources=true
4 changes: 1 addition & 3 deletions firebase-firestore/firebase-firestore.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,7 @@ dependencies {
testImplementation 'androidx.test:core:1.2.0'
testImplementation "org.hamcrest:hamcrest-junit:2.0.0.0"
testImplementation 'org.mockito:mockito-core:2.25.0'
testImplementation ("org.robolectric:robolectric:4.8.2") {
exclude group: 'com.google.protobuf', module: 'protobuf-java'
}
testImplementation "org.robolectric:robolectric:$robolectricVersion"
testImplementation "com.google.truth:truth:$googleTruthVersion"
testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.9.8'
testImplementation 'com.google.guava:guava-testlib:12.0-rc2'
Expand Down
4 changes: 2 additions & 2 deletions firebase-firestore/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version=24.3.2
latestReleasedVersion=24.3.1
version=24.4.1
latestReleasedVersion=24.4.0
1 change: 1 addition & 0 deletions firebase-firestore/ktx/ktx.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ dependencies {
implementation 'androidx.annotation:annotation:1.1.0'
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
implementation 'com.google.android.gms:play-services-basement:18.1.0'
testCompileOnly "com.google.protobuf:protobuf-java:$protocVersion"
testImplementation project(':firebase-database-collection')
testImplementation 'org.mockito:mockito-core:2.25.0'
testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.9.8'
Expand Down
Loading