migrated to Kotlin 2.3.0

This reverts commit dd1a1544c6d49641783d221b15e23c7150010161.

.run/lyng_site [jsBrowserDevelopmentRun].run.xml

@@ -1,3 +1,20 @@
+<!--
+  ~ Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  -->
+
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="lyng:site [jsBrowserDevelopmentRun]" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
@@ -17,8 +34,11 @@
     </ExternalSystemSettings>
     <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <ExternalSystemDebugDisabled>false</ExternalSystemDebugDisabled>
     <DebugAllEnabled>false</DebugAllEnabled>
     <RunAsTest>false</RunAsTest>
+    <GradleProfilingDisabled>true</GradleProfilingDisabled>
+    <GradleCoverageDisabled>true</GradleCoverageDisabled>
     <method v="2" />
   </configuration>
 </component>

bin/deploy_site

@@ -101,7 +101,7 @@ die() { echo "ERROR: $*" 1>&2 ; exit 1; }
 # Update the IDEA plugin download link in docs (temporarily), then build, then restore the doc
 updateIdeaPluginDownloadLink || echo "WARN: proceeding without updating IDEA plugin download link"
 
-./gradlew site:clean site:jsBrowserDistribution
+./gradlew site:jsBrowserDistribution
 BUILD_RC=$?
 
 # Always restore original doc if backup exists

docs/migrate_time_to_2_2.md

