diff --git a/JetLagged/app/src/androidTest/java/com/example/jetlagged/AppTest.kt b/JetLagged/app/src/androidTest/java/com/example/jetlagged/AppTest.kt
index 6031878513..55940bedcb 100644
--- a/JetLagged/app/src/androidTest/java/com/example/jetlagged/AppTest.kt
+++ b/JetLagged/app/src/androidTest/java/com/example/jetlagged/AppTest.kt
@@ -17,7 +17,7 @@
 package com.example.jetlagged
 
 import androidx.compose.ui.test.assertIsDisplayed
-import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.junit4.v2.createComposeRule
 import androidx.compose.ui.test.onNodeWithText
 import com.example.jetlagged.ui.theme.JetLaggedTheme
 import org.junit.Before
diff --git a/JetLagged/app/src/main/java/com/example/jetlagged/sleep/JetLaggedHeaderTabs.kt b/JetLagged/app/src/main/java/com/example/jetlagged/sleep/JetLaggedHeaderTabs.kt
index ba4a62fa19..eafe0df848 100644
--- a/JetLagged/app/src/main/java/com/example/jetlagged/sleep/JetLaggedHeaderTabs.kt
+++ b/JetLagged/app/src/main/java/com/example/jetlagged/sleep/JetLaggedHeaderTabs.kt
@@ -26,7 +26,6 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.PrimaryScrollableTabRow
 import androidx.compose.material3.Tab
 import androidx.compose.material3.TabPosition
-import androidx.compose.material3.TabRowDefaults.tabIndicatorOffset
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
diff --git a/JetLagged/gradle/libs.versions.toml b/JetLagged/gradle/libs.versions.toml
index bdc0fb6838..c95591983c 100644
--- a/JetLagged/gradle/libs.versions.toml
+++ b/JetLagged/gradle/libs.versions.toml
@@ -1,18 +1,18 @@
 [versions]
 accompanist = "0.37.3"
-android-material3 = "1.14.0-alpha09"
-androidGradlePlugin = "9.0.1"
+android-material3 = "1.14.0-beta01"
+androidGradlePlugin = "9.2.0"
 androidx-activity-compose = "1.13.0"
 androidx-appcompat = "1.7.1"
-androidx-compose-bom = "2026.03.00"
+androidx-compose-bom = "2026.04.01"
 androidx-constraintlayout = "1.1.1"
 androidx-core-splashscreen = "1.2.0"
-androidx-corektx = "1.17.0"
+androidx-corektx = "1.18.0"
 androidx-glance = "1.1.1"
-androidx-lifecycle = "2.8.2"
+androidx-lifecycle = "2.10.0"
 androidx-lifecycle-compose = "2.10.0"
 androidx-lifecycle-runtime-compose = "2.10.0"
-androidx-navigation = "2.9.7"
+androidx-navigation = "2.9.8"
 androidx-palette = "1.0.0"
 androidx-test = "1.7.0"
 androidx-test-espresso = "3.7.0"
diff --git a/JetLagged/gradle/wrapper/gradle-wrapper.properties b/JetLagged/gradle/wrapper/gradle-wrapper.properties
index e2e4d002fe..89e6633ddd 100644
--- a/JetLagged/gradle/wrapper/gradle-wrapper.properties
+++ b/JetLagged/gradle/wrapper/gradle-wrapper.properties
@@ -15,6 +15,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/JetNews/app/src/androidTest/java/com/example/jetnews/HomeScreenTests.kt b/JetNews/app/src/androidTest/java/com/example/jetnews/HomeScreenTests.kt
index 4decf5a4de..664de496de 100644
--- a/JetNews/app/src/androidTest/java/com/example/jetnews/HomeScreenTests.kt
+++ b/JetNews/app/src/androidTest/java/com/example/jetnews/HomeScreenTests.kt
@@ -19,7 +19,7 @@ package com.example.jetnews
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.runtime.snapshotFlow
-import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.junit4.v2.createComposeRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.example.jetnews.ui.home.HomeFeedScreen
diff --git a/JetNews/app/src/androidTest/java/com/example/jetnews/JetnewsTests.kt b/JetNews/app/src/androidTest/java/com/example/jetnews/JetnewsTests.kt
index dc5c86fc15..207f6cf203 100644
--- a/JetNews/app/src/androidTest/java/com/example/jetnews/JetnewsTests.kt
+++ b/JetNews/app/src/androidTest/java/com/example/jetnews/JetnewsTests.kt
@@ -19,7 +19,7 @@ package com.example.jetnews
 import androidx.activity.ComponentActivity
 import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.hasText
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.junit4.v2.createAndroidComposeRule
 import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
