Skip to content

Commit 07ae4d4

Browse files
Merge branch 'refs/heads/main' into tushar-khandelwal/rc-custom-targeting
# Conflicts: # firebase-config/gradle.properties
2 parents d1cac74 + b9013d5 commit 07ae4d4

File tree

232 files changed

+2368
-1633
lines changed

Some content is hidden

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

232 files changed

+2368
-1633
lines changed

.github/workflows/api-information.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
distribution: temurin
1919
cache: gradle
2020
- name: Set up Python 3.10
21-
uses: actions/setup-python@v4
21+
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
2222
with:
2323
python-version: '3.10'
2424
- name: Set up fireci

.github/workflows/copyright-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-22.04
1212
steps:
1313
- uses: actions/[email protected]
14-
- uses: actions/setup-python@v2
14+
- uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
1515
with:
1616
python-version: '3.9'
1717
- run: |

.github/workflows/fireci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616
runs-on: ubuntu-22.04
1717
steps:
1818
- uses: actions/[email protected]
19-
- uses: actions/setup-python@v2
19+
- uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
2020
with:
2121
python-version: '3.8'
2222
- run: |
2323
pip install -e "ci/fireci[test]"
2424
- run: |
2525
pytest ci/fireci
2626
- run: |
27-
mypy --config-file ci/fireci/setup.cfg ci/fireci/
27+
mypy --config-file ci/fireci/setup.cfg ci/fireci/

.github/workflows/fireperf-e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
distribution: temurin
3535
cache: gradle
3636
- name: Set up Python 3.10
37-
uses: actions/setup-python@v4
37+
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
3838
with:
3939
python-version: '3.10'
4040
- name: Set up fireci

.github/workflows/health-metrics.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
distribution: temurin
3636
cache: gradle
3737
- name: Set up Python 3.10
38-
uses: actions/setup-python@v4
38+
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
3939
with:
4040
python-version: '3.10'
4141
- uses: google-github-actions/auth@v2
@@ -70,7 +70,7 @@ jobs:
7070
distribution: temurin
7171
cache: gradle
7272
- name: Set up Python 3.10
73-
uses: actions/setup-python@v4
73+
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
7474
with:
7575
python-version: '3.10'
7676
- uses: google-github-actions/auth@v2
@@ -106,7 +106,7 @@ jobs:
106106
distribution: temurin
107107
cache: gradle
108108
- name: Set up Python 3.10
109-
uses: actions/setup-python@v4
109+
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
110110
with:
111111
python-version: '3.10'
112112
- uses: google-github-actions/auth@v2

.github/workflows/make-bom.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Set up Python 3.10
11-
uses: actions/setup-python@v4
11+
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
1212
with:
1313
python-version: '3.10'
1414
- uses: actions/[email protected]

.github/workflows/release-note-changes.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
cache: gradle
3434

3535
- name: Set up Python 3.10
36-
uses: actions/setup-python@v4
36+
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
3737
if: ${{ steps.changed-files.outputs.any_changed == 'true' }}
3838
with:
3939
python-version: '3.10'

.github/workflows/update-cpp-sdk-on-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
runs-on: ubuntu-latest
5252
steps:
5353
- name: Setup python
54-
uses: actions/setup-python@v2
54+
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
5555
with:
5656
python-version: 3.7
5757

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

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

2020
firebaseLibrary {
21-
libraryGroup "appcheck"
21+
libraryGroup = "appcheck"
2222
testLab.enabled = true
23-
publishSources = true
2423
releaseNotes {
2524
name.set("{{app_check}} Debug Testing")
2625
versionName.set("appcheck-debug-testing")
@@ -60,21 +59,21 @@ dependencies {
6059
api 'com.google.firebase:firebase-common-ktx:21.0.0'
6160
api 'com.google.firebase:firebase-components:18.0.0'
6261

63-
implementation "androidx.test:core:$androidxTestCoreVersion"
62+
implementation libs.androidx.test.core
6463
implementation 'com.google.android.gms:play-services-base:18.0.1'
6564
implementation 'com.google.android.gms:play-services-tasks:18.0.1'
6665

6766
testImplementation project(':appcheck:firebase-appcheck-playintegrity')
68-
testImplementation "androidx.test:core:$androidxTestCoreVersion"
69-
testImplementation "com.google.truth:truth:$googleTruthVersion"
67+
testImplementation libs.androidx.test.core
68+
testImplementation libs.truth
7069
testImplementation 'junit:junit:4.13-beta-2'
7170
testImplementation 'org.mockito:mockito-core:2.25.0'
72-
testImplementation "org.robolectric:robolectric:$robolectricVersion"
71+
testImplementation libs.robolectric
7372

7473
androidTestImplementation project(':firebase-storage')
7574
androidTestImplementation 'androidx.test:runner:1.2.0'
76-
androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
77-
androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
75+
androidTestImplementation libs.androidx.test.junit
76+
androidTestImplementation libs.truth
7877
androidTestImplementation 'junit:junit:4.13-beta-2'
7978
androidTestImplementation 'org.mockito:mockito-core:2.25.0'
8079
}

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

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

1919
firebaseLibrary {
20-
libraryGroup "appcheck"
21-
publishSources = true
20+
libraryGroup = "appcheck"
2221
releaseNotes {
2322
name.set("{{app_check}} Debug")
2423
versionName.set("appcheck-debug")
@@ -63,10 +62,10 @@ dependencies {
6362
exclude group: 'com.google.firebase', module: 'firebase-common'
6463
exclude group: 'com.google.firebase', module: 'firebase-components'
6564
}
66-
testImplementation "androidx.test:core:$androidxTestCoreVersion"
65+
testImplementation libs.androidx.test.core
6766
testImplementation 'androidx.test:rules:1.2.0'
68-
testImplementation "com.google.truth:truth:$googleTruthVersion"
67+
testImplementation libs.truth
6968
testImplementation 'junit:junit:4.13-beta-2'
7069
testImplementation 'org.mockito:mockito-core:2.25.0'
71-
testImplementation "org.robolectric:robolectric:$robolectricVersion"
70+
testImplementation libs.robolectric
7271
}

0 commit comments

Comments
 (0)