@@ -0,0 +1,25 @@
+# Migration of Instant and Clock
+
+## History
+
+Before kotlin 2.0, there was an excellent library, kotlinx.datetime, which was widely used everywhere, also in Lyng and its dependencies.
+
+When kotlin 2.0 was released, or soon after, JetBrains made an exptic decision to remove `Instant` and `Clock` from kotlinx.datetime and replace it with _yet experimental_ analogs in `kotlin.time`.
+
+The problem is, these were not quite the same (these weren't `@Serializable`!), so people didn't migrate with ease. Okay, then JetBrains decided to not only deprecate it but also make them unusable on Apple targets. It sort of split auditories of many published libraries to those who hate JetBrains and Apple and continue to use 1.9-2.0 compatible versions that no longer work with Kotlin 2.2 on Apple targets (but work pretty well with earlier Kotlin or on other platforms). 
+
+Later JetBrains added serializers for their new `Instant` and `Clock` types, but strangely not in the stdlib, but in newer versions of `kotlinx.serialization`. This means that plain upgrade of dependencies to 2.2 is not enough to make them work.
+
+## Solution
+
+We hereby publish a new version of Lyng, 1.0.8-SNAPSHOT, which uses `ktlin.time.Instant` and `kotlin.time.Clock` instead of `kotlinx.datetime.Instant` and `kotlinx.datetime.Clock; it is in other aspects compatible also with Lynon encoded binaries. Still you might need to migrate your code to use `kotlinx.datetime` types.
+
+So, if you are getting errors with new version, plase do:
+
+- upgrade to Kotlin 2.2
+- upgrade to Lyng 1.0.8-SNAPSHOT
+- replace in your code imports (or other uses) of`kotlinx.datetime.Clock` to `kotlin.time.Clock` and `kotlinx.datetime.Instant` to `kotlin.time.Instant`.
+
+This should solve the problem and hopefully we'll see no more suh a brillant ideas from IDEA ideologspersons.
+
+Sorry for inconvenicence and send a ray of hate to JetBrains ;)

docs/tutorial.md

@@ -1379,9 +1379,9 @@ Part match:
 Typical set of String functions includes:
 
 | fun/prop             | description / notes                                        |
-|--------------------|------------------------------------------------------------|
+|----------------------|------------------------------------------------------------|
-| lower()            | change case to unicode upper                               |
+| lower(), lowercase() | change case to unicode upper                               |
-| upper()            | change case to unicode lower                               |
+| upper(), uppercase() | change case to unicode lower                               |
 | trim()               | trim space chars from both ends                            |
 | startsWith(prefix)   | true if starts with a prefix                               |
 | endsWith(prefix)     | true if ends with a prefix                                 |

gradle/libs.versions.toml

@@ -1,11 +1,11 @@
 [versions]
 agp = "8.5.2"
 clikt = "5.0.3"
-kotlin = "2.2.21"
+kotlin = "2.3.0"
 android-minSdk = "24"
 android-compileSdk = "34"
 kotlinx-coroutines = "1.10.2"
-mp_bintools = "0.1.12"
+mp_bintools = "0.3.2"
 firebaseCrashlyticsBuildtools = "3.0.3"
 okioVersion = "3.10.2"
 compiler = "3.2.0-alpha11"

lyngio/build.gradle.kts

@@ -38,7 +38,7 @@ kotlin {
         publishLibraryVariants("release")
         @OptIn(ExperimentalKotlinGradlePluginApi::class)
         compilerOptions {
-            jvmTarget.set(JvmTarget.JVM_11)
+            jvmTarget.set(JvmTarget.JVM_17)
         }
     }
     iosX64()
@@ -71,11 +71,7 @@ kotlin {
     sourceSets {
         all {
             languageSettings.optIn("kotlin.ExperimentalUnsignedTypes")
-//            languageSettings.optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
+            languageSettings.optIn("kotlin.time.ExperimentalTime")
-            // Correct opt-in markers for coroutines
-//            languageSettings.optIn("kotlinx.coroutines.DelicateCoroutinesApi")
-//            languageSettings.optIn("kotlin.contracts.ExperimentalContracts")
-//            languageSettings.optIn("kotlinx.coroutines.FlowPreview")
         }
         val commonMain by getting {
             dependencies {
@@ -115,8 +111,8 @@ android {
         minSdk = libs.versions.android.minSdk.get().toInt()
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_17
     }
     lint {
         // Prevent Android Lint from failing the build due to Kotlin toolchain

lyngio/src/commonMain/kotlin/net/sergeych/lyng/io/fs/LyngFsModule.kt

@@ -163,7 +163,7 @@ private suspend fun buildFsModule(module: ModuleScope, policy: FsAccessPolicy) {
             fsGuard {
                 val self = this.thisObj as ObjPath
                 val m = self.ensureMetadata()
-                m.createdAtMillis?.let { ObjInstant(kotlinx.datetime.Instant.fromEpochMilliseconds(it)) } ?: ObjNull
+                m.createdAtMillis?.let { ObjInstant(kotlin.time.Instant.fromEpochMilliseconds(it)) } ?: ObjNull
             }
         }
         // createdAtMillis(): Int? — milliseconds since epoch or null

lynglib/build.gradle.kts

@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 group = "net.sergeych"
-version = "1.0.7-SNAPSHOT"
+version = "1.0.8-SNAPSHOT"
 
 // Removed legacy buildscript classpath declarations; plugins are applied via the plugins DSL below
 
@@ -51,7 +51,7 @@ kotlin {
         publishLibraryVariants("release")
         @OptIn(ExperimentalKotlinGradlePluginApi::class)
         compilerOptions {
-            jvmTarget.set(JvmTarget.JVM_11)
+            jvmTarget.set(JvmTarget.JVM_17)
         }
     }
     iosX64()
@@ -89,16 +89,16 @@ kotlin {
             languageSettings.optIn("kotlinx.coroutines.DelicateCoroutinesApi")
             languageSettings.optIn("kotlin.contracts.ExperimentalContracts")
             languageSettings.optIn("kotlinx.coroutines.FlowPreview")
+            languageSettings.optIn("kotlin.time.ExperimentalTime")
         }
 
         val commonMain by getting {
             kotlin.srcDir("$buildDir/generated/buildConfig/commonMain/kotlin")
             dependencies {
-                implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.1")
+                implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0")
                 //put your multiplatform dependencies here
                 api(libs.kotlinx.coroutines.core)
                 api(libs.mp.bintools)
-                api("net.sergeych:mp_stools:1.5.2")
             }
         }
         val commonTest by getting {
@@ -116,6 +116,18 @@ kotlin {
     }
 }
 
+android {
+    namespace = "net.sergeych.lynglib"
+    compileSdk = libs.versions.android.compileSdk.get().toInt()
+    defaultConfig {
+        minSdk = libs.versions.android.minSdk.get().toInt()
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+}
+
 // ---- Build-time generation of stdlib text from .lyng files into a Kotlin constant ----
 // Implemented as a proper task type compatible with Gradle Configuration Cache
 

lynglib/src/commonMain/kotlin/net/sergeych/lyng/Scope.kt

@@ -428,13 +428,13 @@ open class Scope(
     }
 
     inline fun addVoidFn(vararg names: String, crossinline fn: suspend Scope.() -> Unit) {
-        addFn<ObjVoid>(*names) {
+        addFn(*names) {
             fn(this)
             ObjVoid
         }
     }
 
-    inline fun <reified T : Obj> addFn(vararg names: String, crossinline fn: suspend Scope.() -> T) {
+    fun addFn(vararg names: String, fn: suspend Scope.() -> Obj) {
         val newFn = object : Statement() {
             override val pos: Pos = Pos.builtIn
 
@@ -516,6 +516,23 @@ open class Scope(
 
     open fun applyClosure(closure: Scope): Scope = ClosureScope(this, closure)
 
+    /**
+     * Resolve and evaluate a qualified identifier exactly as compiled code would.
+     * For input like `A.B.C`, it builds the same ObjRef chain the compiler emits:
+     * `LocalVarRef("A", Pos.builtIn)` followed by `FieldRef` for each segment, then evaluates it.
+     * This mirrors `eval("A.B.C")` resolution semantics without invoking the compiler.
+     */
+    suspend fun resolveQualifiedIdentifier(qualifiedName: String): Obj {
+        val trimmed = qualifiedName.trim()
+        if (trimmed.isEmpty()) raiseSymbolNotFound("empty identifier")
+        val parts = trimmed.split('.')
+        var ref: ObjRef = LocalVarRef(parts[0], Pos.builtIn)
+        for (i in 1 until parts.size) {
+            ref = FieldRef(ref, parts[i], false)
+        }
+        return ref.evalValue(this)
+    }
+
     companion object {
 
         fun new(): Scope =

lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt

@@ -17,10 +17,6 @@
 
 package net.sergeych.lyng.obj
 
-import kotlinx.datetime.Clock
-import kotlinx.datetime.Instant
-import kotlinx.datetime.isDistantFuture
-import kotlinx.datetime.isDistantPast
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonPrimitive
 import net.sergeych.lyng.Scope
@@ -28,6 +24,10 @@ import net.sergeych.lynon.LynonDecoder
 import net.sergeych.lynon.LynonEncoder
 import net.sergeych.lynon.LynonSettings
 import net.sergeych.lynon.LynonType
+import kotlin.time.Clock
+import kotlin.time.Instant
+import kotlin.time.isDistantFuture
+import kotlin.time.isDistantPast
 
 class ObjInstant(val instant: Instant,val truncateMode: LynonSettings.InstantTruncateMode=LynonSettings.InstantTruncateMode.Microsecond) : Obj() {
     override val objClass: ObjClass get() = type

lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjString.kt

@@ -216,6 +216,14 @@ data class ObjString(val value: String) : Obj() {
             ) {
                 thisAs<ObjString>().value.lowercase().let(::ObjString)
             }
+            addFnDoc(
+                name = "lowercase",
+                doc = "Lowercase version of this string (default locale).",
+                returns = type("lyng.String"),
+                moduleName = "lyng.stdlib"
+            ) {
+                thisAs<ObjString>().value.lowercase().let(::ObjString)
+            }
             addFnDoc(
                 name = "upper",
                 doc = "Uppercase version of this string (default locale).",
@@ -224,6 +232,14 @@ data class ObjString(val value: String) : Obj() {
             ) {
                 thisAs<ObjString>().value.uppercase().let(::ObjString)
             }
+            addFnDoc(
+                name = "uppercase",
+                doc = "Uppercase version of this string (default locale).",
+                returns = type("lyng.String"),
+                moduleName = "lyng.stdlib"
+            ) {
+                thisAs<ObjString>().value.uppercase().let(::ObjString)
+            }
             addFnDoc(
                 name = "characters",
                 doc = "List of characters of this string.",

lynglib/src/commonMain/kotlin/net/sergeych/lynon/LynonDecoder.kt

@@ -83,15 +83,16 @@ open class LynonDecoder(val bin: BitInput, val settings: LynonSettings = LynonSe
                 scope.raiseClassCastError("Expected obj class but got ${it::class.simpleName}")
             it
         } ?: run {
-            val fallback = runCatching { scope.eval(className.value) }.getOrNull()
+            // Use Scope API that mirrors compiler-emitted ObjRef chain for qualified identifiers
-            if (fallback != null) {
+            val evaluated = scope.resolveQualifiedIdentifier(className.value)
-                println("Fallback to eval successful")
+            if (evaluated !is ObjClass)
-                fallback as ObjClass
+                scope.raiseClassCastError("Expected obj class but got ${evaluated::class.simpleName}")
-            }
+            evaluated
-            else scope.raiseSymbolNotFound("can't deserialize: not found type $className")
         }
     }
 
+    // helper moved to Scope as resolveQualifiedIdentifier
+
     suspend fun decodeAnyList(scope: Scope, fixedSize: Int? = null): MutableList<Obj> {
         return if (bin.getBit() == 1) {
             // homogenous

lynglib/src/commonMain/kotlin/net/sergeych/tools/bm.kt

@@ -17,7 +17,7 @@
 
 package net.sergeych.tools
 
-import kotlinx.datetime.Clock
+import kotlin.time.Clock
 
 inline fun bm(text: String="", f: ()->Unit) {
     val start = Clock.System.now()

lynglib/src/commonTest/kotlin/ScriptTest.kt

@@ -23,8 +23,6 @@ import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.test.runTest
 import kotlinx.coroutines.withContext
 import kotlinx.coroutines.withTimeout
-import kotlinx.datetime.Clock
-import kotlinx.datetime.Instant
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
@@ -36,7 +34,9 @@ import net.sergeych.lyng.pacman.InlineSourcesImportProvider
 import net.sergeych.mp_tools.globalDefer
 import net.sergeych.tools.bm
 import kotlin.test.*
+import kotlin.time.Clock
 import kotlin.time.Duration.Companion.seconds
+import kotlin.time.Instant
 
 /*
  * Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com

lynglib/src/jvmTest/kotlin/SamplesTest.kt

@@ -18,12 +18,12 @@
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
-import kotlinx.datetime.Clock
 import net.sergeych.lyng.Scope
 import java.nio.file.Files
 import java.nio.file.Paths
 import kotlin.io.path.extension
 import kotlin.test.Test
+import kotlin.time.Clock
 
 suspend fun executeSampleTests(fileName: String) {
     val sample = withContext(Dispatchers.IO) {

site/src/jsMain/kotlin/HomePage.kt

@@ -36,7 +36,7 @@ fun HomePage() {
                 // Benefits pills
                 listOf(
                     "Clean, familiar syntax",
-                    "Immutable-first collections",
+                    "both FP and OOP",
                     "Batteries-included standard library",
                     "Embeddable and testable"
                 ).forEach { b ->

site/src/jsMain/resources/index.html

@@ -329,7 +329,7 @@
 <!-- Top-left version ribbon -->
 <div class="corner-ribbon bg-danger text-white">
         <span style="margin-left: -5em">
-            v1.0.6-SNAPSHOT
+            v1.0.8-SNAPSHOT
         </span>
 </div>
 <!-- Fixed top navbar for the whole site -->