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

Commit 8ba910e

Browse files
committed
chore(deps): upgrade AndroidX dependencies
1 parent ebada9b commit 8ba910e

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

app/src/main/java/app/passwordstore/Application.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class Application : android.app.Application(), SharedPreferences.OnSharedPrefere
6262
DynamicColors.applyToActivitiesIfAvailable(this)
6363
Sentry.configureScope { scope ->
6464
val user = User()
65-
user.others =
65+
user.data =
6666
Feature.VALUES.associate { feature ->
6767
"features.${feature.configKey}" to features.isEnabled(feature).toString()
6868
}

gradle/libs.versions.toml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[versions]
22
agp = "7.3.0"
3-
androidxActivity = "1.6.0"
3+
androidxActivity = "1.7.0-alpha01"
44
bouncycastle = "1.72"
5-
composeFoundation = "1.3.0-beta03"
6-
composeUi = "1.3.0-beta03"
5+
composeFoundation = "1.3.0-rc01"
6+
composeUi = "1.3.0-rc01"
77
coroutines = "1.6.4"
88
flowbinding = "1.2.0"
99
hilt = "2.44"
@@ -23,7 +23,7 @@ androidx-biometricKtx = "androidx.biometric:biometric-ktx:1.2.0-alpha05"
2323
androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.2.0-alpha04"
2424
androidx-core-ktx = "androidx.core:core-ktx:1.9.0"
2525
androidx-documentfile = "androidx.documentfile:documentfile:1.1.0-alpha01"
26-
androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.6.0-alpha02"
26+
androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.6.0-alpha03"
2727
androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", version.ref = "lifecycle" }
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" }
@@ -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.3.0-beta03"
52+
compose-animation = "androidx.compose.animation:animation:1.3.0-rc01"
5353
compose-compiler = "androidx.compose.compiler:compiler:1.3.2"
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"
57-
compose-material = "androidx.compose.material:material:1.2.1"
58-
compose-material3 = "androidx.compose.material3:material3:1.0.0-beta03"
59-
compose-runtime = "androidx.compose.runtime:runtime:1.3.0-beta03"
57+
compose-material = "androidx.compose.material:material:1.3.0-rc01"
58+
compose-material3 = "androidx.compose.material3:material3:1.0.0-rc01"
59+
compose-runtime = "androidx.compose.runtime:runtime:1.3.0-rc01"
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 = "androidx.compose.ui:ui-util:1.3.0-beta03"
63+
compose-ui-util = { module = "androidx.compose.ui:ui-util", version.ref = "composeUi" }
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" }
@@ -72,7 +72,7 @@ testing-junit = "junit:junit:4.13.2"
7272
testing-kotlintest-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
7373
testing-robolectric = "org.robolectric:robolectric:4.9"
7474
testing-sharedPrefsMock = "com.github.android-password-store:shared-preferences-fake:2.0.0"
75-
testing-testparameterinjector = "com.google.testparameterinjector:test-parameter-injector:1.8"
75+
testing-testparameterinjector = "com.google.testparameterinjector:test-parameter-injector:1.9"
7676
testing-turbine = "app.cash.turbine:turbine:0.11.0"
7777
thirdparty-bouncycastle-bcpkix = { module = "org.bouncycastle:bcpkix-jdk15to18", version.ref = "bouncycastle" }
7878
thirdparty-bouncycastle-bcprov = { module = "org.bouncycastle:bcprov-jdk15to18", version.ref = "bouncycastle" }
@@ -86,7 +86,7 @@ thirdparty-leakcanary = { module = "com.squareup.leakcanary:leakcanary-android-s
8686
thirdparty-logcat = "com.squareup.logcat:logcat:0.1"
8787
thirdparty-modernAndroidPrefs = "de.maxr1998:modernandroidpreferences:2.3.1"
8888
thirdparty-nonfree-googlePlayAuthApiPhone = "com.google.android.gms:play-services-auth-api-phone:18.0.1"
89-
thirdparty-nonfree-sentry = "io.sentry:sentry-android:6.4.2"
89+
thirdparty-nonfree-sentry = "io.sentry:sentry-android:6.5.0-beta.2"
9090
thirdparty-pgpainless = "org.pgpainless:pgpainless-core:1.3.7"
9191
thirdparty-plumber = { module = "com.squareup.leakcanary:plumber-android-startup", version.ref = "leakcanary" }
9292
# TODO: Remove the explicit bcpkix dependency when upgrading this to a BC 1.71 compatible version

sentry-stub/src/main/kotlin/io/sentry/protocol/User.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ public data class User(
77
public var id: String? = null,
88
public var username: String? = null,
99
public var ipAddress: String? = null,
10-
public var others: Map<String?, String>? = null,
10+
public var data: Map<String?, String>? = null,
1111
public var unknown: Map<String?, String>? = null,
1212
)

0 commit comments

Comments
 (0)