Skip to content

Commit

Permalink
Merge branch 'main' into test/crashlytics
Browse files Browse the repository at this point in the history
  • Loading branch information
Lyokone committed Dec 16, 2024
2 parents ebf16da + 50eacb7 commit 63138da
Show file tree
Hide file tree
Showing 153 changed files with 4,020 additions and 633 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-src-check.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: build-src-check
name: Check buildSrc

on:
pull_request:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Changelog
name: Verify changelog update

on:
pull_request
Expand Down
164 changes: 164 additions & 0 deletions .github/workflows/dataconnect_demo_app.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,164 @@
name: Data Connect Demo App

on:
workflow_dispatch:
inputs:
nodeVersion:
firebaseToolsVersion:
javaVersion:
gradleInfoLog:
type: boolean
pull_request:
paths:
- firebase-dataconnect/demo/**
- .github/workflows/dataconnect_demo_app.yml
schedule:
- cron: '0 11 * * *' # Run nightly at 11am UTC (3am Pacific, 6am Eastern)

env:
FDC_NODE_VERSION: ${{ inputs.nodeVersion || '20' }}
FDC_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion || '13.28.0' }}
FDC_JAVA_VERSION: ${{ inputs.javaVersion || '17' }}
FDC_FIREBASE_TOOLS_DIR: ${{ github.workspace }}/firebase-tools
FDC_FIREBASE_COMMAND: ${{ github.workspace }}/firebase-tools/node_modules/.bin/firebase

defaults:
run:
shell: bash
working-directory: firebase-dataconnect/demo

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
test:
continue-on-error: false
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
sparse-checkout: firebase-dataconnect/demo

- name: Create Cache Key Files
run: |
echo "gmagjr2b9d" >github_actions_demo_test_cache_key.txt
echo "${{ env.FDC_FIREBASE_TOOLS_VERSION }}" >github_actions_demo_assemble_firebase_tools_version.txt
- uses: actions/setup-node@v3
with:
node-version: ${{ env.FDC_NODE_VERSION }}
cache: 'npm'
cache-dependency-path: |
firebase-dataconnect/demo/github_actions_demo_test_cache_key.txt
firebase-dataconnect/demo/github_actions_demo_assemble_firebase_tools_version.txt
- name: cache package-lock.json
id: package_json_lock
uses: actions/cache@v4
with:
path: ${{ env.FDC_FIREBASE_TOOLS_DIR }}/package*.json
key: firebase_tools_package_json-${{ env.FDC_FIREBASE_TOOLS_VERSION }}

- name: install firebase-tools from scratch
if: steps.package_json_lock.outputs.cache-hit != 'true'
run: |
set -v
mkdir -p ${{ env.FDC_FIREBASE_TOOLS_DIR }}
cd ${{ env.FDC_FIREBASE_TOOLS_DIR }}
echo '{}' > package.json
npm install --fund=false --audit=false --save --save-exact firebase-tools@${{ env.FDC_FIREBASE_TOOLS_VERSION }}
- name: install firebase-tools from package-lock.json
if: steps.package_json_lock.outputs.cache-hit == 'true'
run: |
cd ${{ env.FDC_FIREBASE_TOOLS_DIR }}
npm ci --fund=false --audit=false
- uses: actions/setup-java@v4
with:
java-version: ${{ env.FDC_JAVA_VERSION }}
distribution: temurin
cache: gradle
cache-dependency-path: |
firebase-dataconnect/demo/build.gradle.kts
firebase-dataconnect/demo/gradle.properties
firebase-dataconnect/demo/gradle/wrapper/gradle-wrapper.properties
firebase-dataconnect/demo/github_actions_demo_test_cache_key.txt
- name: tool versions
continue-on-error: true
run: |
set +e -v
which java
java -version
which javac
javac -version
which node
node --version
${{ env.FDC_FIREBASE_COMMAND }} --version
./gradlew --version
- name: ./gradlew assemble test
run: |
set -x
./gradlew \
--no-daemon \
${{ (inputs.gradleInfoLog && '--info') || '' }} \
--profile \
-PdataConnect.minimalApp.firebaseCommand=${{ env.FDC_FIREBASE_COMMAND }} \
assemble test
- uses: actions/upload-artifact@v4
with:
name: apks
path: firebase-dataconnect/demo/build/**/*.apk
if-no-files-found: warn
compression-level: 0

