Skip to content

Commit ae5916a

Browse files
rlazorlazo
authored
Merge branch 'master' into dependabot/bundler/ci/danger/git-1.13.1
2 parents 696dc2c + 734adc0 commit ae5916a

File tree

478 files changed

+20759
-5143
lines changed

Some content is hidden

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

478 files changed

+20759
-5143
lines changed

‎.github/workflows/build-release-artifacts.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,23 @@ on:
88

99
jobs:
1010
build-artifacts:
11-
runs-on: ubuntu-latest
11+
# TODO(b/271315039) - Revert back to ubuntu when fixed
12+
runs-on: macos-latest
1213
env:
1314
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1415
steps:
1516
- uses: actions/checkout@v3
1617

18+
- name: Set up JDK 11
19+
uses: actions/setup-java@v3
20+
with:
21+
java-version: 11
22+
distribution: temurin
23+
cache: gradle
24+
1725
- name: Perform gradle build
1826
run: |
19-
./gradlew firebasePublish -PpublishConfigFilePath=release.cfg -PpublishMode=RELEASE -PincludeFireEscapeArtifacts=true
27+
./gradlew firebasePublish -PpublishConfigFilePath=release.cfg -PpublishMode=RELEASE
2028
2129
- name: Generate release notes
2230
run: |

‎.github/workflows/changelog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ concurrency:
88
cancel-in-progress: true
99

1010
jobs:
11-
danger:
11+
changelog-check:
1212
runs-on: ubuntu-22.04
1313
env:
1414
BUNDLE_GEMFILE: ./ci/danger/Gemfile

‎.github/workflows/check-head-dependencies.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Check Head Dependencies
2+
3+
on:
4+
workflow_dispatch:
5+
pull_request:
6+
branches:
7+
- 'releases/**'
8+
9+
jobs:
10+
build-artifacts:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v3
14+
15+
- name: Perform gradle build
16+
run: |
17+
./gradlew checkHeadDependencies -PpublishConfigFilePath=release.cfg -PpublishMode=RELEASE

‎.github/workflows/diff-javadoc.yml

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,50 +5,44 @@ on:
55

66
jobs:
77
build:
8-
runs-on: ubuntu-latest
8+
runs-on: macos-latest
99
permissions:
1010
pull-requests: write
1111
steps:
12-
- name: Make Dir
12+
- name: Make diff directory
1313
run: mkdir ~/diff
1414

15-
- uses: actions/checkout@v3
15+
- name: Checkout PR branch
16+
uses: actions/checkout@v3
1617
with:
1718
fetch-depth: 2
1819
submodules: true
1920

2021
- name: Set up JDK 11
21-
uses: actions/setup-java@v2
22+
uses: actions/setup-java@v3
2223
with:
2324
java-version: 11
2425
distribution: temurin
2526
cache: gradle
2627

27-
- name: Changed Modules
28-
id: changed-modules
29-
run: |
30-
git diff --name-only HEAD~1 | xargs printf -- '--changed-git-paths %s\n' | xargs ./gradlew writeChangedProjects --output-file-path=modules.json --only-firebase-sdks
31-
echo "run=$(cat modules.json | sed "s/[]\"[]//g" | sed "s/,/\n/g" | xargs printf -- "%s:kotlinDoc ")" >> $GITHUB_OUTPUT
28+
- name: Generate docs for PR branch
29+
run: ./gradlew kotlindoc
3230

33-
- name: Build
34-
# Certain SDKs won't export docs, make a blank folder to diff if that's the case
35-
run: mkdir build && ./gradlew ${{ steps.changed-modules.outputs.run }}
36-
37-
- name: Move original docs
31+
- name: Move branch docs to diff directory
3832
run: mv build ~/diff/modified
3933

40-
- uses: actions/checkout@v3
34+
- name: Checkout master
35+
uses: actions/checkout@v3
4136
with:
4237
ref: ${{ github.base_ref }}
4338

