Skip to content

Commit c2e289a

Browse files
visumickeyvisumickey
authored
Merge branch 'master' into perfDataCollectionStateForSessions
2 parents 564bcde + da631d2 commit c2e289a

File tree

90 files changed

+1584
-133
lines changed

Some content is hidden

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

90 files changed

+1584
-133
lines changed

‎.github/workflows/api-information.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
if: github.event.pull_request.head.repo.full_name == github.repository
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v3
10+
- uses: actions/checkout@v3.5.3
1111
with:
1212
fetch-depth: 2
1313
submodules: true

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
env:
1414
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1515
steps:
16-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v3.5.3
1717

1818
- name: Set up JDK 11
1919
uses: actions/setup-java@v3

‎.github/workflows/build-src-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
build-src-check:
1414
runs-on: ubuntu-22.04
1515
steps:
16-
- uses: actions/checkout@v3.0.2
16+
- uses: actions/checkout@v3.5.3
1717
- name: Set up JDK 11
1818
uses: actions/setup-java@v3
1919
with:

‎.github/workflows/changelog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
env:
1414
BUNDLE_GEMFILE: ./ci/danger/Gemfile
1515
steps:
16-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v3.5.3
1717
with:
1818
fetch-depth: 100
1919
submodules: true

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
check-head-dependencies:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v3.5.3
1414

1515
- name: Perform gradle build
1616
run: |

‎.github/workflows/ci_tests.yml

Lines changed: 44 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
outputs:
1717
modules: ${{ steps.changed-modules.outputs.modules }}
1818
steps:
19-
- uses: actions/checkout@v3.0.2
19+
- uses: actions/checkout@v3.5.3
2020
with:
2121
fetch-depth: 2
2222
submodules: true
@@ -44,7 +44,7 @@ jobs:
4444
module: ${{ fromJSON(needs.determine_changed.outputs.modules) }}
4545

4646
steps:
47-
- uses: actions/checkout@v3.0.2
47+
- uses: actions/checkout@v3.5.3
4848
with:
4949
fetch-depth: 2
5050
submodules: true
@@ -100,7 +100,7 @@ jobs:
100100
module: ${{ fromJSON(needs.determine_changed.outputs.modules) }}
101101

102102
steps:
103-
- uses: actions/checkout@v3.0.2
103+
- uses: actions/checkout@v3.5.3
104104
with:
105105
fetch-depth: 2
106106
submodules: true
@@ -130,6 +130,47 @@ jobs:
130130
run: |
131131
./gradlew ${{matrix.module}}:deviceCheck withErrorProne -PtargetBackend="prod"
132132
133+
firestore_custom_integ_tests:
134+
name: "Firestore Custom Instrumentation Tests Against Named DB"
135+
runs-on: ubuntu-22.04
136+
needs:
137+
- determine_changed
138+
# only run on post submit or PRs not originating from forks.
139+
if: ((github.repository == 'Firebase/firebase-android-sdk' && github.event_name == 'push') || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository)) && contains(fromJSON(needs.determine_changed.outputs.modules), ':firebase-firestore')
140+
strategy:
141+
fail-fast: false
142+
143+
steps:
144+
- uses: actions/[email protected]
145+
with:
146+
fetch-depth: 2
147+
submodules: true
148+
149+
- name: Set up JDK 11
150+
uses: actions/setup-java@v3
151+
with:
152+
java-version: 11
153+
distribution: temurin
154+
cache: gradle
155+
156+
- name: Add google-services.json
157+
env:
158+
INTEG_TESTS_GOOGLE_SERVICES: ${{ secrets.INTEG_TESTS_GOOGLE_SERVICES }}
159+
run: |
160+
echo $INTEG_TESTS_GOOGLE_SERVICES | base64 -d > google-services.json
161+
- uses: google-github-actions/auth@v0
162+
with:
163+
credentials_json: ${{ secrets.GCP_SERVICE_ACCOUNT }}
164+
- uses: google-github-actions/setup-gcloud@v0
165+
- name: Firestore Named DB Integ Tests
166+
env:
167+
FIREBASE_CI: 1
168+
FTL_RESULTS_BUCKET: android-ci
169+
FTL_RESULTS_DIR: ${{ github.event_name == 'pull_request' && format('pr-logs/pull/{0}/{1}/{2}/{3}_{4}/artifacts/', github.repository, github.event.pull_request.number, github.job, github.run_id, github.run_attempt) || format('logs/{0}/{1}_{2}/artifacts/', github.workflow, github.run_id, github.run_attempt)}}
170+
FIREBASE_APP_CHECK_DEBUG_SECRET: ${{ secrets.FIREBASE_APP_CHECK_DEBUG_SECRET }}
171+
run: |
172+
./gradlew firebase-firestore:deviceCheck withErrorProne -PtargetBackend="prod" -PtargetDatabaseId="test-db"
173+
133174
publish-test-results:
134175
name: "Publish Tests Results"
135176
needs:

