Update library versions, including moving to the new stdlib Instant.

Author: pdvrieze

benchmark/build.gradle.kts

@@ -18,6 +18,8 @@
  * permissions and limitations under the License.
  */
 
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
+
 plugins {
     alias(libs.plugins.benchmark)
     kotlin("multiplatform")
@@ -31,6 +33,7 @@ plugins {
 
 config {
     generateJavaModules = false
+    kotlinApiVersion = KotlinVersion.KOTLIN_2_2
 }
 
 kotlin {

benchmark/src/jvmMain/kotlin/nl/adaptivity/xmlutil/benchmark/util/util.kt

@@ -22,17 +22,19 @@ package nl.adaptivity.xmlutil.benchmark.util
 
 import io.github.pdvrieze.formats.xmlschemaTests.io.github.pdvrieze.formats.xmlschemaTests.resolve
 import io.github.pdvrieze.formats.xmlschemaTests.io.github.pdvrieze.formats.xmlschemaTests.withXmlReader
-import kotlinx.datetime.Instant
 import nl.adaptivity.xmlutil.serialization.DefaultXmlSerializationPolicy
 import nl.adaptivity.xmlutil.serialization.XML
 import org.w3.xml.xmschematestsuite.TSTestSet
 import org.w3.xml.xmschematestsuite.TSTestSuite
 import org.w3.xml.xmschematestsuite.override.CompactOverride
 import org.w3.xml.xmschematestsuite.override.OTSSuite
 import java.net.URL
+import kotlin.time.ExperimentalTime
+import kotlin.time.Instant
 
 data class MeasureInfo(val round: Int, val rounds: Int, val warmups: Int)
 
+@OptIn(ExperimentalTime::class)
 inline fun measure(name:String, rounds: Int = 20, warmups: Int = 1, action: MeasureInfo.() -> Unit): Long {
     val initTime = System.currentTimeMillis()
     var startTime = initTime

core/base/src/jvmCommonMainModule/kotlin/module-info.java

@@ -11,7 +11,8 @@
             net.devrieze.xmlutil.serialization;
     exports nl.adaptivity.xmlutil.core.impl.multiplatform to
             io.github.pdvrieze.testutil, net.devrieze.xmlutil.serialization,
-            io.github.pdvrieze.xmlutil.xmlschema, net.devrieze.xmlutil.xmlserializable;
+            io.github.pdvrieze.xmlutil.xmlschema, net.devrieze.xmlutil.xmlserializable,
+            net.devrieze.xmlutil.serialization.kxio;
     exports nl.adaptivity.xmlutil.core.internal to
             net.devrieze.xmlutil.serialization, io.github.pdvrieze.xmlutil.xmlschema;
     exports nl.adaptivity.xmlutil.dom;

core/kxio/build.gradle.kts

@@ -40,7 +40,6 @@ base {
 
 config {
     dokkaModuleName = "core-io"
-    generateJavaModules = false // kotlinx.io has broken module info
 }
 
 

core/kxio/src/jvmMainModule/kotlin/module-info.java

@@ -2,5 +2,5 @@
     requires transitive net.devrieze.xmlutil.core;
     requires transitive kotlinx.io.core;
 
-    exports net.devrieze.xmlutil.serialization.kxio;
+    exports nl.adaptivity.xmlutil.core.kxio;
 }

gradle/libs.versions.toml

@@ -1,12 +1,12 @@
 [versions]
 apiVersion = "2.0"
-binaryValidator = "0.16.3" # 0.18.0
-dateTime = "0.6.1" # 0.7.0
+binaryValidator = "0.18.0"
+dateTime = "0.7.0"
 dokka = "2.0.0"
 javaVersion = "8"
 jmh = "0.7.2"
 jmh-core = "1.37"
-benchmark = "0.4.11" #0.4.14
+benchmark = "0.4.14"
 junit5-jupiter = "5.11.4"
 kotlin = "2.2.0"
 kotlinx-serialization = "1.8.1"

serialization-io/build.gradle.kts

@@ -36,9 +36,6 @@ plugins {
 
 val autoModuleName = "net.devrieze.xmlutil.serialization.kxio"
 
-config {
-    generateJavaModules = false
-}
 
 kotlin {
     explicitApi()

serialization-io/src/jvmMainModule/kotlin/module-info.java

@@ -1,6 +1,5 @@
 module net.devrieze.xmlutil.serialization.kxio {
     requires transitive net.devrieze.xmlutil.serialization;
-    requires transitive kotlinx.io.core;
     requires net.devrieze.xmlutil.core.kxio;
 
     exports net.devrieze.xmlutil.serialization.kxio;

serialization/src/jvmMainModule/kotlin/module-info.java

@@ -1,7 +1,7 @@
 module net.devrieze.xmlutil.serialization {
     requires transitive net.devrieze.xmlutil.core;
     requires transitive kotlinx.serialization.core;
-    requires java.xml;
+    requires transitive java.xml;
 
     exports nl.adaptivity.xmlutil.serialization;
     exports nl.adaptivity.xmlutil.serialization.structure;

xmlschema/build.gradle.kts

@@ -22,7 +22,6 @@
 
 import net.devrieze.gradle.ext.addNativeTargets
 import net.devrieze.gradle.ext.applyDefaultXmlUtilHierarchyTemplate
-import net.devrieze.gradle.ext.doPublish
 import net.devrieze.gradle.ext.envJvm
 import org.gradle.api.attributes.java.TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE
 import org.jetbrains.kotlin.gradle.dsl.JsMainFunctionExecutionMode
@@ -120,7 +119,7 @@ addNativeTargets(includeWasm = false, includeWasi = false)
 
 config {
     dokkaModuleName = "xmlschema"
-    kotlinApiVersion = KotlinVersion.KOTLIN_2_0
+    kotlinApiVersion = KotlinVersion.KOTLIN_2_2
 }
 
 idea {