Add Material 1.5.0 alpha18, fix other build issues

dturner · dturner · commit c3150f0cb01e · 2026-05-01T15:07:36.000+01:00
diff --git a/JetLagged/build.gradle.kts b/JetLagged/build.gradle.kts
@@ -18,7 +18,6 @@ plugins {
     alias(libs.plugins.gradle.versions)
     alias(libs.plugins.version.catalog.update)
     alias(libs.plugins.android.application) apply false
-    alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.parcelize) apply false
     alias(libs.plugins.compose) apply false
     alias(libs.plugins.spotless) apply false
diff --git a/JetNews/build.gradle.kts b/JetNews/build.gradle.kts
@@ -18,7 +18,6 @@ plugins {
     alias(libs.plugins.gradle.versions)
     alias(libs.plugins.version.catalog.update)
     alias(libs.plugins.android.application) apply false
-    alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.parcelize) apply false
     alias(libs.plugins.compose) apply false
     alias(libs.plugins.spotless) apply false
diff --git a/Jetcaster/build.gradle.kts b/Jetcaster/build.gradle.kts
@@ -19,7 +19,6 @@ plugins {
     alias(libs.plugins.version.catalog.update)
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
-    alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.parcelize) apply false
     alias(libs.plugins.hilt) apply false
     alias(libs.plugins.ksp) apply false
diff --git a/Jetcaster/core/data-testing/build.gradle.kts b/Jetcaster/core/data-testing/build.gradle.kts
@@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
diff --git a/Jetcaster/core/data/build.gradle.kts b/Jetcaster/core/data/build.gradle.kts
@@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.ksp)
     alias(libs.plugins.hilt)
 }
diff --git a/Jetcaster/core/designsystem/build.gradle.kts b/Jetcaster/core/designsystem/build.gradle.kts
@@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.compose)
 }
 
diff --git a/Jetcaster/core/domain-testing/build.gradle.kts b/Jetcaster/core/domain-testing/build.gradle.kts
@@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
diff --git a/Jetcaster/core/domain/build.gradle.kts b/Jetcaster/core/domain/build.gradle.kts
@@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.ksp)
     alias(libs.plugins.hilt)
 }
diff --git a/Jetcaster/gradle/libs.versions.toml b/Jetcaster/gradle/libs.versions.toml
@@ -16,6 +16,7 @@ androidx-glance = "1.1.1"
 androidx-lifecycle = "2.8.2"
 androidx-lifecycle-compose = "2.10.0"
 androidx-lifecycle-runtime-compose = "2.10.0"
+androidx-material3 = "1.5.0-alpha18"
 androidx-navigation = "2.9.8"
 androidx-palette = "1.0.0"
 androidx-test = "1.7.0"
@@ -72,7 +73,7 @@ androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref =
 androidx-compose-foundation = { module = "androidx.compose.foundation:foundation" }
 androidx-compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout" }
 androidx-compose-material-iconsExtended = { module = "androidx.compose.material:material-icons-extended" }
-androidx-compose-material3 = { module = "androidx.compose.material3:material3" }
+androidx-compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "androidx-material3" }
 androidx-compose-material3-adaptive = { module = "androidx.compose.material3.adaptive:adaptive" }
 androidx-compose-material3-adaptive-layout = { module = "androidx.compose.material3.adaptive:adaptive-layout" }
 androidx-compose-material3-adaptive-navigation = { module = "androidx.compose.material3.adaptive:adaptive-navigation" }
diff --git a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/Home.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/Home.kt
@@ -440,7 +440,7 @@ private fun HomeScreen(
     }
 }
 
