From 8786e6abff2118f2fd0d74d28b2d3a5b503b48ca Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Thu, 22 Sep 2022 00:56:15 +0530
Subject: Upgrade AndroidX dependencies (#2139)

---
 .idea/codeStyles/Project.xml                           |  7 +------
 .../kotlin/app/passwordstore/gradle/AndroidCommon.kt   |  8 ++++++++
 gradle/libs.versions.toml                              | 18 +++++++++---------
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 6b22ad8f..5f58ef5b 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -14,17 +14,12 @@
       <option name="DO_NOT_WRAP_AFTER_SINGLE_ANNOTATION" value="true" />
     </JavaCodeStyleSettings>
     <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value />
-      </option>
       <option name="PACKAGES_IMPORT_LAYOUT">
         <value>
           <package name="" alias="false" withSubpackages="true" />
           <package name="" alias="true" withSubpackages="true" />
         </value>
       </option>
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
       <option name="CONTINUATION_INDENT_IN_PARAMETER_LISTS" value="true" />
       <option name="CONTINUATION_INDENT_IN_ARGUMENT_LISTS" value="true" />
       <option name="CONTINUATION_INDENT_FOR_EXPRESSION_BODIES" value="true" />
@@ -187,4 +182,4 @@
       </indentOptions>
     </codeStyleSettings>
   </code_scheme>
-</component>
+</component>
\ No newline at end of file
diff --git a/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/AndroidCommon.kt b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/AndroidCommon.kt
index 52357171..5e38b6eb 100644
--- a/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/AndroidCommon.kt
+++ b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/AndroidCommon.kt
@@ -4,7 +4,9 @@ import app.passwordstore.gradle.flavors.configureSlimTests
 import com.android.build.gradle.TestedExtension
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
+import org.gradle.api.tasks.testing.Test
 import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.withType
 
 @Suppress("UnstableApiUsage")
 object AndroidCommon {
@@ -40,6 +42,12 @@ object AndroidCommon {
         animationsDisabled = true
         unitTests.isReturnDefaultValues = true
       }
+      project.tasks.withType<Test> {
+        jvmArgs(
+          "--add-opens=java.base/java.lang=ALL-UNNAMED",
+          "--add-opens=java.base/java.util=ALL-UNNAMED",
+        )
+      }
 
       project.configureSlimTests()
     }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 09e4977f..5259bd7a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,8 +2,8 @@
 agp = "7.3.0"
 androidxActivity = "1.6.0-rc02"
 bouncycastle = "1.71"
-composeFoundation = "1.3.0-beta02"
-composeUi = "1.3.0-beta02"
+composeFoundation = "1.3.0-beta03"
+composeUi = "1.3.0-beta03"
 coroutines = "1.6.4"
 flowbinding = "1.2.0"
 hilt = "2.43.2"
@@ -19,7 +19,7 @@ androidx-annotation = "androidx.annotation:annotation:1.5.0-rc01"
 # @pin beta01 moved DrawableWrapper to public API, breaking the FastScroll library
 androidx-appcompat = "androidx.appcompat:appcompat:1.6.0-alpha05"
 androidx-autofill = "androidx.autofill:autofill:1.2.0-beta01"
-androidx-biometricKtx = "androidx.biometric:biometric-ktx:1.2.0-alpha04"
+androidx-biometricKtx = "androidx.biometric:biometric-ktx:1.2.0-alpha05"
 androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.2.0-alpha03"
 androidx-core-ktx = "androidx.core:core-ktx:1.9.0"
 androidx-documentfile = "androidx.documentfile:documentfile:1.1.0-alpha01"
@@ -28,9 +28,9 @@ androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", ve
 androidx-lifecycle-livedataKtx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycle" }
 androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" }
 androidx-lifecycle-viewmodelKtx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycle" }
-androidx-material = "com.google.android.material:material:1.7.0-rc01"
+androidx-material = "com.google.android.material:material:1.8.0-alpha01"
 androidx-preference = "androidx.preference:preference:1.2.0"
-androidx-recyclerview = "androidx.recyclerview:recyclerview:1.3.0-beta02"
+androidx-recyclerview = "androidx.recyclerview:recyclerview:1.3.0-rc01"
 androidx-recyclerviewSelection = "androidx.recyclerview:recyclerview-selection:1.2.0-alpha01"
 androidx-security = "androidx.security:security-crypto:1.1.0-alpha03"
 androidx-swiperefreshlayout = "androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01"
@@ -49,18 +49,18 @@ build-sentry = "io.sentry.android.gradle:io.sentry.android.gradle.gradle.plugin:
 build-spotless = "com.diffplug.spotless:spotless-plugin-gradle:6.11.0"
 build-vcu = "nl.littlerobots.version-catalog-update:nl.littlerobots.version-catalog-update.gradle.plugin:0.6.1"
 build-versions = "com.github.ben-manes:gradle-versions-plugin:0.42.0"
-compose-animation = "androidx.compose.animation:animation:1.2.1"
+compose-animation = "androidx.compose.animation:animation:1.3.0-beta02"
 compose-compiler = "androidx.compose.compiler:compiler:1.3.1"
 compose-foundation-core = { module = "androidx.compose.foundation:foundation", version.ref = "composeFoundation" }
 compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "composeFoundation" }
 compose-hilt = "androidx.hilt:hilt-navigation-compose:1.0.0"
 compose-material = "androidx.compose.material:material:1.2.1"
-compose-material3 = "androidx.compose.material3:material3:1.0.0-beta02"
+compose-material3 = "androidx.compose.material3:material3:1.0.0-beta03"
 compose-runtime = "androidx.compose.runtime:runtime:1.3.0-beta02"
 compose-ui-core = { module = "androidx.compose.ui:ui", version.ref = "composeUi" }
 compose-ui-test = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "composeUi" }
 compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "composeUi" }
-compose-ui-util = { module = "androidx.compose.ui:ui-util", version.ref = "composeUi" }
+compose-ui-util = "androidx.compose.ui:ui-util:1.3.0-beta02"
 compose-ui-viewbinding = { module = "androidx.compose.ui:ui-viewbinding", version.ref = "composeUi" }
 dagger-hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" }
 dagger-hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "hilt" }
@@ -70,7 +70,7 @@ kotlin-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-co
 kotlin-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
 testing-junit = "junit:junit:4.13.2"
 testing-kotlintest-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
-testing-robolectric = "org.robolectric:robolectric:4.8.2"
+testing-robolectric = "org.robolectric:robolectric:4.9-alpha-1"
 testing-sharedPrefsMock = "com.github.android-password-store:shared-preferences-fake:2.0.0"
 testing-testparameterinjector = "com.google.testparameterinjector:test-parameter-injector:1.8"
 testing-turbine = "app.cash.turbine:turbine:0.11.0"
-- 
cgit v1.2.3