Merge pull request #631 from baaahs/kotlin-2.0.21

Bump versions
baaahs · Nov 5, 2024 · 79dc09b · 79dc09b
2 parents 73c0b2a + c06a894
commit 79dc09b
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 19 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -9,7 +9,7 @@ jobs:
       # documented at https://circleci.com/docs/2.0/circleci-images/
       - image: cimg/openjdk:18.0.2-node
 
-    resource_class: medium+
+    resource_class: large
 
     working_directory: ~/repo
 

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -1,11 +1,11 @@
 object Versions {
-    const val kotlin = "2.0.20"
+    const val kotlin = "2.0.21"
     const val kotlinGradlePlugin = kotlin
     const val dokka = "1.7.10"
 
     const val lwjgl = "3.3.1"
 
-    const val kotlinWrappers = "1.0.0-pre.804"
+    const val kotlinWrappers = "1.0.0-pre.816"
 
     // Test:
     const val junit = "5.8.1"

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,16 +1,16 @@
 [versions]
-kotlin = "2.0.20"
-coroutines = "1.7.2"
-serializationRuntime = "1.5.1"
-koin = "3.1.3"
-ksp = "2.0.20-1.0.25"
+kotlin = "2.0.21"
+coroutines = "1.9.0"
+serializationRuntime = "1.6.3"
+koin = "3.5.3"
+ksp = "2.0.21-1.0.26"
 dokka = "1.7.10"
 kgl = "0.6.2"
 #jogl = "2.3.2"
 lwjgl = "3.3.1"
 
 # JVM:
-ktor = "2.3.2"
+ktor = "2.3.12"
 
 tarsosDsp = "2.5"
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock
@@ -126,10 +126,10 @@
     "@emotion/weak-memoize" "^0.4.0"
     stylis "4.2.0"
 
-"@emotion/css@^11.13.0":
-  version "11.13.0"
-  resolved "https://registry.yarnpkg.com/@emotion/css/-/css-11.13.0.tgz#3b44f008ce782dafa7cecff75b263af174d0c702"
-  integrity sha512-BUk99ylT+YHl+W/HN7nv1RCTkDYmKKqa1qbvM/qLSQEg61gipuBF5Hptk/2/ERmX2DCv0ccuFGhz9i0KSZOqPg==
+"@emotion/css@^11.13.4":
+  version "11.13.4"
+  resolved "https://registry.yarnpkg.com/@emotion/css/-/css-11.13.4.tgz#a5128e34a23f5e2c891970b8ec98a60c5a2395e1"
+  integrity sha512-CthbOD5EBw+iN0rfM96Tuv5kaZN4nxPyYDvGUs0bc7wZBBiU/0mse+l+0O9RshW2d+v5HH1cme+BAbLJ/3Folw==
   dependencies:
     "@emotion/babel-plugin" "^11.12.0"
     "@emotion/cache" "^11.13.0"

diff --git a/shared/src/commonMain/kotlin/baaahs/util/KoinLogger.kt b/shared/src/commonMain/kotlin/baaahs/util/KoinLogger.kt
@@ -5,16 +5,15 @@ import org.koin.core.logger.Level
 import org.koin.core.logger.Logger
 import org.koin.core.logger.MESSAGE
 
-class KoinLogger : Logger(
-    Level.ERROR // TODO: Koin 3.1.3 and Kotlin 1.6.0 fail on JVM unless duration logging is turned off.
-) {
+class KoinLogger : Logger() {
     @Suppress("RemoveRedundantQualifierName")
     private val logger = baaahs.util.Logger<Koin>()
 
-    override fun log(level: Level, msg: MESSAGE) {
+    override fun display(level: Level, msg: MESSAGE) {
         when (level) {
             Level.DEBUG -> logger.debug { msg }
             Level.INFO -> logger.info { msg }
+            Level.WARNING -> logger.warn { msg }
             Level.ERROR -> logger.error { msg }
             Level.NONE -> {}
         }

diff --git a/shared/src/commonTest/kotlin/baaahs/gl/shader/dialect/IsfShaderDialectSpec.kt b/shared/src/commonTest/kotlin/baaahs/gl/shader/dialect/IsfShaderDialectSpec.kt
@@ -185,7 +185,7 @@ object IsfShaderDialectSpec : Spek({
                 it("fails to validate") {
                     expect(shaderAnalysis.isValid).toBe(false)
                     expect(shaderAnalysis.errors).containsExactly(
-                        GlslError("Unexpected JSON token at offset 2: Expected quotation mark '\"', but had '\"' instead at path: \$\n" +
+                        GlslError("Unexpected JSON token at offset 7: Expected quotation mark '\"', but had ' ' instead at path: \$\n" +
                                 "JSON input: { \"DESC }", 1)
                     )
                 }