- uses: actions/upload-artifact@v4
with:
name: gradle_build_reports
path: firebase-dataconnect/demo/build/reports/
if-no-files-found: warn
compression-level: 9

spotlessCheck:
continue-on-error: false
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
sparse-checkout: firebase-dataconnect/demo

- name: Create Cache Key Files
run: echo "h99ee4egfd" >github_actions_demo_spotless_cache_key.txt

- uses: actions/setup-java@v4
with:
java-version: ${{ env.FDC_JAVA_VERSION }}
distribution: temurin
cache: gradle
cache-dependency-path: |
firebase-dataconnect/demo/build.gradle.kts
firebase-dataconnect/demo/gradle.properties
firebase-dataconnect/demo/gradle/wrapper/gradle-wrapper.properties
firebase-dataconnect/demo/github_actions_demo_spotless_cache_key.txt
- name: tool versions
continue-on-error: true
run: |
set +e -v
which java
java -version
which javac
javac -version
./gradlew --version
- name: ./gradlew spotlessCheck
run: |
set -x
./gradlew \
--no-daemon \
${{ (inputs.gradleInfoLog && '--info') || '' }} \
spotlessCheck
2 changes: 1 addition & 1 deletion .github/workflows/fireci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: fireci
name: Run fireci tests

on:
pull_request:
Expand Down
21 changes: 13 additions & 8 deletions .github/workflows/private-mirror-sync.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,30 @@
name: Private Mirror Sync

concurrency:
group: ${{ github.workflow }}
cancel-in-progress: true

on:
push:
branches:
- main
workflow_dispatch:
schedule:
- cron: '0 2 * * *'

jobs:
sync:
if: github.repository == 'firebase/firebase-android-sdk'
if: github.repository == 'FirebasePrivate/firebase-android-sdk'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4.1.1
with:
repository: firebase/firebase-android-sdk
ref: main
fetch-depth: 0
submodules: true

- uses: actions/checkout@v4.1.1
with:
fetch-depth: 0
submodules: true
token: ${{ secrets.GOOGLE_OSS_BOT_TOKEN }}
- name: Force push HEAD to private repo main branch
run: |
git config --local user.name google-oss-bot
git config --local user.email firebase-oss-bot@google.com
git remote add mirror https://github.com/FirebasePrivate/firebase-android-sdk.git
git push mirror HEAD:main --force --verbose
2 changes: 1 addition & 1 deletion .github/workflows/release-note-changes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

