Merge branch 'main' into feature/more-info_deep-link

Author: TimoPtr

.github/actions/setup-build-env/action.yml

@@ -24,7 +24,7 @@ runs:
         cp .github/mock-google-services.json automotive/google-services.json
 
     - name: Set up JDK 21
-      uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0
+      uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5.4.0
       with:
         distribution: "temurin"
         java-version: "21"

.github/workflows/pr-emulator-wtf.yml

@@ -18,8 +18,7 @@ jobs:
     environment: ui-test
     if: >
       github.event.workflow_run.event == 'pull_request'
-      && github.event.workflow_run.conclusion != 'cancelled'
-      && github.event.workflow_run.conclusion != 'skipped'
+      && github.event.workflow_run.conclusion == 'success'
     permissions:
       id-token: write  # Needed for OIDC authentication
       actions: read  # Needed for retrieving artifacts
@@ -87,17 +86,6 @@ jobs:
             echo "job_url=$JOB_URL"
           } >> "$GITHUB_OUTPUT"
 
-      # Halt before spending any emulator.wtf credits if the triggering Pull Request
-      # workflow did not succeed (publish_test_results still runs afterward to
-      # aggregate whatever results pr.yml produced).
-      - name: Halt if triggering workflow did not succeed
-        if: github.event.workflow_run.conclusion != 'success'
-        env:
-          CONCLUSION: ${{ github.event.workflow_run.conclusion }}
-        run: |
-          echo "::error::Triggering 'Pull Request' workflow concluded as '$CONCLUSION'; skipping emulator.wtf to save resources"
-          exit 1
-
       - name: Download emulator.wtf inputs
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
@@ -164,7 +152,7 @@ jobs:
           name: Instrumentation Test app reports
           path: build/test-results/**
 
-      # job.status reflects everything above (halt, downloads, test runs) and is
+      # job.status reflects everything above (check creation, downloads, test runs) and is
       # one of success/failure/cancelled, all valid check-run conclusions.
       # We re-send the same output.summary link so the completed check page
       # keeps the deep-link to the emulator.wtf job logs (see the Create step
@@ -207,11 +195,12 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           path: pr-artifacts
 
-      # If emulator_wtf halted or failed before running tests, it uploads no
-      # results artifact, and downloading it by name errors. Tolerate that so we
-      # still publish the pr.yml results below. We cannot gate on
-      # needs.emulator_wtf.result because a real test failure also fails the job
-      # yet does produce this artifact, which we must still publish.
+      # If emulator_wtf was skipped (non-PR trigger or triggering workflow did not succeed) or
+      # cancelled/failed before running tests, it uploads no results artifact, and
+      # downloading it by name errors. Tolerate that so we still publish the
+      # pr.yml results below. We cannot gate on needs.emulator_wtf.result because
+      # a real test failure also fails the job yet does produce this artifact,
+      # which we must still publish.
       - name: Download emulator.wtf results from this run
         continue-on-error: true
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1

.github/workflows/pr.yml

@@ -120,11 +120,11 @@ jobs:
 
       - name: Generate aboutlibraries JSON
         run: |
-          ./gradlew :app:exportLibraryDefinitionsFullDebug \
-            :app:exportLibraryDefinitionsMinimalDebug \
-            :automotive:exportLibraryDefinitionsFullDebug \
-            :automotive:exportLibraryDefinitionsMinimalDebug \
-            :wear:exportLibraryDefinitionsDebug
+          ./gradlew :app:prepareLibraryDefinitionsFullDebug \
+            :app:prepareLibraryDefinitionsMinimalDebug \
+            :automotive:prepareLibraryDefinitionsFullDebug \
+            :automotive:prepareLibraryDefinitionsMinimalDebug \
+            :wear:prepareLibraryDefinitionsDebug
 
       - name: Check licenses
         run: |

Gemfile.lock

@@ -43,7 +43,7 @@ GEM
     dotenv (2.8.1)
     emoji_regex (3.2.3)
     excon (0.112.0)
-    faraday (1.10.5)
+    faraday (1.10.6)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -267,7 +267,7 @@ CHECKSUMS
   dotenv (2.8.1) sha256=c5944793349ae03c432e1780a2ca929d60b88c7d14d52d630db0508c3a8a17d8
   emoji_regex (3.2.3) sha256=ecd8be856b7691406c6bf3bb3a5e55d6ed683ffab98b4aa531bb90e1ddcc564b
   excon (0.112.0) sha256=daf9ac3a4c2fc9aa48383a33da77ecb44fa395111e973084d5c52f6f214ae0f0
-  faraday (1.10.5) sha256=b144f1d2b045652fa820b5f532723e1643cc28b93dae911d784e5c5f88e8f6ed
+  faraday (1.10.6) sha256=7ff4802a6b312876a2241b3e641ce0d5045e168dd871b422c35b505e5261ad4d
   faraday-cookie_jar (0.0.8) sha256=0140605823f8cc63c7028fccee486aaed8e54835c360cffc1f7c8c07c4299dbb
   faraday-em_http (1.0.0) sha256=7a3d4c7079789121054f57e08cd4ef7e40ad1549b63101f38c7093a9d6c59689
   faraday-em_synchrony (1.0.1) sha256=bf3ce45dcf543088d319ab051f80985ea6d294930635b7a0b966563179f81750

app/build.gradle.kts

@@ -50,4 +50,5 @@ firebaseAppDistributionDefault {
 dependencies {
     // Most of the dependencies are coming from the convention plugin to avoid duplication with `:automotive` module.
     "fullImplementation"(libs.car.projected)
+    ksp(project(":provides-sensor-processor"))
 }