diff --git a/JetNews/gradle/libs.versions.toml b/JetNews/gradle/libs.versions.toml
index 496947920a..378c0e284d 100644
--- a/JetNews/gradle/libs.versions.toml
+++ b/JetNews/gradle/libs.versions.toml
@@ -4,20 +4,20 @@
 #####
 [versions]
 accompanist = "0.37.3"
-android-material3 = "1.14.0-alpha09"
-androidGradlePlugin = "9.0.1"
+android-material3 = "1.14.0-beta01"
+androidGradlePlugin = "9.2.0"
 androidx-activity-compose = "1.13.0"
 androidx-appcompat = "1.7.1"
-androidx-compose-bom = "2026.03.00"
+androidx-compose-bom = "2026.04.01"
 androidx-constraintlayout = "1.1.1"
 androidx-core-splashscreen = "1.2.0"
-androidx-corektx = "1.17.0"
+androidx-corektx = "1.18.0"
 androidx-glance = "1.1.1"
-androidx-lifecycle = "2.8.2"
+androidx-lifecycle = "2.10.0"
 androidx-lifecycle-compose = "2.10.0"
 androidx-lifecycle-runtime-compose = "2.10.0"
 androidx-lifecycle-viewmodel-navigation3 = "2.10.0"
-androidx-navigation = "2.9.7"
+androidx-navigation = "2.9.8"
 androidx-navigation3 = "1.1.0-rc01"
 androidx-palette = "1.0.0"
 androidx-test = "1.7.0"
diff --git a/JetNews/gradle/wrapper/gradle-wrapper.properties b/JetNews/gradle/wrapper/gradle-wrapper.properties
index e2e4d002fe..89e6633ddd 100644
--- a/JetNews/gradle/wrapper/gradle-wrapper.properties
+++ b/JetNews/gradle/wrapper/gradle-wrapper.properties
@@ -15,6 +15,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/Jetcaster/gradle/libs.versions.toml b/Jetcaster/gradle/libs.versions.toml
index 6a9ddbabbd..89393cd18b 100644
--- a/Jetcaster/gradle/libs.versions.toml
+++ b/Jetcaster/gradle/libs.versions.toml
@@ -4,19 +4,19 @@
 #####
 [versions]
 accompanist = "0.37.3"
-android-material3 = "1.13.0-alpha13"
-androidGradlePlugin = "8.10.1"
+android-material3 = "1.14.0-beta01"
+androidGradlePlugin = "9.2.0"
 androidx-activity-compose = "1.13.0"
 androidx-appcompat = "1.7.1"
-androidx-compose-bom = "2026.03.00"
+androidx-compose-bom = "2026.04.01"
 androidx-constraintlayout = "1.1.1"
 androidx-core-splashscreen = "1.0.1"
-androidx-corektx = "1.16.0"
+androidx-corektx = "1.18.0"
 androidx-glance = "1.1.1"
-androidx-lifecycle = "2.8.2"
+androidx-lifecycle = "2.10.0"
 androidx-lifecycle-compose = "2.10.0"
 androidx-lifecycle-runtime-compose = "2.10.0"
-androidx-navigation = "2.9.7"
+androidx-navigation = "2.9.8"
 androidx-palette = "1.0.0"
 androidx-test = "1.6.1"
 androidx-test-espresso = "3.6.1"
diff --git a/Jetcaster/gradle/wrapper/gradle-wrapper.properties b/Jetcaster/gradle/wrapper/gradle-wrapper.properties
index b889d1192e..d46c121053 100644
--- a/Jetcaster/gradle/wrapper/gradle-wrapper.properties
+++ b/Jetcaster/gradle/wrapper/gradle-wrapper.properties
@@ -14,6 +14,6 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/Jetcaster/wear/src/test/java/com/example/jetcaster/NavigationTest.kt b/Jetcaster/wear/src/test/java/com/example/jetcaster/NavigationTest.kt
index 90b1dcb012..bad6789298 100644
--- a/Jetcaster/wear/src/test/java/com/example/jetcaster/NavigationTest.kt
+++ b/Jetcaster/wear/src/test/java/com/example/jetcaster/NavigationTest.kt
@@ -16,7 +16,7 @@
 
 package com.example.jetcaster
 
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.junit4.v2.createAndroidComposeRule
 import com.example.jetcaster.ui.JetcasterNavController.navigateToUpNext
 import org.junit.Assert.assertEquals
 import org.junit.Rule
diff --git a/Jetchat/app/src/androidTest/java/com/example/compose/jetchat/ConversationTest.kt b/Jetchat/app/src/androidTest/java/com/example/compose/jetchat/ConversationTest.kt
index f30aa1c9bc..617a4bd295 100644
--- a/Jetchat/app/src/androidTest/java/com/example/compose/jetchat/ConversationTest.kt
+++ b/Jetchat/app/src/androidTest/java/com/example/compose/jetchat/ConversationTest.kt
@@ -19,7 +19,7 @@ package com.example.compose.jetchat
 import androidx.activity.ComponentActivity
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.test.assertIsDisplayed
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.junit4.v2.createAndroidComposeRule
 import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText
diff --git a/Jetchat/app/src/androidTest/java/com/example/compose/jetchat/NavigationTest.kt b/Jetchat/app/src/androidTest/java/com/example/compose/jetchat/NavigationTest.kt
index 6cfc7c5827..be0f3b14b5 100644
--- a/Jetchat/app/src/androidTest/java/com/example/compose/jetchat/NavigationTest.kt
+++ b/Jetchat/app/src/androidTest/java/com/example/compose/jetchat/NavigationTest.kt
@@ -21,7 +21,7 @@ import androidx.compose.ui.test.SemanticsMatcher
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.hasAnyAncestor
 import androidx.compose.ui.test.hasText
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.junit4.v2.createAndroidComposeRule
 import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
diff --git a/Jetchat/app/src/androidTest/java/com/example/compose/jetchat/UserInputTest.kt b/Jetchat/app/src/androidTest/java/com/example/compose/jetchat/UserInputTest.kt
index 8dc43e9d6a..4c5865190a 100644
--- a/Jetchat/app/src/androidTest/java/com/example/compose/jetchat/UserInputTest.kt
+++ b/Jetchat/app/src/androidTest/java/com/example/compose/jetchat/UserInputTest.kt
@@ -25,7 +25,7 @@ import androidx.compose.ui.test.assertIsNotEnabled
 import androidx.compose.ui.test.hasAnyAncestor
 import androidx.compose.ui.test.hasContentDescription
 import androidx.compose.ui.test.hasSetTextAction
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.junit4.v2.createAndroidComposeRule
 import androidx.compose.ui.test.onAllNodesWithContentDescription
 import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithText
diff --git a/Jetchat/gradle/libs.versions.toml b/Jetchat/gradle/libs.versions.toml
index 07831faa3c..39d3731c2c 100644
--- a/Jetchat/gradle/libs.versions.toml
+++ b/Jetchat/gradle/libs.versions.toml
@@ -4,19 +4,19 @@
 #####
 [versions]
 accompanist = "0.37.3"
-android-material3 = "1.14.0-alpha09"
-androidGradlePlugin = "9.0.1"
+android-material3 = "1.14.0-beta01"
+androidGradlePlugin = "9.2.0"
 androidx-activity-compose = "1.13.0"
 androidx-appcompat = "1.7.1"
-androidx-compose-bom = "2026.03.00"
+androidx-compose-bom = "2026.04.01"
 androidx-constraintlayout = "1.1.1"
 androidx-core-splashscreen = "1.2.0"
-androidx-corektx = "1.17.0"
+androidx-corektx = "1.18.0"
 androidx-glance = "1.1.1"
-androidx-lifecycle = "2.8.2"
+androidx-lifecycle = "2.10.0"
 androidx-lifecycle-compose = "2.10.0"
 androidx-lifecycle-runtime-compose = "2.10.0"
-androidx-navigation = "2.9.7"
+androidx-navigation = "2.9.8"
 androidx-palette = "1.0.0"
 androidx-test = "1.7.0"
 androidx-test-espresso = "3.7.0"
