Merge pull request #337 from ProjectMapK/develop

Release 2025-05-04 16:16:54 +0000

Author: k163377

.github/workflows/lint-and-test-dev.yml

@@ -45,7 +45,7 @@ jobs:
       - name: Set up java
         uses: actions/setup-java@v4
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'corretto'
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4

.github/workflows/test-main.yml

@@ -40,9 +40,9 @@ jobs:
       fail-fast: false
       matrix:
         # LTS versions, latest version (if exists)
-        java-version: [ '8', '11', '17', '21', '23' ]
+        java-version: [ '17', '21', '24' ]
         # Minimum version, latest release version, latest pre-release version (if exists)
-        kotlin: ['2.0.21', '2.1.20']
+        kotlin: ['2.0.21', '2.1.20', '2.2.0-Beta2']
     env:
       KOTLIN_VERSION: ${{ matrix.kotlin }}
     name: "Kotlin ${{ matrix.kotlin }} - Java ${{ matrix.java-version }}"

.idea/misc.xml

@@ -1,5 +1,11 @@
 jackson-module-kogera
 ====
+
+Since `beta-23`, newer versions of `Kotlin` and `Java` than the original have been used to validate changes for `Jackson 3.x`.  
+See #Compatibility for details.
+
+---
+
 `jackson-module-kogera` is an experimental project to develop `jackson-module-kotlin`.  
 This project has the following features compared to `jackson-module-kotlin`.
 
@@ -31,7 +37,7 @@ Details are summarized in [KogeraSpecificImplementations](./docs/KogeraSpecificI
 
 # Compatibility
 - `jackson 2.19.x`
-- `Java 8+`
+- `Java 17+`
 - `Kotlin 2.0.21+`
 
 ## About compatibility checks

README.md

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     `maven-publish` // for JitPack
 
@@ -16,7 +18,7 @@ val jacksonVersion = libs.versions.jackson.get()
 val generatedSrcPath = "${layout.buildDirectory.get()}/generated/kotlin"
 
 group = groupStr
-version = "${jacksonVersion}-beta22"
+version = "${jacksonVersion}-beta23"
 
 repositories {
     mavenCentral()
@@ -53,8 +55,8 @@ kotlin {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 tasks {
@@ -96,11 +98,11 @@ public val kogeraVersion: Version = VersionUtil.parseVersion("$version", "$group
 
     compileKotlin {
         dependsOn.add(generateKogeraVersion)
-        kotlinOptions.jvmTarget = "1.8"
+        compilerOptions.jvmTarget.set(JvmTarget.JVM_17)
     }
 
     compileTestKotlin {
-        kotlinOptions.jvmTarget = "1.8"
+        compilerOptions.jvmTarget.set(JvmTarget.JVM_17)
     }
 
     test {

build.gradle.kts

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME