Merge branch 'main' into dependabot/npm_and_yarn/MacrobenchmarkSample…

…/functions/multi-cff7468b61
android · Oct 1, 2024 · 13131ca · 13131ca
2 parents 5b766e8 + 0054980
commit 13131ca
Show file tree

Hide file tree

Showing 56 changed files with 1,119 additions and 493 deletions.
diff --git a/.github/workflows/firebase_test_lab.yml b/.github/workflows/firebase_test_lab.yml
@@ -65,20 +65,34 @@ jobs:
           credentials_json: '${{ secrets.GCP_CREDENTIALS }}'
 
       - name: Set up Cloud SDK
-        uses: google-github-actions/setup-gcloud@v0
+        uses: google-github-actions/setup-gcloud@v2
 
       - name: Install Cloud SDK Beta components
         run: gcloud components install beta
 
-      - name: Run Macro Benchmarks
+      - name: Run Benchmarks
         run: |
           gcloud beta firebase test android run \
             --type instrumentation \
-            --app ${{ github.workspace }}/MacrobenchmarkSample/app/build/outputs/apk/benchmark/app-benchmark.apk \
-            --test ${{ github.workspace }}/MacrobenchmarkSample/macrobenchmark/build/outputs/apk/benchmark/macrobenchmark-benchmark.apk \
-            --device model=redfin,version=30,locale=en,orientation=portrait \
+            --app ${{ github.workspace }}/MacrobenchmarkSample/app/build/outputs/apk/benchmarkRelease/app-benchmarkRelease.apk \
+            --test ${{ github.workspace }}/MacrobenchmarkSample/macrobenchmark/build/outputs/apk/benchmarkRelease/macrobenchmark-benchmarkRelease.apk \
+            --device model=lynx,version=33,locale=en,orientation=portrait \
             --directories-to-pull /sdcard/Download \
             --results-bucket gs://macrobenchmark-results \
             --environment-variables clearPackageData=true,additionalTestOutputDir=/sdcard/Download,no-isolated-storage=true,androidx.benchmark.enabledRules=Macrobenchmark \
-            --num-uniform-shards 3 \
+            --num-uniform-shards 6 \
             --timeout 30m
+
+      - name: Generate Baseline Profiles
+        run: |
+          gcloud beta firebase test android run \
+            --type instrumentation \
+            --app ${{ github.workspace }}/MacrobenchmarkSample/app/build/outputs/apk/benchmarkRelease/app-benchmarkRelease.apk \
+            --test ${{ github.workspace }}/MacrobenchmarkSample/macrobenchmark/build/outputs/apk/benchmarkRelease/macrobenchmark-benchmarkRelease.apk \
+            --device model=lynx,version=33,locale=en,orientation=portrait \
+            --directories-to-pull /sdcard/Download \
+            --results-bucket gs://macrobenchmark-results \
+            --environment-variables clearPackageData=true,additionalTestOutputDir=/sdcard/Download,no-isolated-storage=true,androidx.benchmark.enabledRules=BaselineProfile \
+            --num-uniform-shards 2 \
+            --timeout 30m
+
diff --git a/.github/workflows/macrobenchmark.yml b/.github/workflows/macrobenchmark.yml
@@ -2,10 +2,8 @@ name: Builds Macrobenchmarks
 
 on:
   pull_request:
-    types: [opened, synchronize, reopened, 'labeled']
   push:
     branches: [ macrobenchmark, main ]
-  workflow_dispatch:
 
 jobs:
   # This job checks for any file changed within MacrobenchmarkSample/ folder 
@@ -21,8 +19,8 @@ jobs:
       macrobenchmark: ${{ steps.filter.outputs.macrobenchmark }}
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
-    - uses: dorny/paths-filter@v2
+      uses: actions/checkout@v4
+    - uses: dorny/paths-filter@v3
       id: filter
       with:
         filters: |
@@ -39,7 +37,7 @@ jobs:
         working-directory: ./MacrobenchmarkSample
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup JDK
         id: setup-java

diff --git a/MacrobenchmarkSample/app/build.gradle.kts b/MacrobenchmarkSample/app/build.gradle.kts
@@ -16,6 +16,7 @@
 
 plugins {
     alias(libs.plugins.application)
+    alias(libs.plugins.compose)
     alias(libs.plugins.kotlin)
     alias(libs.plugins.baselineprofile)
 }
@@ -38,10 +39,6 @@ android {
         viewBinding = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-    }
