Merge branch 'develop' into feature/fga/presenter_tests

libraries/designsystem/build.gradle.kts

@@ -29,6 +29,7 @@ android {
         implementation(libs.coil.compose)
         implementation(libs.accompanist.systemui)
         implementation(project(":libraries:elementresources"))
+        implementation(project(":libraries:ui-strings"))
         ksp(libs.showkase.processor)
     }
 }

libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/dialogs/ConfirmationDialog.kt

@@ -29,15 +29,15 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import io.element.android.x.element.resources.R as ElementR
+import io.element.android.x.ui.strings.R as StringR
 
 @Composable
 fun ConfirmationDialog(
     title: String,
     content: String,
     modifier: Modifier = Modifier,
-    submitText: String = stringResource(id = ElementR.string.ok),
-    cancelText: String = stringResource(id = ElementR.string.action_cancel),
+    submitText: String = stringResource(id = StringR.string.ok),
+    cancelText: String = stringResource(id = StringR.string.action_cancel),
     thirdButtonText: String? = null,
     onSubmitClicked: () -> Unit = {},
     onCancelClicked: () -> Unit = {},

libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/dialogs/ErrorDialog.kt

@@ -28,14 +28,14 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import io.element.android.x.element.resources.R as ElementR
+import io.element.android.x.ui.strings.R as StringR
 
 @Composable
 fun ErrorDialog(
     content: String,
     modifier: Modifier = Modifier,
-    title: String = stringResource(id = ElementR.string.dialog_title_error),
-    submitText: String = stringResource(id = ElementR.string.ok),
+    title: String = stringResource(id = StringR.string.dialog_title_error),
+    submitText: String = stringResource(id = StringR.string.ok),
     onDismiss: () -> Unit = {},
 ) {
     AlertDialog(

libraries/matrix/build.gradle.kts

@@ -19,7 +19,7 @@
 plugins {
     id("io.element.android-library")
     alias(libs.plugins.anvil)
-    kotlin("plugin.serialization") version "1.7.20"
+    kotlin("plugin.serialization") version "1.8.0"
 }
 
 android {
@@ -35,7 +35,7 @@ dependencies {
     implementation(project(":libraries:di"))
     implementation(libs.dagger)
     implementation(project(":libraries:core"))
-    implementation("net.java.dev.jna:jna:5.12.1@aar")
+    implementation("net.java.dev.jna:jna:5.13.0@aar")
     implementation(libs.androidx.datastore.preferences)
     implementation(libs.serialization.json)
 }