chore: upgrade compose to 1.6.0

alvr · Feb 27, 2024 · a5bc9e0 · a5bc9e0
1 parent ac2d091
commit a5bc9e0
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 9 deletions.
diff --git a/...katana-convention/src/main/kotlin/dev/alvr/katana/buildlogic/common/KatanaCommonPlugin.kt b/...katana-convention/src/main/kotlin/dev/alvr/katana/buildlogic/common/KatanaCommonPlugin.kt
@@ -1,5 +1,7 @@
 package dev.alvr.katana.buildlogic.common
 
+import dev.alvr.katana.buildlogic.KatanaConfiguration
+import dev.alvr.katana.buildlogic.fullPackageName
 import dev.alvr.katana.buildlogic.isRelease
 import org.gradle.api.Plugin
 import org.gradle.api.Project
@@ -16,6 +18,11 @@ internal class KatanaCommonPlugin : Plugin<Project> {
         with(target) {
             apply(plugin = "com.louiscad.complete-kotlin")
 
+            subprojects {
+                group = fullPackageName
+                version = KatanaConfiguration.VersionCode
+            }
+
             with(tasks) {
                 register<Delete>("clean") {
                     allprojects { delete(layout.buildDirectory.asFile.get()) }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ apollo = "3.8.2"
 arrow = "1.2.2"
 buildconfig = "5.3.5"
 complete-kotlin = "1.1.0"
-compose = "1.6.0-beta01"
+compose = "1.6.0"
 compose-compiler = "1.5.8.1"
 datastore = "1.1.0-beta01"
 destinations = "1.10.1"

diff --git a/ui/base/src/commonMain/kotlin/dev/alvr/katana/ui/base/components/KatanaSearchTopAppBar.kt b/ui/base/src/commonMain/kotlin/dev/alvr/katana/ui/base/components/KatanaSearchTopAppBar.kt
@@ -28,10 +28,8 @@ import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.text.input.ImeAction
 import dev.alvr.katana.common.core.empty
 import dev.alvr.katana.ui.base.strings.LocalBaseStrings
-import org.jetbrains.compose.resources.ExperimentalResourceApi
 
 @Composable
-@OptIn(ExperimentalResourceApi::class)
 fun KatanaSearchTopAppBar(
     searchPlaceholder: String,
     onValueChange: (String) -> Unit,

diff --git a/ui/base/src/commonMain/kotlin/dev/alvr/katana/ui/base/design/typography.kt b/ui/base/src/commonMain/kotlin/dev/alvr/katana/ui/base/design/typography.kt
@@ -5,7 +5,11 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontWeight
-import katana.ui.base.generated.resources.Res
+import dev.alvr.katana.ui.base.base.generated.resources.Res
+import dev.alvr.katana.ui.base.base.generated.resources.barlow_bold
+import dev.alvr.katana.ui.base.base.generated.resources.barlow_light
+import dev.alvr.katana.ui.base.base.generated.resources.barlow_medium
+import dev.alvr.katana.ui.base.base.generated.resources.barlow_normal
 import org.jetbrains.compose.resources.ExperimentalResourceApi
 import org.jetbrains.compose.resources.Font
 

diff --git a/ui/lists/src/androidMain/kotlin/dev/alvr/katana/ui/lists/view/components/ChangeList.kt b/ui/lists/src/androidMain/kotlin/dev/alvr/katana/ui/lists/view/components/ChangeList.kt
@@ -67,7 +67,6 @@ internal fun ChangeListSheet(
 }
 
 @Composable
-@OptIn(ExperimentalResourceApi::class)
 internal fun ChangeListButton(
     visible: Boolean,
     onClick: () -> Unit,

diff --git a/ui/lists/src/commonMain/kotlin/dev/alvr/katana/ui/lists/view/components/MediaList.kt b/ui/lists/src/commonMain/kotlin/dev/alvr/katana/ui/lists/view/components/MediaList.kt
@@ -50,11 +50,12 @@ import dev.alvr.katana.common.core.zero
 import dev.alvr.katana.ui.base.components.KatanaPullRefresh
 import dev.alvr.katana.ui.base.modifiers.katanaPlaceholder
 import dev.alvr.katana.ui.lists.entities.MediaListItem
+import dev.alvr.katana.ui.lists.lists.generated.resources.Res
+import dev.alvr.katana.ui.lists.lists.generated.resources.default_cover
 import dev.alvr.katana.ui.lists.strings.LocalListsStrings
 import dev.alvr.katana.ui.lists.viewmodel.ListState
 import io.kamel.image.KamelImage
 import io.kamel.image.asyncPainterResource
-import katana.ui.lists.generated.resources.Res
 import kotlinx.collections.immutable.ImmutableList
 import org.jetbrains.compose.resources.ExperimentalResourceApi
 import org.jetbrains.compose.resources.painterResource
@@ -391,7 +392,7 @@ private fun Progress(
     }
 
     LinearProgressIndicator(
-        progress = currentProgress,
+        progress = { currentProgress },
         modifier = modifier,
     )
 }

diff --git a/ui/login/src/androidMain/kotlin/dev/alvr/katana/ui/login/view/LoginScreen.kt b/ui/login/src/androidMain/kotlin/dev/alvr/katana/ui/login/view/LoginScreen.kt
@@ -77,11 +77,16 @@ import dev.alvr.katana.ui.login.HEADER_ANIMATION_DURATION
 import dev.alvr.katana.ui.login.LOGIN_DEEP_LINK
 import dev.alvr.katana.ui.login.LOGO_FULL_SIZE
 import dev.alvr.katana.ui.login.LOGO_RESIZED
+import dev.alvr.katana.ui.login.login.generated.resources.Res
+import dev.alvr.katana.ui.login.login.generated.resources.background_chihiro
+import dev.alvr.katana.ui.login.login.generated.resources.background_howl
+import dev.alvr.katana.ui.login.login.generated.resources.background_mononoke
+import dev.alvr.katana.ui.login.login.generated.resources.background_totoro
+import dev.alvr.katana.ui.login.login.generated.resources.ic_katana_logo
 import dev.alvr.katana.ui.login.navigation.LoginNavigator
 import dev.alvr.katana.ui.login.strings.LocalLoginStrings
 import dev.alvr.katana.ui.login.viewmodel.LoginState
 import dev.alvr.katana.ui.login.viewmodel.LoginViewModel
-import katana.ui.login.generated.resources.Res
 import org.jetbrains.compose.resources.ExperimentalResourceApi
 import org.jetbrains.compose.resources.painterResource
 import org.koin.androidx.compose.koinViewModel
@@ -256,7 +261,6 @@ private fun GetStartedDescription() {
 }
 
 @Composable
-@OptIn(ExperimentalResourceApi::class)
 private fun GetStartedButton(onStartedClick: (State) -> Unit) {
     val inlineArrow = "inlineArrowContent"
     val text = buildAnnotatedString {