Merge remote-tracking branch 'origin/main' into migration-coil2-coil3

Author: SimonMarquis

.github/workflows/Build.yaml

@@ -1,6 +1,7 @@
 name: Build
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - main
@@ -29,16 +30,19 @@ jobs:
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
         with:
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
+          build-scan-publish: true
+          build-scan-terms-of-use-url: "https://gradle.com/terms-of-service"
+          build-scan-terms-of-use-agree: "yes"
 
       - name: Check build-logic
         run: ./gradlew :build-logic:convention:check
@@ -139,11 +143,26 @@ jobs:
           name: lint-reports
           path: '**/build/reports/lint-results-*.html'
 
-      - name: Upload lint reports (SARIF)
-        if: ${{ !cancelled() && hashFiles('**/*.sarif') != '' }}
+      - name: Upload lint reports (SARIF) for app module
+        if: ${{ !cancelled() && hashFiles('app/**/*.sarif') != '' }}
         uses: github/codeql-action/upload-sarif@v3
         with:
-          sarif_file: './'
+          sarif_file: './app/'
+          category: app
+
+      - name: Upload lint reports (SARIF) for app-nia-catalog module
+        if: ${{ !cancelled() && hashFiles('app-nia-catalog/**/*.sarif') != '' }}
+        uses: github/codeql-action/upload-sarif@v3
+        with:
+          sarif_file: './app-nia-catalog/'
+          category: app-nia-catalog
+
+      - name: Upload lint reports (SARIF) for lint module
+        if: ${{ !cancelled() && hashFiles('lint/**/*.sarif') != '' }}
+        uses: github/codeql-action/upload-sarif@v3
+        with:
+          sarif_file: './lint/'
+          category: lint
 
       - name: Check badging
         run: ./gradlew :app:checkProdReleaseBadging
@@ -180,16 +199,19 @@ jobs:
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
         with:
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
+          build-scan-publish: true
+          build-scan-terms-of-use-url: "https://gradle.com/terms-of-service"
+          build-scan-terms-of-use-agree: "yes"
 
       - name: Build projects and run instrumentation tests
         uses: reactivecircus/android-emulator-runner@v2

.github/workflows/NightlyBaselineProfiles.yaml

@@ -1,6 +1,7 @@
 name: NightlyBaselineProfiles
 
 on:
+  workflow_dispatch:
   schedule:
     - cron:  '42 4 * * *'
 
@@ -39,6 +40,9 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
         with:
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
+          build-scan-publish: true
+          build-scan-terms-of-use-url: "https://gradle.com/terms-of-service"
+          build-scan-terms-of-use-agree: "yes"
 
       - name: Setup Android SDK
         uses: android-actions/setup-android@v3

.github/workflows/Release.yml

@@ -1,6 +1,7 @@
 name: GitHub Release with APKs
 
 on:
+  workflow_dispatch:
   push:
     tags:
     - 'v*'
@@ -36,6 +37,9 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
         with:
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
+          build-scan-publish: true
+          build-scan-terms-of-use-url: "https://gradle.com/terms-of-service"
+          build-scan-terms-of-use-agree: "yes"
 
       - name: Setup Android SDK
         uses: android-actions/setup-android@v3
@@ -75,4 +79,4 @@ jobs:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: app/build/outputs/apk/demo/release/app-demo-release.apk
           asset_name: app-demo-release.apk
-          asset_content_type: application/vnd.android.package-archive          
+          asset_content_type: application/vnd.android.package-archive

AGENT.md

@@ -0,0 +1 @@
+AGENTS.md

AGENTS.md