diff --git a/Jetchat/gradle/wrapper/gradle-wrapper.properties b/Jetchat/gradle/wrapper/gradle-wrapper.properties
index e2e4d002fe..89e6633ddd 100644
--- a/Jetchat/gradle/wrapper/gradle-wrapper.properties
+++ b/Jetchat/gradle/wrapper/gradle-wrapper.properties
@@ -15,6 +15,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/Jetsnack/app/src/androidTest/java/com/example/jetsnack/AppTest.kt b/Jetsnack/app/src/androidTest/java/com/example/jetsnack/AppTest.kt
index 646a3d6a4f..ba224672f9 100644
--- a/Jetsnack/app/src/androidTest/java/com/example/jetsnack/AppTest.kt
+++ b/Jetsnack/app/src/androidTest/java/com/example/jetsnack/AppTest.kt
@@ -17,7 +17,7 @@
 package com.example.jetsnack
 
 import androidx.compose.ui.test.assertIsDisplayed
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.junit4.v2.createAndroidComposeRule
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import com.example.jetsnack.ui.MainActivity
diff --git a/Jetsnack/gradle/libs.versions.toml b/Jetsnack/gradle/libs.versions.toml
index 4eee128ede..0c39f970f7 100644
--- a/Jetsnack/gradle/libs.versions.toml
+++ b/Jetsnack/gradle/libs.versions.toml
@@ -1,17 +1,17 @@
 [versions]
 accompanist = "0.37.3"
-android-material3 = "1.14.0-alpha09"
-androidGradlePlugin = "9.0.1"
+android-material3 = "1.14.0-beta01"
+androidGradlePlugin = "9.2.0"
 androidx-activity-compose = "1.13.0"
 androidx-appcompat = "1.7.1"
-androidx-compose-bom = "2026.03.00"
+androidx-compose-bom = "2026.04.01"
 androidx-core-splashscreen = "1.2.0"
-androidx-corektx = "1.17.0"
+androidx-corektx = "1.18.0"
 androidx-glance = "1.2.0-rc01"
-androidx-lifecycle = "2.8.2"
+androidx-lifecycle = "2.10.0"
 androidx-lifecycle-compose = "2.10.0"
 androidx-lifecycle-runtime-compose = "2.10.0"
-androidx-navigation = "2.9.7"
+androidx-navigation = "2.9.8"
 androidx-palette = "1.0.0"
 androidx-test = "1.7.0"
 androidx-test-espresso = "3.7.0"
diff --git a/Jetsnack/gradle/wrapper/gradle-wrapper.properties b/Jetsnack/gradle/wrapper/gradle-wrapper.properties
index e2e4d002fe..89e6633ddd 100644
--- a/Jetsnack/gradle/wrapper/gradle-wrapper.properties
+++ b/Jetsnack/gradle/wrapper/gradle-wrapper.properties
@@ -15,6 +15,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/Reply/gradle/libs.versions.toml b/Reply/gradle/libs.versions.toml
index 07831faa3c..39d3731c2c 100644
--- a/Reply/gradle/libs.versions.toml
+++ b/Reply/gradle/libs.versions.toml
@@ -4,19 +4,19 @@
 #####
 [versions]
 accompanist = "0.37.3"
-android-material3 = "1.14.0-alpha09"
-androidGradlePlugin = "9.0.1"
+android-material3 = "1.14.0-beta01"
+androidGradlePlugin = "9.2.0"
 androidx-activity-compose = "1.13.0"
 androidx-appcompat = "1.7.1"
-androidx-compose-bom = "2026.03.00"
+androidx-compose-bom = "2026.04.01"
 androidx-constraintlayout = "1.1.1"
 androidx-core-splashscreen = "1.2.0"
-androidx-corektx = "1.17.0"
+androidx-corektx = "1.18.0"
 androidx-glance = "1.1.1"
-androidx-lifecycle = "2.8.2"
+androidx-lifecycle = "2.10.0"
 androidx-lifecycle-compose = "2.10.0"
 androidx-lifecycle-runtime-compose = "2.10.0"
-androidx-navigation = "2.9.7"
+androidx-navigation = "2.9.8"
 androidx-palette = "1.0.0"
 androidx-test = "1.7.0"
 androidx-test-espresso = "3.7.0"
diff --git a/Reply/gradle/wrapper/gradle-wrapper.properties b/Reply/gradle/wrapper/gradle-wrapper.properties
index e2e4d002fe..89e6633ddd 100644
--- a/Reply/gradle/wrapper/gradle-wrapper.properties
+++ b/Reply/gradle/wrapper/gradle-wrapper.properties
@@ -15,6 +15,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists