Merge branch 'develop' into dependabot/gradle/accompanist-0.36.0

ls1intum · Nov 21, 2024 · 1b62500 · 1b62500
2 parents 14af3f8 + 1e520ed
commit 1b62500
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 24 deletions.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     `kotlin-dsl`
     kotlin("jvm") version "1.8.10"
-    kotlin("plugin.serialization") version "1.8.10"
+    kotlin("plugin.serialization") version "2.0.21"
 //    id("java-gradle-plugin")
 }
 

diff --git a/...n/kotlin/de/tum/informatics/www1/artemis/native_app/core/test/test_setup/TestVariables.kt b/...n/kotlin/de/tum/informatics/www1/artemis/native_app/core/test/test_setup/TestVariables.kt
@@ -1,3 +1,3 @@
 package de.tum.informatics.www1.artemis.native_app.core.test.test_setup
 
-val DefaultTimeoutMillis: Long get() = System.getenv("DEFAULT_TIMEOUT")?.toLong() ?: 10000L
+val DefaultTimeoutMillis: Long get() = System.getenv("DEFAULT_TIMEOUT")?.toLong() ?: 15000L
diff --git a/...native_app/feature/metis/manageconversations/members/ConversationMemberSettingsE2eTest.kt b/...native_app/feature/metis/manageconversations/members/ConversationMemberSettingsE2eTest.kt
@@ -6,7 +6,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.assert
 import androidx.compose.ui.test.hasAnyAncestor
-import androidx.compose.ui.test.hasAnyDescendant
 import androidx.compose.ui.test.hasContentDescription
 import androidx.compose.ui.test.hasTestTag
 import androidx.compose.ui.test.hasText
@@ -15,10 +14,10 @@ import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performScrollTo
 import androidx.lifecycle.SavedStateHandle
-import de.tum.informatics.www1.artemis.native_app.core.common.test.EndToEndTest
 import de.tum.informatics.www1.artemis.native_app.core.common.test.DefaultTestTimeoutMillis
-import de.tum.informatics.www1.artemis.native_app.core.test.test_setup.DefaultTimeoutMillis
+import de.tum.informatics.www1.artemis.native_app.core.common.test.EndToEndTest
 import de.tum.informatics.www1.artemis.native_app.core.common.test.testServerUrl
+import de.tum.informatics.www1.artemis.native_app.core.test.test_setup.DefaultTimeoutMillis
 import de.tum.informatics.www1.artemis.native_app.feature.login.test.user1Username
 import de.tum.informatics.www1.artemis.native_app.feature.login.test.user2Username
 import de.tum.informatics.www1.artemis.native_app.feature.login.test.user3Username
@@ -83,28 +82,24 @@ class ConversationMemberSettingsE2eTest : ConversationBaseTest() {
         composeTestRule
             .onNodeWithTag(testTagForMember(user1Username))
             .performScrollTo()
-            .assert(
-                hasAnyDescendant(hasText(user1Username)) and hasAnyDescendant(
-                    hasContentDescription(context.getString(R.string.conversation_members_content_description_moderator))
-                )
-            )
+            .assert(hasText(user1Username))
+            .assert(hasContentDescription(context.getString(R.string.conversation_members_content_description_moderator))
+        )
 
         composeTestRule
             .onNodeWithTag(testTagForMember(user2Username))
             .performScrollTo()
             .assert(
-                hasAnyDescendant(hasText(user2Username)) and !hasAnyDescendant(
+                hasText(user2Username) and !
                     hasContentDescription(context.getString(R.string.conversation_members_content_description_moderator))
-                )
             )
 
         composeTestRule
             .onNodeWithTag(testTagForMember(user2Username))
             .performScrollTo()
             .assert(
-                hasAnyDescendant(hasText(user2Username)) and !hasAnyDescendant(
+                hasText(user2Username) and !
                     hasContentDescription(context.getString(R.string.conversation_members_content_description_moderator))
-                )
             )
     }
 
@@ -186,10 +181,8 @@ class ConversationMemberSettingsE2eTest : ConversationBaseTest() {
             )
             .performClick()
 
-        val isModeratorCheck = hasAnyDescendant(
-            hasContentDescription(
-                context.getString(R.string.conversation_members_content_description_moderator)
-            )
+        val isModeratorCheck = hasContentDescription(
+            context.getString(R.string.conversation_members_content_description_moderator)
         )
 
         composeTestRule.waitUntilExactlyOneExists(

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -8,17 +8,17 @@ accompanist = "0.36.0"
 androidDesugarJdkLibs = "2.0.4"
 androidxActivity = "1.8.1"
 androidxAppCompat = "1.6.1"
-androidxComposeBom = "2023.10.01"
+androidxComposeBom = "2024.06.00"
 androidxLifecycle = "2.6.2"
 androidxNavigation = "2.7.5"
 androidGradlePlugin = "8.7.0"
-androidxDataStore = "1.0.0"
-androidxPaging = "3.2.1"
+androidxPaging = "3.3.4"
+androidxDataStore = "1.1.1"
 androidxPagingCompose = "3.2.1"
 coil = "2.4.0"
 emoji2 = "1.4.0"
 kotlin = "1.9.25"
-kotlinxCoroutines = "1.7.3"
+kotlinxCoroutines = "1.9.0"
 kotlinxDatetime = "0.4.0"
 kotlinxSerializationJson = "1.5.1"
 koin = "3.5.3"
@@ -29,10 +29,10 @@ krossbow = "5.2.0"
 markwon = "4.6.2"
 mockk = "1.13.8"
 ossLicensesPlugin = "0.10.6"
-placeholderMaterial = "1.0.1"
+placeholderMaterial = "2.0.0"
 room = "2.6.0"
 sentry-android = "7.17.0"
-work = "2.9.0"
+work = "2.10.0"
 
 # Used indirecly in the build config -> Do not remove without double checking.
 androidxComposeCompiler = "1.5.15"