Updated Kotlin version to 2.0.21

pwall567 · Feb 1, 2025 · d20e1dc · d20e1dc
1 parent 611a959
commit d20e1dc
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 34 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## [3.7] - 2025-02-01
+### Changed
+- `pom.xml`: updated Kotlin version to 2.0.21, updated dependency version
+
 ## [3.6] - 2024-12-15
 ### Changed
 - `pom.xml`: updated dependency versions

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [![Build Status](https://github.com/pwall567/kjson-yaml/actions/workflows/build.yml/badge.svg)](https://github.com/pwall567/kjson-yaml/actions/workflows/build.yml)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
-[![Kotlin](https://img.shields.io/static/v1?label=Kotlin&message=v1.9.24&color=7f52ff&logo=kotlin&logoColor=7f52ff)](https://github.com/JetBrains/kotlin/releases/tag/v1.9.24)
+[![Kotlin](https://img.shields.io/static/v1?label=Kotlin&message=v2.0.21&color=7f52ff&logo=kotlin&logoColor=7f52ff)](https://github.com/JetBrains/kotlin/releases/tag/v2.0.21)
 [![Maven Central](https://img.shields.io/maven-central/v/io.kjson/kjson-yaml?label=Maven%20Central)](https://search.maven.org/search?q=g:%22io.kjson%22%20AND%20a:%22kjson-yaml%22)
 
 Kotlin YAML processor.
@@ -140,25 +140,25 @@ in the test section of this project.
 
 ## Dependency Specification
 
-The latest version of the library is 3.6, and it may be obtained from the Maven Central repository.
+The latest version of the library is 3.7, and it may be obtained from the Maven Central repository.
 
 ### Maven
 ```xml
     <dependency>
       <groupId>io.kjson</groupId>
       <artifactId>kjson-yaml</artifactId>
-      <version>3.6</version>
+      <version>3.7</version>
     </dependency>
 ```
 ### Gradle
 ```groovy
-    implementation 'io.kjson:kjson-yaml:3.6'
+    implementation 'io.kjson:kjson-yaml:3.7'
 ```
 ### Gradle (kts)
 ```kotlin
-    implementation("io.kjson:kjson-yaml:3.6")
+    implementation("io.kjson:kjson-yaml:3.7")
 ```
 
 Peter Wall
 
-2024-12-15
+2025-02-01
diff --git a/pom.xml b/pom.xml
@@ -4,15 +4,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>kjson-yaml</artifactId>
-  <version>3.6</version>
+  <version>3.7</version>
   <name>Kotlin YAML processor</name>
   <packaging>jar</packaging>
   <url>https://github.com/pwall567/kjson-yaml</url>
 
   <parent>
     <groupId>io.kjson</groupId>
     <artifactId>kjson-maven</artifactId>
-    <version>5.0</version>
+    <version>6.0</version>
   </parent>
 
   <properties>
@@ -62,32 +62,32 @@
     <dependency>
       <groupId>io.kjson</groupId>
       <artifactId>kjson-core</artifactId>
-      <version>9.2</version>
+      <version>10.0</version>
     </dependency>
     <dependency>
       <groupId>io.kjson</groupId>
       <artifactId>kjson-pointer</artifactId>
-      <version>8.6</version>
+      <version>8.7</version>
     </dependency>
     <dependency>
-      <groupId>net.pwall.text</groupId>
+      <groupId>io.jstuff</groupId>
       <artifactId>textmatcher</artifactId>
-      <version>2.4</version>
+      <version>3.0</version>
     </dependency>
     <dependency>
-      <groupId>net.pwall.text</groupId>
+      <groupId>io.kstuff</groupId>
       <artifactId>string-mapper</artifactId>
-      <version>2.3</version>
+      <version>3.1</version>
     </dependency>
     <dependency>
-      <groupId>net.pwall.util</groupId>
+      <groupId>io.jstuff</groupId>
       <artifactId>pipelines</artifactId>
-      <version>5.2</version>
+      <version>6.0</version>
     </dependency>
     <dependency>
-      <groupId>net.pwall.log</groupId>
+      <groupId>io.kstuff</groupId>
       <artifactId>log-front-kotlin</artifactId>
-      <version>5.3.1</version>
+      <version>6.0</version>
     </dependency>
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
@@ -100,7 +100,7 @@
     <dependency>
       <groupId>io.kstuff</groupId>
       <artifactId>should-test</artifactId>
-      <version>4.3</version>
+      <version>4.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -109,9 +109,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>net.pwall.json</groupId>
+      <groupId>io.jstuff</groupId>
       <artifactId>json-simple</artifactId>
-      <version>1.9</version>
+      <version>2.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/src/main/kotlin/io/kjson/yaml/parser/Line.kt b/src/main/kotlin/io/kjson/yaml/parser/Line.kt
@@ -25,7 +25,7 @@
 
 package io.kjson.yaml.parser
 
-import net.pwall.text.TextMatcher
+import io.jstuff.text.TextMatcher
 
 /**
  * An extension of [TextMatcher] to represent a YAML line.

diff --git a/src/main/kotlin/io/kjson/yaml/parser/Parser.kt b/src/main/kotlin/io/kjson/yaml/parser/Parser.kt
@@ -31,6 +31,13 @@ import java.io.Reader
 import java.math.BigDecimal
 import java.nio.charset.Charset
 
+import io.jstuff.text.TextMatcher
+import io.jstuff.pipeline.codec.DynamicReader
+import io.kstuff.log.getLogger
+import io.kstuff.text.StringMapper.buildResult
+import io.kstuff.text.StringMapper.fromHexDigit
+import io.kstuff.text.StringMapper.mapSubstrings
+
 import io.kjson.JSONArray
 import io.kjson.JSONBoolean
 import io.kjson.JSONDecimal
@@ -45,12 +52,6 @@ import io.kjson.yaml.YAML.intTag
 import io.kjson.yaml.YAML.strTag
 import io.kjson.yaml.YAML.tagPrefix
 import io.kjson.yaml.YAMLDocument
-import net.pwall.log.getLogger
-import net.pwall.pipeline.codec.DynamicReader
-import net.pwall.text.StringMapper.buildResult
-import net.pwall.text.StringMapper.fromHexDigit
-import net.pwall.text.StringMapper.mapSubstrings
-import net.pwall.text.TextMatcher
 
 /**
  * YAML Parser.

diff --git a/src/test/kotlin/io/kjson/yaml/parser/LoggingTest.kt b/src/test/kotlin/io/kjson/yaml/parser/LoggingTest.kt
@@ -29,10 +29,10 @@ import kotlin.test.Test
 
 import java.io.File
 
-import io.kstuff.test.shouldBe
+import io.jstuff.log.LogList
+import io.kstuff.log.isDebug
 
-import net.pwall.log.LogList
-import net.pwall.log.isDebug
+import io.kstuff.test.shouldBe
 
 class LoggingTest {
 

diff --git a/src/test/kotlin/io/kjson/yaml/parser/ParserTest.kt b/src/test/kotlin/io/kjson/yaml/parser/ParserTest.kt
@@ -37,6 +37,9 @@ import io.kstuff.test.shouldBeSameInstance
 import io.kstuff.test.shouldBeType
 import io.kstuff.test.shouldThrow
 
+import io.jstuff.json.JSONSimple
+import io.kstuff.log.getLogger
+
 import io.kjson.JSON.asArray
 import io.kjson.JSON.asDecimal
 import io.kjson.JSON.asInt
@@ -55,8 +58,6 @@ import io.kjson.yaml.YAML.intTag
 import io.kjson.yaml.YAML.seqTag
 import io.kjson.yaml.YAML.strTag
 import io.kjson.yaml.YAMLException
-import net.pwall.json.JSONSimple
-import net.pwall.log.getLogger
 
 class ParserTest {
 

diff --git a/src/test/kotlin/io/kjson/yaml/parser/SpecExampleTest.kt b/src/test/kotlin/io/kjson/yaml/parser/SpecExampleTest.kt
@@ -29,6 +29,8 @@ import kotlin.test.Test
 
 import java.io.File
 
+import io.kstuff.log.getLogger
+
 import io.kstuff.test.shouldBe
 import io.kstuff.test.shouldBeType
 import io.kstuff.test.shouldContainKey
@@ -42,7 +44,6 @@ import io.kjson.JSONString
 import io.kjson.pointer.JSONPointer
 import io.kjson.yaml.YAML.floatTag
 import io.kjson.yaml.YAML.strTag
-import net.pwall.log.getLogger
 
 class SpecExampleTest {