44-
- name: Build
45-
# Certain SDKs won't export docs, make a blank folder to diff if that's the case
46-
run: mkdir build && ./gradlew ${{ steps.changed-modules.outputs.run }}
39+
- name: Generate docs for Master
40+
run: ./gradlew kotlindoc
4741

48-
- name: Move modified docs
42+
- name: Move master docs to diff directory
4943
run: mv build ~/diff/original
5044

51-
- name: Diff docs
45+
- name: Get diff between Master and Branch docs
5246
run: >
5347
`# Recursively diff directories, including new files, git style, with 3 lines of context`
5448
diff -wEburN ~/diff/original ~/diff/modified

‎.github/workflows/fireperf-e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
title: 'FirePerf E2E Test Failures',
9494
body: text,
9595
labels: ['fireperf-e2e-tests'],
96-
assignees: ['jeremyjiang-dev', 'leotianlizhan', 'raymondlam', 'visumickey']
96+
assignees: ['raymondlam', 'visumickey']
9797
});
9898
}
9999
- name: Upload test artifacts

‎.github/workflows/merge-to-main.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,5 @@ jobs:
2626
using a feature branch first, and only merge into the main
2727
branch when the code complete and ready to be released.
2828
29-
30-
**Add the 'main-merge-ack' label to your PR to confirm
31-
merging into the main branch is intended.**
32-
33-
- name: Label checker
34-
if: "!contains( github.event.pull_request.labels.*.name, 'main-merge-ack')"
35-
run: |
36-
echo Missing 'main-merge-ack' label. Read the comment about merging to master in your PR for more information.
37-
exit 1
38-
3929
- name: Success
4030
run: exit 0

‎.github/workflows/semver-check.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Semver Check
2+
3+
on:
4+
workflow_dispatch:
5+
pull_request:
6+
branches:
7+
- 'releases/**'
8+
9+
jobs:
10+
build-artifacts:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v3
14+
15+
- name: Perform gradle build
16+
run: |
17+
./gradlew semverCheckForRelease -PpublishConfigFilePath=release.cfg -PpublishMode=RELEASE

‎.github/workflows/sessions-e2e.yml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: Firebase Sessions E2E Tests
2+
3+
on:
4+
schedule:
5+
- cron: 24 */4 * * * # every 4 hours at 24 minutes past the hour
6+
workflow_dispatch: # allow triggering the workflow manually
7+
8+
concurrency:
9+
group: ${{ github.workflow }}
10+
11+
env:
12+
SESSIONS_E2E_GOOGLE_SERVICES: ${{ secrets.SESSIONS_E2E_GOOGLE_SERVICES }}
13+
14+
jobs:
15+
test:
16+
17+
runs-on: ubuntu-latest
18+
19+
steps:
20+
- name: Checkout firebase-sessions
21+
uses: actions/checkout@v3
22+
with:
23+
ref: 'firebase-sessions'
24+
25+
- name: set up JDK 11
26+
uses: actions/setup-java@v3
27+
with:
28+
java-version: '11'
29+
distribution: 'temurin'
30+
cache: gradle
31+
32+
- name: Add google-services.json
33+
run: |
34+
echo $SESSIONS_E2E_GOOGLE_SERVICES | base64 -d > google-services.json
35+
36+
- uses: google-github-actions/auth@v0
37+
with:
38+
credentials_json: ${{ secrets.GCP_SERVICE_ACCOUNT }}
39+
- uses: google-github-actions/setup-gcloud@v0
40+
- name: Run sessions end-to-end tests
41+
env:
42+
FTL_RESULTS_BUCKET: fireescape
43+
run: |
44+
./gradlew :firebase-sessions:test-app:deviceCheck withErrorProne -PtargetBackend="prod"

‎.github/workflows/validate-dependencies.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Validate Artifact Dependencies
2+
3+
on:
4+
workflow_dispatch:
5+
pull_request:
6+
branches:
7+
- 'releases/**'
8+
9+
jobs:
10+
build-artifacts:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v3
14+
15+
- name: Perform gradle build
16+
run: |
17+
./gradlew validatePomForRelease -PpublishConfigFilePath=release.cfg -PpublishMode=RELEASE