- name: Get changed changelog files
id: changed-files
uses: tj-actions/changed-files@v36.0.10
uses: tj-actions/changed-files@v41.0.0
with:
files_ignore: |
buildSrc/**
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-cpp-sdk-on-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# *another* workflow on the Firebase C++ SDK, which will check for the Android
# version update and create a PR updating its dependencies if any version
# numbers changed.
name: update-cpp-sdk-on-release
name: Update C++ SDKs on release
on:
push:
branches:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,30 +50,29 @@ android {
}

dependencies {
javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
javadocClasspath libs.autovalue.annotations

api project(':appcheck:firebase-appcheck')
api project(':appcheck:firebase-appcheck-debug')
api 'com.google.firebase:firebase-appcheck-interop:17.0.0'
api 'com.google.firebase:firebase-common:21.0.0'
api 'com.google.firebase:firebase-common-ktx:21.0.0'
api 'com.google.firebase:firebase-components:18.0.0'

implementation libs.androidx.test.core
implementation 'com.google.android.gms:play-services-base:18.0.1'
implementation 'com.google.android.gms:play-services-tasks:18.0.1'
implementation libs.playservices.base
implementation libs.playservices.tasks

testImplementation project(':appcheck:firebase-appcheck-playintegrity')
testImplementation libs.androidx.test.core
testImplementation libs.truth
testImplementation 'junit:junit:4.13-beta-2'
testImplementation 'org.mockito:mockito-core:2.25.0'
testImplementation libs.junit
testImplementation libs.mockito.core
testImplementation libs.robolectric

androidTestImplementation project(':firebase-storage')
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation libs.androidx.test.runner
androidTestImplementation libs.androidx.test.junit
androidTestImplementation libs.truth
androidTestImplementation 'junit:junit:4.13-beta-2'
androidTestImplementation 'org.mockito:mockito-core:2.25.0'
androidTestImplementation libs.junit
androidTestImplementation libs.mockito.core
}
14 changes: 7 additions & 7 deletions appcheck/firebase-appcheck-debug/firebase-appcheck-debug.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -47,25 +47,25 @@ android {
}

dependencies {
javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
javadocClasspath libs.autovalue.annotations

api project(':appcheck:firebase-appcheck')
api 'com.google.firebase:firebase-annotations:16.2.0'
api 'com.google.firebase:firebase-common:21.0.0'
api 'com.google.firebase:firebase-common-ktx:21.0.0'
api 'com.google.firebase:firebase-components:18.0.0'
implementation platform(libs.kotlin.bom)

implementation 'com.google.android.gms:play-services-base:18.0.1'
implementation 'com.google.android.gms:play-services-tasks:18.0.1'
implementation libs.playservices.base
implementation libs.playservices.tasks

testImplementation(project(":integ-testing")){
exclude group: 'com.google.firebase', module: 'firebase-common'
exclude group: 'com.google.firebase', module: 'firebase-components'
}
testImplementation libs.androidx.test.core
testImplementation 'androidx.test:rules:1.2.0'
testImplementation libs.androidx.test.rules
testImplementation libs.truth
testImplementation 'junit:junit:4.13-beta-2'
testImplementation 'org.mockito:mockito-core:2.25.0'
testImplementation libs.junit
testImplementation libs.mockito.core
testImplementation libs.robolectric
}
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ android {
}

dependencies {
implementation 'com.google.android.gms:play-services-base:18.0.1'
implementation 'com.google.android.gms:play-services-tasks:18.0.1'
implementation libs.playservices.base
implementation libs.playservices.tasks

testImplementation libs.androidx.test.core
testImplementation 'androidx.test:rules:1.2.0'
testImplementation libs.androidx.test.rules
testImplementation libs.truth
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.25.0'
testImplementation libs.junit
testImplementation libs.mockito.core
testImplementation libs.robolectric
}
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,17 @@ android {
}

dependencies {
javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
javadocClasspath libs.autovalue.annotations

api project(':appcheck:firebase-appcheck')
api 'com.google.firebase:firebase-annotations:16.2.0'
api 'com.google.firebase:firebase-common:21.0.0'
api 'com.google.firebase:firebase-common-ktx:21.0.0'
api 'com.google.firebase:firebase-components:18.0.0'

implementation 'com.google.android.gms:play-services-base:18.0.1'
implementation 'com.google.android.gms:play-services-tasks:18.0.1'
implementation 'com.google.android.play:integrity:1.2.0'
implementation libs.playservices.base
implementation libs.playservices.tasks
implementation libs.integrity

testImplementation(project(":integ-testing")){
exclude group: 'com.google.firebase', module: 'firebase-common'
Expand All @@ -66,6 +66,6 @@ dependencies {
testImplementation libs.androidx.test.core
testImplementation libs.truth
testImplementation libs.junit
testImplementation 'org.mockito:mockito-core:3.4.6'
testImplementation libs.mockito.core
testImplementation libs.robolectric
}
Loading

0 comments on commit 63138da

Please sign in to comment.