Skip to content

Commit 5f72f15

Browse files
wu-huiwu-hui
committed
Merge branch 'master' into wuandy/MemoryLRU
2 parents 87edb09 + 24197b5 commit 5f72f15

File tree

289 files changed

+11260
-1990
lines changed

Some content is hidden

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

289 files changed

+11260
-1990
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
submodules: true
2020

2121
- name: Set up JDK 11
22-
uses: actions/setup-java@v2
22+
uses: actions/setup-java@v3
2323
with:
2424
java-version: 11
2525
distribution: temurin

‎.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/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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# Unreleased
2+
3+
# 16.1.2
24
* [unchanged] Updated to keep [app_check] SDK versions aligned.
35

46
# 16.1.1

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

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# Unreleased
2+
3+
# 16.1.2
24
* [unchanged] Updated to keep [app_check] SDK versions aligned.
35

46
# 16.1.1

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

‎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

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# Unreleased
2+
3+
# 16.1.2
24
* [unchanged] Updated to keep [app_check] SDK versions aligned.
35

46
# 16.1.1

‎appcheck/firebase-appcheck-playintegrity/firebase-appcheck-playintegrity.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-playintegrity/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=16.1.2
2-
latestReleasedVersion=16.1.1
1+
version=16.1.3
2+
latestReleasedVersion=16.1.2

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# Unreleased
2+
3+
# 16.1.2
24
* [deprecated] Added deprecation tagging to the `SafetyNetAppCheckProviderFactory` class. (#4686)
35

46
# 16.1.1

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ android {
4141
}
4242

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

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

‎appcheck/firebase-appcheck/CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
11
# Unreleased
2+
* [feature] Added `getLimtedUseAppCheckToken()` for obtaining limited-use tokens
3+
for protecting non-Firebase backends.
4+
5+
# 16.1.2
26
* [unchanged] Updated to keep [app_check] SDK versions aligned.
37

48

9+
## Kotlin
10+
The Kotlin extensions library transitively includes the updated
11+
`firebase-appcheck` library. The Kotlin extensions library has no additional
12+
updates.
13+
514
# 16.1.1
615
* [changed] Migrated [app_check] SDKs to use standard Firebase executors.
716
(GitHub [#4431](//github.com/firebase/firebase-android-sdk/issues/4431){: .external}

‎appcheck/firebase-appcheck/api.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ package com.google.firebase.appcheck {
2121
method @NonNull public abstract com.google.android.gms.tasks.Task<com.google.firebase.appcheck.AppCheckToken> getAppCheckToken(boolean);
2222
method @NonNull public static com.google.firebase.appcheck.FirebaseAppCheck getInstance();
2323
method @NonNull public static com.google.firebase.appcheck.FirebaseAppCheck getInstance(@NonNull com.google.firebase.FirebaseApp);
24+
method @NonNull public abstract com.google.android.gms.tasks.Task<com.google.firebase.appcheck.AppCheckToken> getLimitedUseAppCheckToken();
2425
method public abstract void installAppCheckProviderFactory(@NonNull com.google.firebase.appcheck.AppCheckProviderFactory);
2526
method public abstract void installAppCheckProviderFactory(@NonNull com.google.firebase.appcheck.AppCheckProviderFactory, boolean);
2627
method public abstract void removeAppCheckListener(@NonNull com.google.firebase.appcheck.FirebaseAppCheck.AppCheckListener);

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

Lines changed: 5 additions & 4 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

@@ -42,10 +43,10 @@ android {
4243
}
4344

4445
dependencies {
45-
implementation project(':firebase-annotations')
46-
implementation project(':firebase-common')
47-
implementation project(':firebase-components')
48-
implementation project(":appcheck:firebase-appcheck-interop")
46+
implementation 'com.google.firebase:firebase-annotations:16.2.0'
47+
implementation 'com.google.firebase:firebase-common:20.3.1'
48+
implementation 'com.google.firebase:firebase-components:17.1.0'
49+
implementation project(':appcheck:firebase-appcheck-interop')
4950
implementation 'com.google.android.gms:play-services-base:18.0.1'
5051
implementation 'com.google.android.gms:play-services-tasks:18.0.1'
5152

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

‎appcheck/firebase-appcheck/ktx/ktx.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ plugins {
1818
}
1919

2020
firebaseLibrary {
21-
releaseWith project(':appcheck:firebase-appcheck')
21+
libraryGroup "appcheck"
2222
testLab.enabled = true
2323
publishJavadoc = true
2424
publishSources = true
@@ -53,9 +53,9 @@ android {
5353
dependencies {
5454
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
5555

56-
implementation project(':firebase-common')
57-
implementation project(':firebase-components')
58-
implementation project(':firebase-common:ktx')
56+
implementation 'com.google.firebase:firebase-common:20.3.1'
57+
implementation 'com.google.firebase:firebase-components:17.1.0'
58+
implementation 'com.google.firebase:firebase-common-ktx:20.3.1'
5959
implementation 'androidx.annotation:annotation:1.1.0'
6060
implementation project(path: ':appcheck:firebase-appcheck')
6161
implementation project(path: ':appcheck:firebase-appcheck-interop')

0 commit comments

Comments
 (0)