‎README.md

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,8 +251,10 @@ projects may be published as follows.
251251

252252
### Code Formatting
253253

254-
Code in this repo is formatted with the google-java-format tool. You can enable
255-
this formatting in Android Studio by downloading and installing the
254+
#### Java
255+
256+
Java code in this repo is formatted with the google-java-format tool. You can
257+
enable this formatting in Android Studio by downloading and installing the
256258
[google-java-format plugin](https://github.com/google/google-java-format).
257259
The plugin is disabled by default, but the repo contains configuration information
258260
and links to additional plugins.
@@ -262,6 +264,18 @@ To run formatting on your entire project you can run
262264
./gradlew :<firebase-project>:googleJavaFormat
263265
```
264266

267+
#### Kotlin
268+
269+
Kotlin code in this repo is formatted with the `ktfmt` tool. You can enable
270+
this formatting in Android Studio by downloading and installing the
271+
[ktfmt plugin](https://plugins.jetbrains.com/plugin/14912-ktfmt).
272+
Enable the plugin in Preferences | Editor | ktfmt Settings. and set code style to Google (internal).
273+
274+
To run formatting on your entire project you can run
275+
```bash
276+
./gradlew :<firebase-project>:ktfmtFormat
277+
```
278+
265279
### Contributing
266280

267281
We love contributions! Please read our

‎appcheck/firebase-appcheck-debug-testing/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
# Unreleased
2+
3+
# 16.1.2
4+
* [unchanged] Updated to keep [app_check] SDK versions aligned.
5+
6+
# 16.1.1
27
* [changed] Integrated the [app_check] Debug Testing SDK with Firebase Components. (#4436)
38

49
# 16.1.0

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ plugins {
1717
}
1818

1919
firebaseLibrary {
20+
libraryGroup "appcheck"
2021
testLab.enabled = true
2122
publishSources = true
2223
}
@@ -44,8 +45,8 @@ android {
4445
}
4546

4647
dependencies {
47-
implementation project(':firebase-common')
48-
implementation project(':firebase-components')
48+
implementation 'com.google.firebase:firebase-common:20.3.1'
49+
implementation 'com.google.firebase:firebase-components:17.1.0'
4950
implementation project(':appcheck:firebase-appcheck')
5051
implementation project(':appcheck:firebase-appcheck-debug')
5152
implementation project(':appcheck:firebase-appcheck-interop')

‎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.1.1
2-
latestReleasedVersion=16.1.0
1+
version=16.1.3
2+
latestReleasedVersion=16.1.2

‎appcheck/firebase-appcheck-debug-testing/src/main/java/com/google/firebase/appcheck/debug/testing/DebugAppCheckTestHelper.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
package com.google.firebase.appcheck.debug.testing;
1616

1717
import androidx.annotation.NonNull;
18+
import androidx.test.platform.app.InstrumentationRegistry;
1819
import com.google.firebase.FirebaseApp;
1920
import com.google.firebase.appcheck.AppCheckProviderFactory;
2021
import com.google.firebase.appcheck.FirebaseAppCheck;
@@ -64,8 +65,8 @@
6465
*/
6566
public final class DebugAppCheckTestHelper {
6667
/**
67-
* Creates a {@link DebugAppCheckTestHelper} instance with a debug secret obtained from {@link
68-
* androidx.test.platform.app.InstrumentationRegistry} arguments.
68+
* Creates a {@link DebugAppCheckTestHelper} instance with a debug secret obtained from <br>
69+
* {@link InstrumentationRegistry} arguments.
6970
*/
7071
@NonNull
7172
public static DebugAppCheckTestHelper fromInstrumentationArgs() {

‎appcheck/firebase-appcheck-debug/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
# Unreleased
2+
3+
# 16.1.2
4+
* [unchanged] Updated to keep [app_check] SDK versions aligned.
5+
6+
# 16.1.1
27
* [changed] Migrated [app_check] SDKs to use standard Firebase executors. (#4431, #4449)
38
* [changed] Integrated the [app_check] Debug SDK with Firebase Components. (#4436)
49
* [changed] Moved Task continuations off the main thread. (#4453)

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ plugins {
1717
}
1818

1919
firebaseLibrary {
20+
libraryGroup "appcheck"
2021
publishSources = true
2122
}
2223

@@ -41,9 +42,9 @@ android {
4142
}
4243

4344
dependencies {
44-
implementation project(':firebase-annotations')
45-
implementation project(':firebase-common')
46-
implementation project(':firebase-components')
45+
implementation 'com.google.firebase:firebase-annotations:16.2.0'
46+
implementation 'com.google.firebase:firebase-common:20.3.1'
47+
implementation 'com.google.firebase:firebase-components:17.1.0'
4748
implementation project(':appcheck:firebase-appcheck')
4849
implementation 'com.google.android.gms:play-services-base:18.0.1'
4950
implementation 'com.google.android.gms:play-services-tasks:18.0.1'

‎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.1.1
2-
latestReleasedVersion=16.1.0
1+
version=16.1.3
2+
latestReleasedVersion=16.1.2

‎appcheck/firebase-appcheck-debug/src/main/java/com/google/firebase/appcheck/debug/DebugAppCheckProviderFactory.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@
1818
import com.google.firebase.FirebaseApp;
1919
import com.google.firebase.appcheck.AppCheckProvider;
2020
import com.google.firebase.appcheck.AppCheckProviderFactory;
21+
import com.google.firebase.appcheck.FirebaseAppCheck;
2122
import com.google.firebase.appcheck.debug.internal.DebugAppCheckProvider;
2223

2324
/**
24-
* Implementation of an {@link AppCheckProviderFactory} that builds {@link DebugAppCheckProvider}s.
25+
* Implementation of an {@link AppCheckProviderFactory} that builds {@code DebugAppCheckProvider}s.
2526
*/
2627
public class DebugAppCheckProviderFactory implements AppCheckProviderFactory {
2728

@@ -30,10 +31,10 @@ public class DebugAppCheckProviderFactory implements AppCheckProviderFactory {
3031
private DebugAppCheckProviderFactory() {}
3132

3233
/**
33-
* Gets an instance of this class for installation into a {@link
34-
* com.google.firebase.appcheck.FirebaseAppCheck} instance. If no debug secret is found in {@link
35-
* android.content.SharedPreferences}, a new debug secret will be generated and printed to the
36-
* logcat. The debug secret should then be added to the allow list in the Firebase Console.
34+
* Gets an instance of this class for installation into a {@link FirebaseAppCheck} instance. If no
35+
* debug secret is found in {@link android.content.SharedPreferences}, a new debug secret will be
36+
* generated and printed to the logcat. The debug secret should then be added to the allow list in
37+
* the Firebase Console.
3738
*/
3839
@NonNull
3940
public static DebugAppCheckProviderFactory getInstance() {

‎appcheck/firebase-appcheck-interop/api.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,5 @@ package com.google.firebase.appcheck.interop {
1515
method public void onAppCheckTokenChanged(@NonNull com.google.firebase.appcheck.AppCheckTokenResult);
1616
}
1717

18-
public interface InternalAppCheckTokenProvider {
19-
method public void addAppCheckTokenListener(@NonNull com.google.firebase.appcheck.interop.AppCheckTokenListener);
20-
method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.appcheck.AppCheckTokenResult> getToken(boolean);
21-
method public void removeAppCheckTokenListener(@NonNull com.google.firebase.appcheck.interop.AppCheckTokenListener);
22-
}
23-
2418
}
2519

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ android {
4242
}
4343

4444
dependencies {
45-
implementation project(':firebase-common')
46-
implementation project(':firebase-components')
45+
implementation 'com.google.firebase:firebase-common:20.3.1'
46+
implementation 'com.google.firebase:firebase-components:17.1.0'
4747
implementation 'com.google.android.gms:play-services-base:18.0.1'
4848
implementation 'com.google.android.gms:play-services-tasks:18.0.1'
4949

0 commit comments

Comments
 (0)