Merge pull request #12 from android/main

Sync master from fork

.github/dependabot.yml

@@ -12,12 +12,11 @@ updates:
     registries: "*"
     labels: [ "version update" ]
     groups:
-      kotlin-ksp-compose:
+      kotlin-ksp:
         patterns:
           - "org.jetbrains.kotlin:*"
           - "org.jetbrains.kotlin.jvm"
           - "com.google.devtools.ksp"
-          - "androidx.compose.compiler:compiler"
     open-pull-requests-limit: 10
 registries:
   maven-google:

.github/workflows/Build.yaml

@@ -25,9 +25,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
-
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
@@ -38,7 +35,10 @@ jobs:
           java-version: 17
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v3
+        uses: gradle/actions/setup-gradle@v3
+        with:
+          validate-wrappers: true
+          gradle-home-cache-cleanup: true
 
       - name: Check build-logic
         run: ./gradlew check -p build-logic
@@ -187,7 +187,10 @@ jobs:
           java-version: 17
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v3
+        uses: gradle/actions/setup-gradle@v3
+        with:
+          validate-wrappers: true
+          gradle-home-cache-cleanup: true
 
       - name: Build projects and run instrumentation tests
         uses: reactivecircus/android-emulator-runner@v2

.github/workflows/Release.yml

@@ -19,10 +19,8 @@ jobs:
           ls /dev/kvm
 
       - name: Checkout
-        uses: actions/checkout@v4   
 
-      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
+        uses: actions/checkout@v4
 
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
@@ -33,6 +31,12 @@ jobs:
           distribution: 'zulu'
           java-version: 17
 
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+        with:
+          validate-wrappers: true
+          gradle-home-cache-cleanup: true
+
       - name: Install GMD image for baseline profile generation
         run: yes | "$ANDROID_HOME"/cmdline-tools/latest/bin/sdkmanager "system-images;android-33;aosp_atd;x86_64"
 

.gitignore

@@ -43,3 +43,6 @@ _sandbox
 
 # Android Studio captures folder
 captures/
+
+# Kotlin
+.kotlin

app-nia-catalog/dependencies/releaseRuntimeClasspath.txt

@@ -2,8 +2,8 @@ androidx.activity:activity-compose:1.8.2
 androidx.activity:activity-ktx:1.8.2
 androidx.activity:activity:1.8.2
 androidx.annotation:annotation-experimental:1.4.0
-androidx.annotation:annotation-jvm:1.7.1
-androidx.annotation:annotation:1.7.1
+androidx.annotation:annotation-jvm:1.8.0
+androidx.annotation:annotation:1.8.0
 androidx.appcompat:appcompat-resources:1.6.1
 androidx.arch.core:core-common:2.2.0
 androidx.arch.core:core-runtime:2.2.0
@@ -12,61 +12,72 @@ androidx.browser:browser:1.8.0
 androidx.collection:collection-jvm:1.4.0
 androidx.collection:collection-ktx:1.4.0
 androidx.collection:collection:1.4.0
-androidx.compose.animation:animation-android:1.6.3
-androidx.compose.animation:animation-core-android:1.6.3
-androidx.compose.animation:animation-core:1.6.3
-androidx.compose.animation:animation:1.6.3
-androidx.compose.foundation:foundation-android:1.6.3
-androidx.compose.foundation:foundation-layout-android:1.6.3
-androidx.compose.foundation:foundation-layout:1.6.3
-androidx.compose.foundation:foundation:1.6.3
-androidx.compose.material3:material3-android:1.2.1
-androidx.compose.material3:material3:1.2.1
+androidx.compose.animation:animation-android:1.7.0-beta01
+androidx.compose.animation:animation-core-android:1.7.0-beta01
+androidx.compose.animation:animation-core:1.7.0-beta01
+androidx.compose.animation:animation:1.7.0-beta01
+androidx.compose.foundation:foundation-android:1.7.0-beta01
+androidx.compose.foundation:foundation-layout-android:1.7.0-beta01
+androidx.compose.foundation:foundation-layout:1.7.0-beta01
+androidx.compose.foundation:foundation:1.7.0-beta01
+androidx.compose.material3.adaptive:adaptive-android:1.0.0-beta01
+androidx.compose.material3.adaptive:adaptive:1.0.0-beta01
+androidx.compose.material3:material3-adaptive-navigation-suite-android:1.3.0-beta01
+androidx.compose.material3:material3-adaptive-navigation-suite:1.3.0-beta01
+androidx.compose.material3:material3-android:1.3.0-beta01
+androidx.compose.material3:material3:1.3.0-beta01
 androidx.compose.material:material-icons-core-android:1.6.3
 androidx.compose.material:material-icons-core:1.6.3
 androidx.compose.material:material-icons-extended-android:1.6.3
 androidx.compose.material:material-icons-extended:1.6.3