-
     // [START macrobenchmark_setup_app_build_type]
     buildTypes {
         getByName("release") {

diff --git a/...crobenchmark/target/ExampleApplication.kt → ...crobenchmark/target/ExampleApplication.kt b/...crobenchmark/target/ExampleApplication.kt → ...crobenchmark/target/ExampleApplication.kt
diff --git a/...get/activity/FullyDrawnStartupActivity.kt → ...get/activity/FullyDrawnStartupActivity.kt b/...get/activity/FullyDrawnStartupActivity.kt → ...get/activity/FullyDrawnStartupActivity.kt
diff --git a/...benchmark/target/activity/MainActivity.kt → ...benchmark/target/activity/MainActivity.kt b/...benchmark/target/activity/MainActivity.kt → ...benchmark/target/activity/MainActivity.kt
diff --git a/.../activity/clicklatency/ComposeActivity.kt → .../activity/clicklatency/ComposeActivity.kt b/.../activity/clicklatency/ComposeActivity.kt → .../activity/clicklatency/ComposeActivity.kt
diff --git a/...activity/clicklatency/ListViewActivity.kt → ...activity/clicklatency/ListViewActivity.kt b/...activity/clicklatency/ListViewActivity.kt → ...activity/clicklatency/ListViewActivity.kt
diff --git a/...ty/clicklatency/NestedRecyclerActivity.kt → ...ty/clicklatency/NestedRecyclerActivity.kt b/...ty/clicklatency/NestedRecyclerActivity.kt → ...ty/clicklatency/NestedRecyclerActivity.kt
diff --git a/...icklatency/NonExportedRecyclerActivity.kt → ...icklatency/NonExportedRecyclerActivity.kt b/...icklatency/NonExportedRecyclerActivity.kt → ...icklatency/NonExportedRecyclerActivity.kt
diff --git a/...vity/clicklatency/RecyclerViewActivity.kt → ...vity/clicklatency/RecyclerViewActivity.kt b/...vity/clicklatency/RecyclerViewActivity.kt → ...vity/clicklatency/RecyclerViewActivity.kt
diff --git a/...tivity/clicklatency/ScrollViewActivity.kt → ...tivity/clicklatency/ScrollViewActivity.kt b/...tivity/clicklatency/ScrollViewActivity.kt → ...tivity/clicklatency/ScrollViewActivity.kt
diff --git a/...rk/target/activity/login/LoginActivity.kt → ...rk/target/activity/login/LoginActivity.kt b/...rk/target/activity/login/LoginActivity.kt → ...rk/target/activity/login/LoginActivity.kt
diff --git a/.../target/recyclerview/BindingViewHolder.kt → .../target/recyclerview/BindingViewHolder.kt b/.../target/recyclerview/BindingViewHolder.kt → .../target/recyclerview/BindingViewHolder.kt
diff --git a/...hmark/target/recyclerview/ChildAdapter.kt → ...hmark/target/recyclerview/ChildAdapter.kt b/...hmark/target/recyclerview/ChildAdapter.kt → ...hmark/target/recyclerview/ChildAdapter.kt
diff --git a/...enchmark/target/recyclerview/ChildItem.kt → ...enchmark/target/recyclerview/ChildItem.kt b/...enchmark/target/recyclerview/ChildItem.kt → ...enchmark/target/recyclerview/ChildItem.kt
diff --git a/...crobenchmark/target/recyclerview/Entry.kt → ...crobenchmark/target/recyclerview/Entry.kt b/...crobenchmark/target/recyclerview/Entry.kt → ...crobenchmark/target/recyclerview/Entry.kt
diff --git a/...t/recyclerview/NestedRecyclerViewModel.kt → ...t/recyclerview/NestedRecyclerViewModel.kt b/...t/recyclerview/NestedRecyclerViewModel.kt → ...t/recyclerview/NestedRecyclerViewModel.kt
diff --git a/...mark/target/recyclerview/ParentAdapter.kt → ...mark/target/recyclerview/ParentAdapter.kt b/...mark/target/recyclerview/ParentAdapter.kt → ...mark/target/recyclerview/ParentAdapter.kt
diff --git a/...nchmark/target/recyclerview/ParentItem.kt → ...nchmark/target/recyclerview/ParentItem.kt b/...nchmark/target/recyclerview/ParentItem.kt → ...nchmark/target/recyclerview/ParentItem.kt
diff --git a/...le/macrobenchmark/target/util/AppLogin.kt → ...le/macrobenchmark/target/util/AppLogin.kt b/...le/macrobenchmark/target/util/AppLogin.kt → ...le/macrobenchmark/target/util/AppLogin.kt
diff --git a/.../macrobenchmark/target/util/ClickTrace.kt → .../macrobenchmark/target/util/ClickTrace.kt b/.../macrobenchmark/target/util/ClickTrace.kt → .../macrobenchmark/target/util/ClickTrace.kt
diff --git a/...xample/macrobenchmark/target/util/Data.kt → ...xample/macrobenchmark/target/util/Data.kt b/...xample/macrobenchmark/target/util/Data.kt → ...xample/macrobenchmark/target/util/Data.kt
diff --git a/...obenchmark/target/util/SampleViewModel.kt → ...obenchmark/target/util/SampleViewModel.kt b/...obenchmark/target/util/SampleViewModel.kt → ...obenchmark/target/util/SampleViewModel.kt
diff --git a/...ample/macrobenchmark/target/util/Utils.kt → ...ample/macrobenchmark/target/util/Utils.kt b/...ample/macrobenchmark/target/util/Utils.kt → ...ample/macrobenchmark/target/util/Utils.kt