‎.github/workflows/create_releases.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
create-pull-request:
2727
runs-on: ubuntu-latest
2828
steps:
29-
- uses: actions/checkout@v3
29+
- uses: actions/checkout@v3.5.3
3030
with:
3131
fetch-depth: 0
3232

‎.github/workflows/diff-javadoc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
run: mkdir ~/diff
1414

1515
- name: Checkout PR branch
16-
uses: actions/checkout@v3
16+
uses: actions/checkout@v3.5.3
1717
with:
1818
fetch-depth: 2
1919
submodules: true
@@ -32,7 +32,7 @@ jobs:
3232
run: mv build ~/diff/modified
3333

3434
- name: Checkout master
35-
uses: actions/checkout@v3
35+
uses: actions/checkout@v3.5.3
3636
with:
3737
ref: ${{ github.base_ref }}
3838

‎.github/workflows/fireci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
name: "fireci tests"
1616
runs-on: ubuntu-22.04
1717
steps:
18-
- uses: actions/checkout@v3.0.2
18+
- uses: actions/checkout@v3.5.3
1919
- uses: actions/setup-python@v2
2020
with:
2121
python-version: '3.8'

‎.github/workflows/fireperf-e2e.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ jobs:
2020
environment: [ prod, autopush ]
2121
steps:
2222
- name: Checkout firebase-android-sdk
23-
uses: actions/checkout@v3
23+
uses: actions/checkout@v3.5.3
2424
- name: Checkout firebase-android-buildtools
25-
uses: actions/checkout@v3
25+
uses: actions/checkout@v3.5.3
2626
with:
2727
repository: FirebasePrivate/firebase-android-buildtools
2828
token: ${{ secrets.GOOGLE_OSS_BOT_TOKEN }}

‎.github/workflows/health-metrics.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
&& github.event.pull_request.head.repo.full_name == github.repository)
2525
runs-on: ubuntu-latest
2626
steps:
27-
- uses: actions/checkout@v3
27+
- uses: actions/checkout@v3.5.3
2828
with:
2929
fetch-depth: 2
3030
submodules: true
@@ -59,7 +59,7 @@ jobs:
5959
&& github.event.pull_request.head.repo.full_name == github.repository)
6060
runs-on: ubuntu-latest
6161
steps:
62-
- uses: actions/checkout@v3
62+
- uses: actions/checkout@v3.5.3
6363
with:
6464
fetch-depth: 2
6565
submodules: true
@@ -95,7 +95,7 @@ jobs:
9595
&& github.event.pull_request.base.ref == 'master')
9696
runs-on: ubuntu-latest
9797
steps:
98-
- uses: actions/checkout@v3
98+
- uses: actions/checkout@v3.5.3
9999
with:
100100
fetch-depth: 2
101101
submodules: true

