Skip to content
This repository was archived by the owner on Oct 15, 2024. It is now read-only.

Commit 8786e6a

Browse files
authored
Upgrade AndroidX dependencies (#2139)
1 parent 8db7463 commit 8786e6a

File tree

3 files changed

+18
-15
lines changed

3 files changed

+18
-15
lines changed

.idea/codeStyles/Project.xml

Lines changed: 1 addition & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/AndroidCommon.kt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ import app.passwordstore.gradle.flavors.configureSlimTests
44
import com.android.build.gradle.TestedExtension
55
import org.gradle.api.JavaVersion
66
import org.gradle.api.Project
7+
import org.gradle.api.tasks.testing.Test
78
import org.gradle.kotlin.dsl.configure
9+
import org.gradle.kotlin.dsl.withType
810

911
@Suppress("UnstableApiUsage")
1012
object AndroidCommon {
@@ -40,6 +42,12 @@ object AndroidCommon {
4042
animationsDisabled = true
4143
unitTests.isReturnDefaultValues = true
4244
}
45+
project.tasks.withType<Test> {
46+
jvmArgs(
47+
"--add-opens=java.base/java.lang=ALL-UNNAMED",
48+
"--add-opens=java.base/java.util=ALL-UNNAMED",
49+
)
50+
}
4351

4452
project.configureSlimTests()
4553
}

gradle/libs.versions.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
agp = "7.3.0"
33
androidxActivity = "1.6.0-rc02"
44
bouncycastle = "1.71"
5-
composeFoundation = "1.3.0-beta02"
6-
composeUi = "1.3.0-beta02"
5+
composeFoundation = "1.3.0-beta03"
6+
composeUi = "1.3.0-beta03"
77
coroutines = "1.6.4"
88
flowbinding = "1.2.0"
99
hilt = "2.43.2"
@@ -19,7 +19,7 @@ androidx-annotation = "androidx.annotation:annotation:1.5.0-rc01"
1919
# @pin beta01 moved DrawableWrapper to public API, breaking the FastScroll library
2020
androidx-appcompat = "androidx.appcompat:appcompat:1.6.0-alpha05"
2121
androidx-autofill = "androidx.autofill:autofill:1.2.0-beta01"
22-
androidx-biometricKtx = "androidx.biometric:biometric-ktx:1.2.0-alpha04"
22+
androidx-biometricKtx = "androidx.biometric:biometric-ktx:1.2.0-alpha05"
2323
androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.2.0-alpha03"
2424
androidx-core-ktx = "androidx.core:core-ktx:1.9.0"
2525
androidx-documentfile = "androidx.documentfile:documentfile:1.1.0-alpha01"
@@ -28,9 +28,9 @@ androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", ve
2828
androidx-lifecycle-livedataKtx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycle" }
2929
androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" }
3030
androidx-lifecycle-viewmodelKtx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycle" }
31-
androidx-material = "com.google.android.material:material:1.7.0-rc01"
31+
androidx-material = "com.google.android.material:material:1.8.0-alpha01"
3232
androidx-preference = "androidx.preference:preference:1.2.0"
33-
androidx-recyclerview = "androidx.recyclerview:recyclerview:1.3.0-beta02"
33+
androidx-recyclerview = "androidx.recyclerview:recyclerview:1.3.0-rc01"
3434
androidx-recyclerviewSelection = "androidx.recyclerview:recyclerview-selection:1.2.0-alpha01"
3535
androidx-security = "androidx.security:security-crypto:1.1.0-alpha03"
3636
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:
4949
build-spotless = "com.diffplug.spotless:spotless-plugin-gradle:6.11.0"
5050
build-vcu = "nl.littlerobots.version-catalog-update:nl.littlerobots.version-catalog-update.gradle.plugin:0.6.1"
5151
build-versions = "com.github.ben-manes:gradle-versions-plugin:0.42.0"
52-
compose-animation = "androidx.compose.animation:animation:1.2.1"
52+
compose-animation = "androidx.compose.animation:animation:1.3.0-beta02"
5353
compose-compiler = "androidx.compose.compiler:compiler:1.3.1"
5454
compose-foundation-core = { module = "androidx.compose.foundation:foundation", version.ref = "composeFoundation" }
5555
compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "composeFoundation" }
5656
compose-hilt = "androidx.hilt:hilt-navigation-compose:1.0.0"
5757
compose-material = "androidx.compose.material:material:1.2.1"
58-
compose-material3 = "androidx.compose.material3:material3:1.0.0-beta02"
58+
compose-material3 = "androidx.compose.material3:material3:1.0.0-beta03"
5959
compose-runtime = "androidx.compose.runtime:runtime:1.3.0-beta02"
6060
compose-ui-core = { module = "androidx.compose.ui:ui", version.ref = "composeUi" }
6161
compose-ui-test = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "composeUi" }
6262
compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "composeUi" }
63-
compose-ui-util = { module = "androidx.compose.ui:ui-util", version.ref = "composeUi" }
63+
compose-ui-util = "androidx.compose.ui:ui-util:1.3.0-beta02"
6464
compose-ui-viewbinding = { module = "androidx.compose.ui:ui-viewbinding", version.ref = "composeUi" }
6565
dagger-hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" }
6666
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
7070
kotlin-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
7171
testing-junit = "junit:junit:4.13.2"
7272
testing-kotlintest-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
73-
testing-robolectric = "org.robolectric:robolectric:4.8.2"
73+
testing-robolectric = "org.robolectric:robolectric:4.9-alpha-1"
7474
testing-sharedPrefsMock = "com.github.android-password-store:shared-preferences-fake:2.0.0"
7575
testing-testparameterinjector = "com.google.testparameterinjector:test-parameter-injector:1.8"
7676
testing-turbine = "app.cash.turbine:turbine:0.11.0"

0 commit comments

Comments
 (0)