-androidx.compose.material:material-ripple-android:1.6.3
-androidx.compose.material:material-ripple:1.6.3
-androidx.compose.runtime:runtime-android:1.6.3
-androidx.compose.runtime:runtime-saveable-android:1.6.3
-androidx.compose.runtime:runtime-saveable:1.6.3
-androidx.compose.runtime:runtime:1.6.3
-androidx.compose.ui:ui-android:1.6.3
-androidx.compose.ui:ui-geometry-android:1.6.3
-androidx.compose.ui:ui-geometry:1.6.3
-androidx.compose.ui:ui-graphics-android:1.6.3
-androidx.compose.ui:ui-graphics:1.6.3
-androidx.compose.ui:ui-text-android:1.6.3
-androidx.compose.ui:ui-text:1.6.3
-androidx.compose.ui:ui-tooling-preview-android:1.6.3
-androidx.compose.ui:ui-tooling-preview:1.6.3
-androidx.compose.ui:ui-unit-android:1.6.3
-androidx.compose.ui:ui-unit:1.6.3
-androidx.compose.ui:ui-util-android:1.6.3
-androidx.compose.ui:ui-util:1.6.3
-androidx.compose.ui:ui:1.6.3
+androidx.compose.material:material-ripple-android:1.7.0-beta01
+androidx.compose.material:material-ripple:1.7.0-beta01
+androidx.compose.runtime:runtime-android:1.7.0-beta01
+androidx.compose.runtime:runtime-saveable-android:1.7.0-beta01
+androidx.compose.runtime:runtime-saveable:1.7.0-beta01
+androidx.compose.runtime:runtime:1.7.0-beta01
+androidx.compose.ui:ui-android:1.7.0-beta01
+androidx.compose.ui:ui-geometry-android:1.7.0-beta01
+androidx.compose.ui:ui-geometry:1.7.0-beta01
+androidx.compose.ui:ui-graphics-android:1.7.0-beta01
+androidx.compose.ui:ui-graphics:1.7.0-beta01
+androidx.compose.ui:ui-text-android:1.7.0-beta01
+androidx.compose.ui:ui-text:1.7.0-beta01
+androidx.compose.ui:ui-tooling-preview-android:1.7.0-beta01
+androidx.compose.ui:ui-tooling-preview:1.7.0-beta01
+androidx.compose.ui:ui-unit-android:1.7.0-beta01
+androidx.compose.ui:ui-unit:1.7.0-beta01
+androidx.compose.ui:ui-util-android:1.7.0-beta01
+androidx.compose.ui:ui-util:1.7.0-beta01
+androidx.compose.ui:ui:1.7.0-beta01
 androidx.compose:compose-bom:2024.02.02
 androidx.concurrent:concurrent-futures:1.1.0
-androidx.core:core-ktx:1.12.0
-androidx.core:core:1.12.0
+androidx.core:core-ktx:1.13.1
+androidx.core:core:1.13.1
 androidx.customview:customview-poolingcontainer:1.0.0
 androidx.customview:customview:1.0.0
 androidx.emoji2:emoji2:1.3.0
 androidx.exifinterface:exifinterface:1.3.7
 androidx.fragment:fragment:1.5.1
+androidx.graphics:graphics-path:1.0.1
 androidx.interpolator:interpolator:1.0.0