@@ -0,0 +1,58 @@
+# Now in Android Project
+
+Now in Android is a native Android mobile application written in Kotlin. It provides regular news
+about Android development. Users can choose to follow topics, be notified when new content is
+available, and bookmark items.
+
+## Architecture
+
+This project is a modern Android application that follows the official architecture guidance from Google. It is a reactive, single-activity app that uses the following:
+
+-   **UI:** Built entirely with Jetpack Compose, including Material 3 components and adaptive layouts for different screen sizes.
+-   **State Management:** Unidirectional Data Flow (UDF) is implemented using Kotlin Coroutines and `Flow`s. `ViewModel`s act as state holders, exposing UI state as streams of data.
+-   **Dependency Injection:** Hilt is used for dependency injection throughout the app, simplifying the management of dependencies and improving testability.
+-   **Navigation:** Navigation is handled by Jetpack Navigation 2 for Compose, allowing for a declarative and type-safe way to navigate between screens.
+-   **Data:** The data layer is implemented using the repository pattern.
+    -   **Local Data:** Room and DataStore are used for local data persistence.
+    -   **Remote Data:** Retrofit and OkHttp are used for fetching data from the network.
+-   **Background Processing:** WorkManager is used for deferrable background tasks.
+
+## Modules
+
+The main Android app lives in the `app/` folder. Feature modules live in `feature/` and core and shared modules in `core/`.
+
+## Commands to Build & Test
+
+The app and Android libraries have two product flavors: `demo` and `prod`, and two build types: `debug` and `release`.
+
+- Build: `./gradlew assemble{Variant}`. Typically `assembleDemoDebug`.
+- Fix linting/formatting: `./gradlew --init-script gradle/init.gradle.kts spotlessApply`
+- Run local tests: `./gradlew {variant}Test`
+- Run single test: `./gradlew {variant}Test --tests "com.example.myapp.MyTestClass"`
+- Run local screenshot tests: `./gradlew verifyRoborazziDemoDebug`
+
+### Instrumented tests
+
+- Gradle-managed devices to run on device tests: `./gradlew pixel6api31aospDebugAndroidTest`. Also `pixel4api30aospatdDebugAndroidTest` and `pixelcapi30aospatdDebugAndroidTest`.
+
+### Creating tests
+
+#### Instrumented tests
+
+- Tests for UI features should only use `ComposeTestRule` with a `ComponentActivity`.
+- Bigger tests live in the `:app` module and they can start activities like `MainActivity`.
+
+#### Local tests
+
+- [kotlinx.coroutines](https://github.com/Kotlin/kotlinx.coroutines) for most assertions
+- [cashapp/turbine](https://github.com/cashapp/turbine) for complex coroutine tests
+- [google/truth](https://github.com/google/truth) for assertions
+
+## Continuous integration
+
+- The workflows are defined in `.github/workflows/*.yaml` and they contain various checks.
+- Screenshot tests are generated by CI, so they shouldn't be checked into the repo from a workstation.
+
+## Version control and code location
+
+- The project uses git and is hosted in https://github.com/android/nowinandroid.

CODEOWNERS

@@ -0,0 +1 @@
+* @dturner

app-nia-catalog/dependencies/releaseRuntimeClasspath.txt

@@ -1,101 +1,113 @@
 androidx.activity:activity-compose:1.9.3
 androidx.activity:activity-ktx:1.9.3
 androidx.activity:activity:1.9.3
-androidx.annotation:annotation-experimental:1.4.1
+androidx.annotation:annotation-experimental:1.5.1
 androidx.annotation:annotation-jvm:1.9.1
 androidx.annotation:annotation:1.9.1
 androidx.appcompat:appcompat-resources:1.7.0
 androidx.arch.core:core-common:2.2.0
 androidx.arch.core:core-runtime:2.2.0
 androidx.autofill:autofill:1.0.0
 androidx.browser:browser:1.8.0
-androidx.collection:collection-jvm:1.5.0-beta03
-androidx.collection:collection-ktx:1.5.0-beta03
-androidx.collection:collection:1.5.0-beta03
-androidx.compose.animation:animation-android:1.8.0-beta02
-androidx.compose.animation:animation-core-android:1.8.0-beta02
-androidx.compose.animation:animation-core:1.8.0-beta02
-androidx.compose.animation:animation:1.8.0-beta02
-androidx.compose.foundation:foundation-android:1.8.0-beta02
-androidx.compose.foundation:foundation-layout-android:1.8.0-beta02
-androidx.compose.foundation:foundation-layout:1.8.0-beta02
-androidx.compose.foundation:foundation:1.8.0-beta02
-androidx.compose.material3.adaptive:adaptive-android:1.1.0-rc01
-androidx.compose.material3.adaptive:adaptive:1.1.0-rc01
-androidx.compose.material3:material3-adaptive-navigation-suite-android:1.4.0-alpha08
-androidx.compose.material3:material3-adaptive-navigation-suite:1.4.0-alpha08
-androidx.compose.material3:material3-android:1.4.0-alpha08
-androidx.compose.material3:material3:1.4.0-alpha08
+androidx.collection:collection-jvm:1.5.0
+androidx.collection:collection-ktx:1.5.0
+androidx.collection:collection:1.5.0
+androidx.compose.animation:animation-android:1.10.0-alpha02
+androidx.compose.animation:animation-core-android:1.10.0-alpha02
+androidx.compose.animation:animation-core:1.10.0-alpha02
+androidx.compose.animation:animation:1.10.0-alpha02
+androidx.compose.foundation:foundation-android:1.10.0-alpha02
+androidx.compose.foundation:foundation-layout-android:1.10.0-alpha02
+androidx.compose.foundation:foundation-layout:1.10.0-alpha02
+androidx.compose.foundation:foundation:1.10.0-alpha02
+androidx.compose.material3.adaptive:adaptive-android:1.2.0-beta01
+androidx.compose.material3.adaptive:adaptive:1.2.0-beta01
+androidx.compose.material3:material3-adaptive-navigation-suite-android:1.5.0-alpha03
+androidx.compose.material3:material3-adaptive-navigation-suite:1.5.0-alpha03
+androidx.compose.material3:material3-android:1.5.0-alpha03
+androidx.compose.material3:material3:1.5.0-alpha03
 androidx.compose.material:material-icons-core-android:1.7.8
 androidx.compose.material:material-icons-core:1.7.8
 androidx.compose.material:material-icons-extended-android:1.7.8
 androidx.compose.material:material-icons-extended:1.7.8
-androidx.compose.material:material-ripple-android:1.8.0-beta02
-androidx.compose.material:material-ripple:1.8.0-beta02
-androidx.compose.runtime:runtime-android:1.8.0-beta02
-androidx.compose.runtime:runtime-saveable-android:1.8.0-beta02
-androidx.compose.runtime:runtime-saveable:1.8.0-beta02
-androidx.compose.runtime:runtime:1.8.0-beta02
-androidx.compose.ui:ui-android:1.8.0-beta02
-androidx.compose.ui:ui-geometry-android:1.8.0-beta02
-androidx.compose.ui:ui-geometry:1.8.0-beta02
-androidx.compose.ui:ui-graphics-android:1.8.0-beta02
-androidx.compose.ui:ui-graphics:1.8.0-beta02
-androidx.compose.ui:ui-text-android:1.8.0-beta02
-androidx.compose.ui:ui-text:1.8.0-beta02
-androidx.compose.ui:ui-tooling-preview-android:1.8.0-beta02
-androidx.compose.ui:ui-tooling-preview:1.8.0-beta02
-androidx.compose.ui:ui-unit-android:1.8.0-beta02
-androidx.compose.ui:ui-unit:1.8.0-beta02
-androidx.compose.ui:ui-util-android:1.8.0-beta02
-androidx.compose.ui:ui-util:1.8.0-beta02
-androidx.compose.ui:ui:1.8.0-beta02
-androidx.compose:compose-bom-alpha:2025.02.00
+androidx.compose.material:material-ripple-android:1.10.0-alpha02
+androidx.compose.material:material-ripple:1.10.0-alpha02
+androidx.compose.runtime:runtime-android:1.10.0-alpha02
+androidx.compose.runtime:runtime-annotation-android:1.10.0-alpha02
+androidx.compose.runtime:runtime-annotation:1.10.0-alpha02
+androidx.compose.runtime:runtime-saveable-android:1.10.0-alpha02
+androidx.compose.runtime:runtime-saveable:1.10.0-alpha02
+androidx.compose.runtime:runtime:1.10.0-alpha02
+androidx.compose.ui:ui-android:1.10.0-alpha02
+androidx.compose.ui:ui-geometry-android:1.10.0-alpha02
+androidx.compose.ui:ui-geometry:1.10.0-alpha02
+androidx.compose.ui:ui-graphics-android:1.10.0-alpha02
+androidx.compose.ui:ui-graphics:1.10.0-alpha02
+androidx.compose.ui:ui-text-android:1.10.0-alpha02
+androidx.compose.ui:ui-text:1.10.0-alpha02
+androidx.compose.ui:ui-tooling-preview-android:1.10.0-alpha02
+androidx.compose.ui:ui-tooling-preview:1.10.0-alpha02
+androidx.compose.ui:ui-unit-android:1.10.0-alpha02
+androidx.compose.ui:ui-unit:1.10.0-alpha02
+androidx.compose.ui:ui-util-android:1.10.0-alpha02
+androidx.compose.ui:ui-util:1.10.0-alpha02
+androidx.compose.ui:ui:1.10.0-alpha02
+androidx.compose:compose-bom-alpha:2025.08.01
 androidx.concurrent:concurrent-futures:1.1.0
-androidx.core:core-ktx:1.15.0
-androidx.core:core:1.15.0
+androidx.core:core-ktx:1.16.0
+androidx.core:core-viewtree:1.0.0
+androidx.core:core:1.16.0
 androidx.customview:customview-poolingcontainer:1.0.0
 androidx.customview:customview:1.0.0
+androidx.documentfile:documentfile:1.0.0
+androidx.dynamicanimation:dynamicanimation:1.0.0
 androidx.emoji2:emoji2:1.4.0
 androidx.exifinterface:exifinterface:1.3.7
 androidx.fragment:fragment:1.5.1
 androidx.graphics:graphics-path:1.0.1
 androidx.graphics:graphics-shapes-android:1.0.1
 androidx.graphics:graphics-shapes:1.0.1
 androidx.interpolator:interpolator:1.0.0
-androidx.lifecycle:lifecycle-common-java8:2.8.7
-androidx.lifecycle:lifecycle-common-jvm:2.8.7
-androidx.lifecycle:lifecycle-common:2.8.7
-androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.7
-androidx.lifecycle:lifecycle-livedata-core:2.8.7
-androidx.lifecycle:lifecycle-livedata:2.8.7
-androidx.lifecycle:lifecycle-process:2.8.7
-androidx.lifecycle:lifecycle-runtime-android:2.8.7
-androidx.lifecycle:lifecycle-runtime-compose-android:2.8.7
-androidx.lifecycle:lifecycle-runtime-compose:2.8.7
-androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.7
-androidx.lifecycle:lifecycle-runtime-ktx:2.8.7
-androidx.lifecycle:lifecycle-runtime:2.8.7
-androidx.lifecycle:lifecycle-viewmodel-android:2.8.7
-androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7
-androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.7
-androidx.lifecycle:lifecycle-viewmodel:2.8.7
+androidx.legacy:legacy-support-core-utils:1.0.0
+androidx.lifecycle:lifecycle-common-java8:2.10.0-alpha03
+androidx.lifecycle:lifecycle-common-jvm:2.10.0-alpha03
+androidx.lifecycle:lifecycle-common:2.10.0-alpha03
+androidx.lifecycle:lifecycle-livedata-core-ktx:2.10.0-alpha03
+androidx.lifecycle:lifecycle-livedata-core:2.10.0-alpha03
+androidx.lifecycle:lifecycle-livedata:2.10.0-alpha03
+androidx.lifecycle:lifecycle-process:2.10.0-alpha03
+androidx.lifecycle:lifecycle-runtime-android:2.10.0-alpha03
+androidx.lifecycle:lifecycle-runtime-compose-android:2.10.0-alpha03
+androidx.lifecycle:lifecycle-runtime-compose:2.10.0-alpha03
+androidx.lifecycle:lifecycle-runtime-ktx-android:2.10.0-alpha03
+androidx.lifecycle:lifecycle-runtime-ktx:2.10.0-alpha03
+androidx.lifecycle:lifecycle-runtime:2.10.0-alpha03
+androidx.lifecycle:lifecycle-viewmodel-android:2.10.0-alpha03
+androidx.lifecycle:lifecycle-viewmodel-ktx:2.10.0-alpha03
+androidx.lifecycle:lifecycle-viewmodel-savedstate-android:2.10.0-alpha03
+androidx.lifecycle:lifecycle-viewmodel-savedstate:2.10.0-alpha03
+androidx.lifecycle:lifecycle-viewmodel:2.10.0-alpha03
 androidx.loader:loader:1.0.0
+androidx.localbroadcastmanager:localbroadcastmanager:1.0.0
 androidx.metrics:metrics-performance:1.0.0-beta01
+androidx.print:print:1.0.0
 androidx.profileinstaller:profileinstaller:1.4.1
-androidx.savedstate:savedstate-ktx:1.2.1
-androidx.savedstate:savedstate:1.2.1
+androidx.savedstate:savedstate-android:1.4.0-alpha03
+androidx.savedstate:savedstate-compose-android:1.4.0-alpha03
+androidx.savedstate:savedstate-compose:1.4.0-alpha03
+androidx.savedstate:savedstate-ktx:1.4.0-alpha03
+androidx.savedstate:savedstate:1.4.0-alpha03
 androidx.startup:startup-runtime:1.1.1
 androidx.tracing:tracing-ktx:1.3.0-alpha02
 androidx.tracing:tracing:1.3.0-alpha02
+androidx.transition:transition:1.6.0
 androidx.vectordrawable:vectordrawable-animated:1.1.0
 androidx.vectordrawable:vectordrawable:1.1.0
 androidx.versionedparcelable:versionedparcelable:1.1.1
 androidx.viewpager:viewpager:1.0.0
-androidx.window.extensions.core:core:1.0.0
-androidx.window:window-core-android:1.3.0
-androidx.window:window-core:1.3.0
-androidx.window:window:1.3.0
+androidx.window:window-core-android:1.4.0
+androidx.window:window-core:1.4.0
+androidx.window:window:1.4.0
 com.google.accompanist:accompanist-drawablepainter:0.36.0
 com.google.code.findbugs:jsr305:3.0.2
 com.google.dagger:dagger-lint-aar:2.56
@@ -144,5 +156,8 @@ org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.1
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1
 org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.1
 org.jetbrains.kotlinx:kotlinx-datetime:0.6.1
+org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3
 org.jetbrains:annotations:23.0.0
 org.jspecify:jspecify:1.0.0