From b83de7e5693c36583c1a75b77c316e8e0053263a Mon Sep 17 00:00:00 2001 From: Konstantin Tskhovrebov Date: Wed, 14 Feb 2024 20:49:18 +0100 Subject: [PATCH] Update compose version to "1.6.0-rc01" in components project --- components/gradle.properties | 2 +- .../org/jetbrains/compose/resources/demo/shared/FontRes.kt | 5 +++-- .../org/jetbrains/compose/resources/demo/shared/ImagesRes.kt | 1 + .../org/jetbrains/compose/resources/demo/shared/StringRes.kt | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/components/gradle.properties b/components/gradle.properties index bc747d85a8..7947a88d73 100644 --- a/components/gradle.properties +++ b/components/gradle.properties @@ -8,7 +8,7 @@ android.useAndroidX=true #Versions kotlin.version=1.9.22 -compose.version=1.6.0-dev1397 +compose.version=1.6.0-rc01 agp.version=8.1.2 #Compose diff --git a/components/resources/demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/FontRes.kt b/components/resources/demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/FontRes.kt index 49d39b7a19..99b2c666bf 100644 --- a/components/resources/demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/FontRes.kt +++ b/components/resources/demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/FontRes.kt @@ -14,6 +14,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.unit.dp import components.resources.demo.shared.generated.resources.Res +import components.resources.demo.shared.generated.resources.* import org.jetbrains.compose.resources.Font @Composable @@ -31,7 +32,7 @@ fun FontRes(paddingValues: PaddingValues) { text = """ Text( modifier = Modifier.padding(16.dp), - fontFamily = FontFamily(Font(Res.font.workbench_regular)), + fontFamily = FontFamily(Font(Res.font.Workbench_Regular)), style = MaterialTheme.typography.headlineLarge, text = "brown fox jumps over the lazy dog" ) @@ -71,7 +72,7 @@ fun FontRes(paddingValues: PaddingValues) { modifier = Modifier.padding(16.dp), fontFamily = FontFamily(Font(Res.font.font_awesome)), style = MaterialTheme.typography.headlineLarge, - text ="\uf1ba \uf238 \uf21a \uf1bb \uf1b8 \uf09b \uf269 \uf1d0 \uf15a \uf293 \uf1c6" + text = "\uf1ba \uf238 \uf21a \uf1bb \uf1b8 \uf09b \uf269 \uf1d0 \uf15a \uf293 \uf1c6" ) } } \ No newline at end of file diff --git a/components/resources/demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/ImagesRes.kt b/components/resources/demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/ImagesRes.kt index 3ba6cd0211..fb05488b8e 100644 --- a/components/resources/demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/ImagesRes.kt +++ b/components/resources/demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/ImagesRes.kt @@ -12,6 +12,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import components.resources.demo.shared.generated.resources.Res +import components.resources.demo.shared.generated.resources.* import org.jetbrains.compose.resources.imageResource import org.jetbrains.compose.resources.vectorResource import org.jetbrains.compose.resources.painterResource diff --git a/components/resources/demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/StringRes.kt b/components/resources/demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/StringRes.kt index 08aef674b6..b5b983b28b 100644 --- a/components/resources/demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/StringRes.kt +++ b/components/resources/demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/StringRes.kt @@ -9,6 +9,7 @@ import androidx.compose.runtime.* import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import components.resources.demo.shared.generated.resources.Res +import components.resources.demo.shared.generated.resources.* import org.jetbrains.compose.resources.stringArrayResource import org.jetbrains.compose.resources.stringResource