-androidx.lifecycle:lifecycle-common-java8:2.7.0
-androidx.lifecycle:lifecycle-common:2.7.0
-androidx.lifecycle:lifecycle-livedata-core-ktx:2.7.0
-androidx.lifecycle:lifecycle-livedata-core:2.7.0
-androidx.lifecycle:lifecycle-livedata:2.7.0
-androidx.lifecycle:lifecycle-process:2.7.0
-androidx.lifecycle:lifecycle-runtime-ktx:2.7.0
-androidx.lifecycle:lifecycle-runtime:2.7.0
-androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0
-androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0
-androidx.lifecycle:lifecycle-viewmodel:2.7.0
+androidx.lifecycle:lifecycle-common-java8:2.8.0
+androidx.lifecycle:lifecycle-common-jvm:2.8.0
+androidx.lifecycle:lifecycle-common:2.8.0
+androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.0
+androidx.lifecycle:lifecycle-livedata-core:2.8.0
+androidx.lifecycle:lifecycle-livedata:2.8.0
+androidx.lifecycle:lifecycle-process:2.8.0
+androidx.lifecycle:lifecycle-runtime-android:2.8.0
+androidx.lifecycle:lifecycle-runtime-compose-android:2.8.0
+androidx.lifecycle:lifecycle-runtime-compose:2.8.0
+androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.0
+androidx.lifecycle:lifecycle-runtime-ktx:2.8.0
+androidx.lifecycle:lifecycle-runtime:2.8.0
+androidx.lifecycle:lifecycle-viewmodel-android:2.8.0
+androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.0
+androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.0
+androidx.lifecycle:lifecycle-viewmodel:2.8.0
 androidx.loader:loader:1.0.0
 androidx.metrics:metrics-performance:1.0.0-alpha04
 androidx.profileinstaller:profileinstaller:1.3.1
@@ -79,12 +90,16 @@ 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-beta02
+androidx.window:window-core:1.3.0-beta02
+androidx.window:window:1.3.0-beta02
 com.google.accompanist:accompanist-drawablepainter:0.32.0
 com.google.code.findbugs:jsr305:3.0.2
-com.google.dagger:dagger-lint-aar:2.51
-com.google.dagger:dagger:2.51
-com.google.dagger:hilt-android:2.51
-com.google.dagger:hilt-core:2.51
+com.google.dagger:dagger-lint-aar:2.51.1
+com.google.dagger:dagger:2.51.1
+com.google.dagger:hilt-android:2.51.1
+com.google.dagger:hilt-core:2.51.1
 com.google.guava:listenablefuture:1.0
 com.squareup.okhttp3:okhttp:4.12.0
 com.squareup.okio:okio-jvm:3.8.0
@@ -94,10 +109,10 @@ io.coil-kt:coil-compose-base:2.6.0
 io.coil-kt:coil-compose:2.6.0
 io.coil-kt:coil:2.6.0
 javax.inject:javax.inject:1
-org.jetbrains.kotlin:kotlin-stdlib-common:1.9.22
+org.jetbrains.kotlin:kotlin-stdlib-common:2.0.0
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0
-org.jetbrains.kotlin:kotlin-stdlib:1.9.22
+org.jetbrains.kotlin:kotlin-stdlib:2.0.0
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3
 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3

app/build.gradle.kts

@@ -20,8 +20,8 @@ plugins {
     alias(libs.plugins.nowinandroid.android.application.compose)
     alias(libs.plugins.nowinandroid.android.application.flavors)
     alias(libs.plugins.nowinandroid.android.application.jacoco)
-    alias(libs.plugins.nowinandroid.android.hilt)
     alias(libs.plugins.nowinandroid.android.application.firebase)
+    alias(libs.plugins.nowinandroid.hilt)
     id("com.google.android.gms.oss-licenses-plugin")
     alias(libs.plugins.baselineprofile)
     alias(libs.plugins.roborazzi)
@@ -112,16 +112,14 @@ dependencies {
     kspTest(libs.hilt.compiler)
 
     testImplementation(projects.core.dataTest)
-    testImplementation(projects.core.testing)
-    testImplementation(projects.sync.syncTest)
-    testImplementation(libs.androidx.compose.ui.test)
-    testImplementation(libs.androidx.work.testing)
     testImplementation(libs.hilt.android.testing)
+    testImplementation(projects.sync.syncTest)
 
     testDemoImplementation(libs.robolectric)
     testDemoImplementation(libs.roborazzi)
     testDemoImplementation(projects.core.screenshotTesting)
 
+    androidTestImplementation(kotlin("test"))
     androidTestImplementation(projects.core.testing)
     androidTestImplementation(projects.core.dataTest)
     androidTestImplementation(projects.core.datastoreTest)