‎.github/workflows/jekyll-gh-pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
runs-on: ubuntu-latest
3232
steps:
3333
- name: Checkout
34-
uses: actions/checkout@v3
34+
uses: actions/checkout@v3.5.3
3535
- name: Setup Pages
3636
uses: actions/configure-pages@v2
3737
- name: Build with Jekyll

‎.github/workflows/make-bom.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
uses: actions/setup-python@v4
1212
with:
1313
python-version: '3.10'
14-
- uses: actions/checkout@v3.0.2
14+
- uses: actions/checkout@v3.5.3
1515
- name: Set up JDK 11
1616
uses: actions/setup-java@v3
1717
with:

‎.github/workflows/private-mirror-sync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
if: github.repository == 'firebase/firebase-android-sdk'
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v3.5.3
1818
with:
1919
fetch-depth: 0
2020
submodules: true

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
build:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v3
12+
- uses: actions/checkout@v3.5.3
1313
with:
1414
fetch-depth: 0
1515

‎.github/workflows/scorecards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232

3333
steps:
3434
- name: "Checkout code"
35-
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
35+
uses: actions/checkout@v3.5.3
3636
with:
3737
persist-credentials: false
3838

‎.github/workflows/semver-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
semver-check:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v3.5.3
1414

1515
- name: Perform gradle build
1616
run: |

‎.github/workflows/sessions-e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
steps:
2020
- name: Checkout firebase-sessions
21-
uses: actions/checkout@v3
21+
uses: actions/checkout@v3.5.3
2222

2323
- name: set up JDK 11
2424
uses: actions/setup-java@v3

‎.github/workflows/smoke-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
if: github.event.pull_request.head.repo.full_name == github.repository
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v3
10+
- uses: actions/checkout@v3.5.3
1111
with:
1212
fetch-depth: 2
1313
submodules: true

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
outputs:
2424
released_version_changed: ${{ steps.check_version.outputs.released_version_changed }}
2525
steps:
26-
- uses: actions/checkout@v2.3.1
26+
- uses: actions/checkout@v3.5.3
2727
with:
2828
# Check out the actual head commit, not any merge commit.
2929
ref: ${{ github.sha }}
@@ -56,7 +56,7 @@ jobs:
5656
python-version: 3.7
5757

5858
- name: Check out firebase-cpp-sdk
59-
uses: actions/checkout@v2.3.1
59+
uses: actions/checkout@v3.5.3
6060
with:
6161
repository: firebase/firebase-cpp-sdk
6262
ref: main

‎.github/workflows/validate-dependencies.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
build-artifacts:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v3.5.3
1414

1515
- name: Perform gradle build
1616
run: |

‎buildSrc/src/main/java/com/google/firebase/gradle/plugins/PomValidator.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ abstract class PomValidator : DefaultTask() {
9999
listOf(
100100
"javax.inject", // javax.inject doesn't respect SemVer and doesn't update
101101
"dagger", // dagger doesn't respect Semver
102+
"auto-service-annotations", // auto-service-annotations doesn't respect SemVer
102103
)
103104
}
104105
}

