diff options
| -rw-r--r-- | app/src/main/java/app/passwordstore/Application.kt | 2 | ||||
| -rw-r--r-- | gradle/libs.versions.toml | 22 | ||||
| -rw-r--r-- | sentry-stub/src/main/kotlin/io/sentry/protocol/User.kt | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/app/src/main/java/app/passwordstore/Application.kt b/app/src/main/java/app/passwordstore/Application.kt index e1436d29..fb4c0f63 100644 --- a/app/src/main/java/app/passwordstore/Application.kt +++ b/app/src/main/java/app/passwordstore/Application.kt @@ -62,7 +62,7 @@ class Application : android.app.Application(), SharedPreferences.OnSharedPrefere DynamicColors.applyToActivitiesIfAvailable(this) Sentry.configureScope { scope -> val user = User() - user.others = + user.data = Feature.VALUES.associate { feature -> "features.${feature.configKey}" to features.isEnabled(feature).toString() } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 34d5bafe..af731663 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,9 +1,9 @@ [versions] agp = "7.3.0" -androidxActivity = "1.6.0" +androidxActivity = "1.7.0-alpha01" bouncycastle = "1.72" -composeFoundation = "1.3.0-beta03" -composeUi = "1.3.0-beta03" +composeFoundation = "1.3.0-rc01" +composeUi = "1.3.0-rc01" coroutines = "1.6.4" flowbinding = "1.2.0" hilt = "2.44" @@ -23,7 +23,7 @@ androidx-biometricKtx = "androidx.biometric:biometric-ktx:1.2.0-alpha05" androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.2.0-alpha04" androidx-core-ktx = "androidx.core:core-ktx:1.9.0" androidx-documentfile = "androidx.documentfile:documentfile:1.1.0-alpha01" -androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.6.0-alpha02" +androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.6.0-alpha03" androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", version.ref = "lifecycle" } 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" } @@ -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.3.0-beta03" +compose-animation = "androidx.compose.animation:animation:1.3.0-rc01" compose-compiler = "androidx.compose.compiler:compiler:1.3.2" 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-beta03" -compose-runtime = "androidx.compose.runtime:runtime:1.3.0-beta03" +compose-material = "androidx.compose.material:material:1.3.0-rc01" +compose-material3 = "androidx.compose.material3:material3:1.0.0-rc01" +compose-runtime = "androidx.compose.runtime:runtime:1.3.0-rc01" 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 = "androidx.compose.ui:ui-util:1.3.0-beta03" +compose-ui-util = { module = "androidx.compose.ui:ui-util", version.ref = "composeUi" } 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" } @@ -72,7 +72,7 @@ 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.9" testing-sharedPrefsMock = "com.github.android-password-store:shared-preferences-fake:2.0.0" -testing-testparameterinjector = "com.google.testparameterinjector:test-parameter-injector:1.8" +testing-testparameterinjector = "com.google.testparameterinjector:test-parameter-injector:1.9" testing-turbine = "app.cash.turbine:turbine:0.11.0" thirdparty-bouncycastle-bcpkix = { module = "org.bouncycastle:bcpkix-jdk15to18", version.ref = "bouncycastle" } thirdparty-bouncycastle-bcprov = { module = "org.bouncycastle:bcprov-jdk15to18", version.ref = "bouncycastle" } @@ -86,7 +86,7 @@ thirdparty-leakcanary = { module = "com.squareup.leakcanary:leakcanary-android-s thirdparty-logcat = "com.squareup.logcat:logcat:0.1" thirdparty-modernAndroidPrefs = "de.maxr1998:modernandroidpreferences:2.3.1" thirdparty-nonfree-googlePlayAuthApiPhone = "com.google.android.gms:play-services-auth-api-phone:18.0.1" -thirdparty-nonfree-sentry = "io.sentry:sentry-android:6.4.2" +thirdparty-nonfree-sentry = "io.sentry:sentry-android:6.5.0-beta.2" thirdparty-pgpainless = "org.pgpainless:pgpainless-core:1.3.7" thirdparty-plumber = { module = "com.squareup.leakcanary:plumber-android-startup", version.ref = "leakcanary" } # TODO: Remove the explicit bcpkix dependency when upgrading this to a BC 1.71 compatible version diff --git a/sentry-stub/src/main/kotlin/io/sentry/protocol/User.kt b/sentry-stub/src/main/kotlin/io/sentry/protocol/User.kt index 5b60ba72..d77feff0 100644 --- a/sentry-stub/src/main/kotlin/io/sentry/protocol/User.kt +++ b/sentry-stub/src/main/kotlin/io/sentry/protocol/User.kt @@ -7,6 +7,6 @@ public data class User( public var id: String? = null, public var username: String? = null, public var ipAddress: String? = null, - public var others: Map<String?, String>? = null, + public var data: Map<String?, String>? = null, public var unknown: Map<String?, String>? = null, ) |