diff --git a/buildSrc/src/main/kotlin/Libraries.kt b/buildSrc/src/main/kotlin/Libraries.kt index ce75dc9a0..cef7c0fcf 100644 --- a/buildSrc/src/main/kotlin/Libraries.kt +++ b/buildSrc/src/main/kotlin/Libraries.kt @@ -18,7 +18,7 @@ object Libraries { const val snakeYaml = "org.yaml:snakeyaml:$snakeyamlVersion" - const val korge = "com.soywiz.korlibs.korge2:korge:$korVersion" + const val korge = "com.soywiz.korge:korge:$korVersion" // TEST const val kotlinTestCommon = "org.jetbrains.kotlin:kotlin-test-common" diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index ee43469d1..cd5508b6a 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -4,7 +4,7 @@ object Versions { const val kotlinxCollectionsImmutableVersion = "0.3.4" const val cobaltVersion = "2023.0.0-RELEASE" - const val korVersion = "4.0.7" + const val korVersion = "5.3.0" const val snakeyamlVersion = "1.29" diff --git a/settings.gradle.kts b/settings.gradle.kts index d17037205..7b278718a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,4 +1,4 @@ -pluginManagement { repositories { mavenLocal(); mavenCentral(); google(); gradlePluginPortal() } } +pluginManagement { repositories { mavenLocal(); mavenCentral(); google(); gradlePluginPortal() } } rootProject.name = "zircon" diff --git a/zircon.core/src/commonMain/kotlin/org/hexworks/zircon/renderer/korge/tileset/KorgeTrueTypeFontTileset.kt b/zircon.core/src/commonMain/kotlin/org/hexworks/zircon/renderer/korge/tileset/KorgeTrueTypeFontTileset.kt index e5a50dfb1..d829821f0 100644 --- a/zircon.core/src/commonMain/kotlin/org/hexworks/zircon/renderer/korge/tileset/KorgeTrueTypeFontTileset.kt +++ b/zircon.core/src/commonMain/kotlin/org/hexworks/zircon/renderer/korge/tileset/KorgeTrueTypeFontTileset.kt @@ -104,7 +104,7 @@ class KorgeTrueTypeFontTileset( for (n in 0 until 256) { tiles += atlas.add( font.renderGlyphToBitmap( - 16f, + 16.0, CP437Utils.convertCp437toUnicode(n).code, Colors.WHITE ).bmp.toBMP32() diff --git a/zircon.examples/src/commonMain/kotlin/Components.kt b/zircon.examples/src/commonMain/kotlin/Components.kt index 257260fba..21f02116a 100644 --- a/zircon.examples/src/commonMain/kotlin/Components.kt +++ b/zircon.examples/src/commonMain/kotlin/Components.kt @@ -2,6 +2,7 @@ import korlibs.io.async.delay import korlibs.io.async.launch import korlibs.time.seconds import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.delay import org.hexworks.cobalt.databinding.api.extension.toProperty import org.hexworks.zircon.api.CP437TilesetResources import org.hexworks.zircon.api.ComponentDecorations