‎buildSrc/src/main/java/com/google/firebase/gradle/plugins/PublishingPlugin.kt

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,9 @@ abstract class PublishingPlugin : Plugin<Project> {
7979
val checkHeadDependencies =
8080
registerCheckHeadDependenciesTask(project, releasingFirebaseLibraries)
8181
val validateProjectsToPublish =
82-
registerValidateProjectsToPublishTask(project, releasingProjects)
82+
registerValidateProjectsToPublishTask(project, releasingFirebaseLibraries)
83+
val validateLibraryGroupsToPublish =
84+
registerValidateLibraryGroupsToPublishTask(project, releasingFirebaseLibraries)
8385
val publishReleasingLibrariesToBuildDir =
8486
registerPublishReleasingLibrariesToBuildDirTask(project, releasingProjects)
8587
val generateKotlindocsForRelease =
@@ -127,6 +129,7 @@ abstract class PublishingPlugin : Plugin<Project> {
127129
project.tasks.register(FIREBASE_PUBLISH_TASK) {
128130
dependsOn(
129131
validateProjectsToPublish,
132+
validateLibraryGroupsToPublish,
130133
checkHeadDependencies,
131134
// validatePomForRelease, TODO(b/279466888) - Make GmavenHelper testable
132135
buildMavenZip,
@@ -275,11 +278,11 @@ abstract class PublishingPlugin : Plugin<Project> {
275278
// TODO(b/280320915): Remove doLast when Gradle + IDEA fix task configuration avoidance bug
276279
private fun registerValidateProjectsToPublishTask(
277280
project: Project,
278-
releasingProjects: List<Project>
281+
releasinglibraries: List<FirebaseLibraryExtension>
279282
) =
280283
project.tasks.register(VALIDATE_PROJECTS_TO_PUBLISH_TASK) {
281284
doLast {
282-
if (releasingProjects.isEmpty()) {
285+
if (releasinglibraries.isEmpty()) {
283286
throw GradleException(
284287
"No projects to release. " +
285288
"Ensure you've specified the projectsToPublish parameter, " +
@@ -289,6 +292,30 @@ abstract class PublishingPlugin : Plugin<Project> {
289292
}
290293
}
291294

295+
/**
296+
* Registers the [VALIDATE_LIBRARY_GROUPS_TO_PUBLISH_TASK] task.
297+
*
298+
* Validates that all library groups of all publishing projects are included in the release config
299+
*
300+
* @throws GradleException if a library is releasing without it's library group.
301+
*/
302+
private fun registerValidateLibraryGroupsToPublishTask(
303+
project: Project,
304+
releasinglibraries: List<FirebaseLibraryExtension>
305+
) =
306+
project.tasks.register(VALIDATE_LIBRARY_GROUPS_TO_PUBLISH_TASK) {
307+
doLast {
308+
val libraryGroupProjects = releasinglibraries.flatMap { it.librariesToRelease }
309+
val missingProjects = libraryGroupProjects - releasinglibraries
310+
if (missingProjects.isNotEmpty()) {
311+
throw GradleException(
312+
"Some libraries in library groups are not in the release: " +
313+
missingProjects.map { it.mavenName }.joinToString("\n")
314+
)
315+
}
316+
}
317+
}
318+
292319
/**
293320
* Registers the [PUBLISH_RELEASING_LIBS_TO_BUILD_TASK] task.
294321
*
@@ -465,6 +492,7 @@ abstract class PublishingPlugin : Plugin<Project> {
465492

466493
const val GENERATE_BOM_TASK = "generateBom"
467494
const val VALIDATE_PROJECTS_TO_PUBLISH_TASK = "validateProjectsToPublish"
495+
const val VALIDATE_LIBRARY_GROUPS_TO_PUBLISH_TASK = "validateLibraryGroupsToPublish"
468496
const val SEMVER_CHECK_TASK = "semverCheckForRelease"
469497
const val RELEASE_GENEATOR_TASK = "generateReleaseConfig"
470498
const val VALIDATE_POM_TASK = "validatePomForRelease"

‎encoders/firebase-encoders-processor/firebase-encoders-processor.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def jvm = org.gradle.internal.jvm.Jvm.current()
2121

2222
dependencies {
2323
implementation 'com.google.firebase:firebase-encoders:17.0.0'
24-
implementation 'com.google.auto.service:auto-service-annotations:1.0-rc6'
24+
implementation 'com.google.auto.service:auto-service-annotations:1.0.1'
2525
implementation 'com.squareup:javapoet:1.13.0'
2626
compileOnly 'javax.annotation:javax.annotation-api:1.3.2'
2727
implementation 'com.google.guava:guava:28.1-jre'

0 commit comments

Comments
 (0)