-@OptIn(ExperimentalMaterial3ExpressiveApi::class)
+@OptIn(ExperimentalMaterial3AdaptiveApi::class, ExperimentalMaterial3ExpressiveApi::class)
 @Composable
 fun PillToolbar(selectedHomeCategory: HomeCategory, onHomeAction: (HomeAction) -> Unit, modifier: Modifier = Modifier) {
     HorizontalFloatingToolbar(
diff --git a/Jetcaster/wear/build.gradle b/Jetcaster/wear/build.gradle
@@ -53,16 +53,16 @@ android {
             includeAndroidResources true
         }
     }
-    
-    kotlinOptions {
+
+    /*kotlinOptions {
         jvmTarget = JavaVersion.VERSION_17.majorVersion
         freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlin.RequiresOptIn"
         freeCompilerArgs = freeCompilerArgs + "-opt-in=com.google.android.horologist.annotations.ExperimentalHorologistApi"
-    }
+    }*/
     buildFeatures {
         compose true
     }
-    
+
     packagingOptions {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
diff --git a/Jetcaster/wear/src/main/java/com/example/jetcaster/WearApp.kt b/Jetcaster/wear/src/main/java/com/example/jetcaster/WearApp.kt
@@ -49,13 +49,15 @@ import com.example.jetcaster.ui.player.PlayerScreen
 import com.example.jetcaster.ui.podcast.PodcastDetailsScreen
 import com.example.jetcaster.ui.podcasts.PodcastsScreen
 import com.example.jetcaster.ui.queue.QueueScreen
+import com.google.android.horologist.annotations.ExperimentalHorologistApi
 import com.google.android.horologist.audio.ui.VolumeViewModel
 import com.google.android.horologist.audio.ui.material3.VolumeScreen
 import com.google.android.horologist.media.ui.material3.navigation.MediaNavController.navigateToPlayer
 import com.google.android.horologist.media.ui.material3.navigation.MediaNavController.navigateToVolume
 import com.google.android.horologist.media.ui.material3.navigation.NavigationScreens
 import com.google.android.horologist.media.ui.material3.screens.playerlibrarypager.PlayerLibraryPagerScreen
 
+@OptIn(ExperimentalHorologistApi::class)
 @Composable
 fun WearApp(navController: NavHostController) {
     val navHostState = rememberSwipeDismissableNavHostState()
diff --git a/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/episode/EpisodeScreen.kt b/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/episode/EpisodeScreen.kt
@@ -60,11 +60,12 @@ import com.example.jetcaster.core.player.model.toPlayerEpisode
 import com.example.jetcaster.designsystem.component.HtmlTextContainer
 import com.example.jetcaster.ui.components.MediumDateFormatter
 import com.example.jetcaster.ui.preview.WearPreviewEpisodes
+import com.google.android.horologist.annotations.ExperimentalHorologistApi
 import com.google.android.horologist.compose.layout.ColumnItemType
 import com.google.android.horologist.compose.layout.ScalingLazyColumnDefaults.listTextPadding
 import com.google.android.horologist.compose.layout.rememberResponsiveColumnPadding
 
-@OptIn(ExperimentalWearMaterialApi::class)
+@OptIn(ExperimentalWearMaterialApi::class, ExperimentalHorologistApi::class)
 @Composable
 fun EpisodeScreen(
     onPlayButtonClick: () -> Unit,
@@ -86,6 +87,7 @@ fun EpisodeScreen(
     )
 }
 
+@OptIn(ExperimentalHorologistApi::class)
 @Composable
 fun EpisodeScreen(
     uiState: EpisodeScreenState,
@@ -297,6 +299,7 @@ private fun TransformingLazyColumnScope.episodeInfoContent(episode: PlayerEpisod
     }
 }
 
+@OptIn(ExperimentalHorologistApi::class)
 @WearPreviewDevices
 @WearPreviewFontScales
 @Composable
diff --git a/Jetchat/build.gradle.kts b/Jetchat/build.gradle.kts
@@ -18,7 +18,6 @@ plugins {
     alias(libs.plugins.gradle.versions)
     alias(libs.plugins.version.catalog.update)
     alias(libs.plugins.android.application) apply false
-    alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.parcelize) apply false
     alias(libs.plugins.compose) apply false
     alias(libs.plugins.spotless) apply false
diff --git a/Jetsnack/build.gradle.kts b/Jetsnack/build.gradle.kts
@@ -18,7 +18,6 @@ plugins {
     alias(libs.plugins.gradle.versions)
     alias(libs.plugins.version.catalog.update)
     alias(libs.plugins.android.application) apply false
-    alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.parcelize) apply false
     alias(libs.plugins.compose) apply false
     alias(libs.plugins.spotless) apply false
diff --git a/Reply/build.gradle.kts b/Reply/build.gradle.kts
@@ -18,7 +18,6 @@ plugins {
     alias(libs.plugins.gradle.versions)
     alias(libs.plugins.version.catalog.update)
     alias(libs.plugins.android.application) apply false
-    alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.parcelize) apply false
     alias(libs.plugins.compose) apply false
     alias(libs.plugins.spotless) apply false

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget`
`19`	`19`
`20`	`20`	`plugins {`
`21`	`21`	`alias(libs.plugins.android.library)`
`22`		`- alias(libs.plugins.kotlin.android)`
`23`	`22`	`}`
`24`	`23`
`25`	`24`	`android {`
Original file line number	Diff line number	Diff line change
`@@ -440,7 +440,7 @@ private fun HomeScreen(`
`440`	`440`	`}`
`441`	`441`	`}`
`442`	`442`
`443`		`-@OptIn(ExperimentalMaterial3ExpressiveApi::class)`
	`443`	`+@OptIn(ExperimentalMaterial3AdaptiveApi::class, ExperimentalMaterial3ExpressiveApi::class)`
`444`	`444`	`@Composable`
`445`	`445`	`fun PillToolbar(selectedHomeCategory: HomeCategory, onHomeAction: (HomeAction) -> Unit, modifier: Modifier = Modifier) {`
`446`	`446`	`HorizontalFloatingToolbar(`