diff --git a/compose/ui/ui-text/src/desktopMain/kotlin/androidx/compose/ui/text/platform/DesktopFont.desktop.kt b/compose/ui/ui-text/src/desktopMain/kotlin/androidx/compose/ui/text/platform/DesktopFont.desktop.kt index bb748200a0782..053577e3b92ea 100644 --- a/compose/ui/ui-text/src/desktopMain/kotlin/androidx/compose/ui/text/platform/DesktopFont.desktop.kt +++ b/compose/ui/ui-text/src/desktopMain/kotlin/androidx/compose/ui/text/platform/DesktopFont.desktop.kt @@ -27,6 +27,7 @@ import org.jetbrains.skia.Data import org.jetbrains.skia.FontMgr import org.jetbrains.skia.FontSlant import org.jetbrains.skia.FontStyle as SkFontStyle +import org.jetbrains.skia.FontWeight as SkFontWeight import org.jetbrains.skia.FontWidth import org.jetbrains.skia.Typeface as SkTypeface @@ -226,7 +227,7 @@ private fun typefaceResource(resourceName: String): SkTypeface { private val Font.skFontStyle: SkFontStyle get() = SkFontStyle( - weight = weight.weight, + weight = SkFontWeight(weight.weight), width = FontWidth.NORMAL, slant = if (style == FontStyle.Italic) FontSlant.ITALIC else FontSlant.UPRIGHT ) diff --git a/compose/ui/ui-text/src/desktopMain/kotlin/androidx/compose/ui/text/platform/JetBrainsRuntimeFontFamilies.kt b/compose/ui/ui-text/src/desktopMain/kotlin/androidx/compose/ui/text/platform/JetBrainsRuntimeFontFamilies.kt index 5cd9f04d5d406..1ec0952380593 100644 --- a/compose/ui/ui-text/src/desktopMain/kotlin/androidx/compose/ui/text/platform/JetBrainsRuntimeFontFamilies.kt +++ b/compose/ui/ui-text/src/desktopMain/kotlin/androidx/compose/ui/text/platform/JetBrainsRuntimeFontFamilies.kt @@ -101,7 +101,7 @@ internal object JetBrainsRuntimeFontFamilies { // We need to parse the typeface to extract its weight and style val typeface = FontMgr.default.makeFromFile(absolutePath) ?: error("makeFromFile $absolutePath failed") - val weight = FontWeight(typeface.fontStyle.weight) + val weight = FontWeight(typeface.fontStyle.weight.value) val style = when (typeface.fontStyle.slant) { FontSlant.UPRIGHT -> FontStyle.Normal FontSlant.ITALIC, FontSlant.OBLIQUE -> FontStyle.Italic diff --git a/compose/ui/ui-text/src/nativeMain/kotlin/androidx/compose/ui/text/platform/NativeFont.native.kt b/compose/ui/ui-text/src/nativeMain/kotlin/androidx/compose/ui/text/platform/NativeFont.native.kt index de2f48bced99a..784e85e6c7b2e 100644 --- a/compose/ui/ui-text/src/nativeMain/kotlin/androidx/compose/ui/text/platform/NativeFont.native.kt +++ b/compose/ui/ui-text/src/nativeMain/kotlin/androidx/compose/ui/text/platform/NativeFont.native.kt @@ -25,6 +25,7 @@ import kotlin.experimental.ExperimentalNativeApi import org.jetbrains.skia.Data import org.jetbrains.skia.FontMgr import org.jetbrains.skia.FontSlant +import org.jetbrains.skia.FontWeight import org.jetbrains.skia.FontWidth @OptIn(ExperimentalTextApi::class) @@ -45,7 +46,7 @@ internal actual fun loadTypeface(font: Font): SkTypeface { private val Font.skFontStyle: SkFontStyle get() = SkFontStyle( - weight = weight.weight, + weight = FontWeight(weight.weight), width = FontWidth.NORMAL, slant = if (style == FontStyle.Italic) FontSlant.ITALIC else FontSlant.UPRIGHT ) diff --git a/compose/ui/ui-text/src/webMain/kotlin/androidx/compose/ui/text/platform/WebFont.kt b/compose/ui/ui-text/src/webMain/kotlin/androidx/compose/ui/text/platform/WebFont.kt index 9a2d0360acf87..389f29511d7b0 100644 --- a/compose/ui/ui-text/src/webMain/kotlin/androidx/compose/ui/text/platform/WebFont.kt +++ b/compose/ui/ui-text/src/webMain/kotlin/androidx/compose/ui/text/platform/WebFont.kt @@ -22,6 +22,7 @@ import androidx.compose.ui.text.font.FontStyle import org.jetbrains.skia.Data import org.jetbrains.skia.FontMgr import org.jetbrains.skia.FontSlant +import org.jetbrains.skia.FontWeight import org.jetbrains.skia.FontWidth import org.jetbrains.skiko.OS import org.jetbrains.skiko.hostOs @@ -41,7 +42,7 @@ internal actual fun loadTypeface(font: Font): SkTypeface { private val Font.skFontStyle: SkFontStyle get() = SkFontStyle( - weight = weight.weight, + weight = FontWeight(weight.weight), width = FontWidth.NORMAL, slant = if (style == FontStyle.Italic) FontSlant.ITALIC else FontSlant.UPRIGHT ) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d943641927737..148905cc84c2e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -78,7 +78,7 @@ protobuf = "4.28.2" paparazzi = "1.0.0" paparazziNative = "2022.1.1-canary-f5f9f71" shadow = "8.1.1" -skiko = "0.150.0" +skiko = "0.151.0" spdxGradlePlugin = "0.6.0" sqldelight = "1.3.0" retrofit = "2.12.0"