Updated Kotlin to 2.0.21, updated dependency versions

pwall567 · Feb 3, 2025 · b8e3c79 · b8e3c79
1 parent 17c1672
commit b8e3c79
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## [0.54] - 2025-02-03
+### Changed
+- `pom.xml`: updated Kotlin version to 2.0.21, updated dependency versions
+
 ## [0.53] - 2025-01-15
 ### Changed
 - `Parser`: moved filter mechanism from companion object to instance

diff --git a/README.md b/README.md
@@ -1,10 +1,8 @@
-![Stop the war in Ukraine](https://pwall.net/ukraine1.png)
-
 # json-kotlin-schema
 
 [![Build Status](https://github.com/pwall567/json-kotlin-schema/actions/workflows/build.yml/badge.svg)](https://github.com/pwall567/json-kotlin-schema/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/net.pwall.json/json-kotlin-schema?label=Maven%20Central)](https://search.maven.org/search?q=g:%22net.pwall.json%22%20AND%20a:%22json-kotlin-schema%22)
 
 Kotlin implementation of JSON Schema (Draft-07)
@@ -276,25 +274,25 @@ More documentation to follow.
 
 ## Dependency Specification
 
-The latest version of the library is 0.53, and it may be obtained from the Maven Central repository.
+The latest version of the library is 0.54, and it may be obtained from the Maven Central repository.
 
 ### Maven
 ```xml
     <dependency>
       <groupId>net.pwall.json</groupId>
       <artifactId>json-kotlin-schema</artifactId>
-      <version>0.53</version>
+      <version>0.54</version>
     </dependency>
 ```
 ### Gradle
 ```groovy
-    implementation 'net.pwall.json:json-kotlin-schema:0.53'
+    implementation 'net.pwall.json:json-kotlin-schema:0.54'
 ```
 ### Gradle (kts)
 ```kotlin
-    implementation("net.pwall.json:json-kotlin-schema:0.53")
+    implementation("net.pwall.json:json-kotlin-schema:0.54")
 ```
 
 Peter Wall
 
-2025-01-15
+2025-02-03
diff --git a/pom.xml b/pom.xml
@@ -5,15 +5,15 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>net.pwall.json</groupId>
   <artifactId>json-kotlin-schema</artifactId>
-  <version>0.53</version>
+  <version>0.54</version>
   <name>Kotlin implementation of JSON Schema (Draft-07)</name>
   <packaging>jar</packaging>
   <url>https://github.com/pwall567/json-kotlin-schema</url>
 
   <parent>
     <groupId>net.pwall.maven</groupId>
     <artifactId>maven-kotlin</artifactId>
-    <version>7.0</version>
+    <version>8.0</version>
   </parent>
 
   <properties>
@@ -63,32 +63,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>io.kjson</groupId>
       <artifactId>kjson-yaml</artifactId>
-      <version>3.6</version>
+      <version>3.7</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.json</groupId>
+      <groupId>io.jstuff</groupId>
       <artifactId>json-validation</artifactId>
-      <version>2.1</version>
+      <version>4.0</version>
     </dependency>
     <dependency>
       <groupId>io.kjson</groupId>
       <artifactId>resource-loader</artifactId>
-      <version>6.0</version>
+      <version>6.1</version>
     </dependency>
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
@@ -101,13 +101,14 @@
     <dependency>
       <groupId>io.kjson</groupId>
       <artifactId>kjson</artifactId>
-      <version>9.3</version>
+      <version>9.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>io.kstuff</groupId>
       <artifactId>should-test</artifactId>
-      <version>4.3</version>
+      <version>4.4</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>

diff --git a/src/main/kotlin/net/pwall/json/schema/parser/Parser.kt b/src/main/kotlin/net/pwall/json/schema/parser/Parser.kt
@@ -51,6 +51,7 @@ import io.kjson.pointer.JSONPointer
 import io.kjson.pointer.existsIn
 import io.kjson.pointer.get
 import io.kjson.resource.ResourceLoader
+import io.kstuff.text.Wildcard
 
 import net.pwall.json.schema.JSONSchema
 import net.pwall.json.schema.JSONSchema.Companion.booleanSchema
@@ -80,7 +81,6 @@ import net.pwall.json.schema.validation.PropertiesValidator
 import net.pwall.json.schema.validation.StringValidator
 import net.pwall.json.schema.validation.TypeValidator
 import net.pwall.json.schema.validation.UniqueItemsValidator
-import net.pwall.text.Wildcard
 
 class Parser(var options: Options = Options(), uriResolver: ((URI) -> InputStream?)? = null) {
 

diff --git a/src/main/kotlin/net/pwall/json/schema/validation/FormatValidator.kt b/src/main/kotlin/net/pwall/json/schema/validation/FormatValidator.kt
@@ -36,7 +36,7 @@ import io.kjson.pointer.get
 
 import net.pwall.json.schema.JSONSchema
 import net.pwall.json.schema.output.BasicErrorEntry
-import net.pwall.json.validation.JSONValidation
+import io.jstuff.json.validation.JSONValidation
 
 class FormatValidator(
     uri: URI?,

diff --git a/src/main/kotlin/net/pwall/json/schema/validation/StringValidator.kt b/src/main/kotlin/net/pwall/json/schema/validation/StringValidator.kt
@@ -27,15 +27,16 @@ package net.pwall.json.schema.validation
 
 import java.net.URI
 
+import io.jstuff.pipeline.IntCounter
+import io.jstuff.pipeline.codec.UTF16_CodePoint
+
 import io.kjson.JSONString
 import io.kjson.JSONValue
 import io.kjson.pointer.JSONPointer
 import io.kjson.pointer.get
 
 import net.pwall.json.schema.JSONSchema
 import net.pwall.json.schema.output.BasicErrorEntry
-import net.pwall.pipeline.IntCounter
-import net.pwall.pipeline.codec.UTF16_CodePoint
 
 class StringValidator(uri: URI?, location: JSONPointer, val condition: ValidationType, val value: Int) :
         JSONSchema.Validator(uri, location) {

diff --git a/src/test/kotlin/net/pwall/json/schema/parser/ParserTest.kt b/src/test/kotlin/net/pwall/json/schema/parser/ParserTest.kt
@@ -43,6 +43,7 @@ import io.kstuff.test.shouldThrow
 import io.kjson.JSON
 import io.kjson.pointer.JSONPointer
 import io.kjson.resource.ResourceLoader
+import io.kstuff.text.Wildcard
 
 import net.pwall.json.schema.JSONSchema
 import net.pwall.json.schema.JSONSchemaException
@@ -52,7 +53,6 @@ import net.pwall.json.schema.subschema.RefSchema
 import net.pwall.json.schema.subschema.RequiredSchema
 import net.pwall.json.schema.validation.EnumValidator
 import net.pwall.json.schema.validation.TypeValidator
-import net.pwall.text.Wildcard
 
 class ParserTest {