Bump kotlin to 2.4.20; as most implementations are eol... Also, as a side effect; values() will be deprecated for kotlin enums, use entries instead from 1.9 onwards

.github/workflows/gradle-plugin-tests.yaml

@@ -42,7 +42,7 @@ jobs:
         env:
           DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
         run: |
-          (cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew buildGoSdk) # using gradle-6.8.3 via wrapper
+          (cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew buildGoSdk) # using gradle-8.14.5 via wrapper
           (cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew openApiGenerate)
           (cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew buildDotnetSdk)
       - name: Setup Gradle

modules/openapi-generator/pom.xml

@@ -488,7 +488,7 @@
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-script-util</artifactId>
-            <version>${kotlin.version}</version>
+            <version>1.8.22</version>
             <scope>test</scope>
         </dependency>
         <dependency>

modules/openapi-generator/src/main/resources/codegen/kotlin/README.mustache

@@ -2,7 +2,7 @@
 
 ## Requirements
 
-* Gradle 5.x
+* Gradle 7.6.3
 * Java 8+
 
 ## Getting Started

modules/openapi-generator/src/main/resources/codegen/kotlin/build_gradle.mustache

@@ -1,8 +1,9 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
-    kotlin("jvm") version "1.3.41"
+    kotlin("jvm") version "2.4.20"
     id("com.github.johnrengelman.shadow") version("5.0.0")
 }
 
@@ -51,8 +52,10 @@ tasks.register<ShadowJar>("standalone") {
     manifest.attributes(mapOf("Main-Class" to "org.openapitools.codegen.OpenAPIGenerator"))
 }
 
-tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "1.8"
+tasks.withType<KotlinCompile>().configureEach {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_1_8)
+    }
 }
 
 tasks.wrapper {

modules/openapi-generator/src/main/resources/kotlin-client/README.mustache

@@ -21,11 +21,11 @@ For more information, please visit [{{{infoUrl}}}]({{{infoUrl}}})
 ## Requires
 
 {{#jvm}}
-* Kotlin 2.4.0
-* Gradle 8.14
+* Kotlin 2.4.20
+* Gradle 8.14.5
 {{/jvm}}
 {{#multiplatform}}
-* Kotlin 2.2.20
+* Kotlin 2.4.20
 {{/multiplatform}}
 
 ## Build

modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache

@@ -9,7 +9,7 @@ wrapper {
 {{/omitGradleWrapper}}
 
 buildscript {
-    ext.kotlin_version = '2.4.0'
+    ext.kotlin_version = '2.4.20'
     {{#jvm-ktor}}
     ext.ktor_version = '3.5.1'
     {{/jvm-ktor}}
@@ -179,7 +179,7 @@ dependencies {
     {{/useJackson3}}
     {{/jackson}}
     {{#kotlinx_serialization}}
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.11.0"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.12.0"
     {{/kotlinx_serialization}}
     {{#jvm-ktor}}
     implementation "io.ktor:ktor-client-core:$ktor_version"

modules/openapi-generator/src/main/resources/kotlin-client/gradle-wrapper.properties.mustache

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 {{#jvm-volley}}
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.5-all.zip
 {{/jvm-volley}}
 {{^jvm-volley}}
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.5-all.zip

modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-volley/README.mustache

@@ -150,11 +150,11 @@ class GsonRequest<T>(
 ## Requires
 
 {{#jvm}}
-* Kotlin 1.4.30
-* Gradle 6.8.3
+* Kotlin 2.4.20
+* Gradle 8.14.5
 {{/jvm}}
 {{#multiplatform}}
-* Kotlin 1.5.10
+* Kotlin 2.4.20
 {{/multiplatform}}
 
 ## Build

modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-volley/build.mustache

@@ -5,7 +5,7 @@ project.version = '{{artifactVersion}}'
 
 buildscript {
 
-    ext.kotlin_version = '1.5.20'
+    ext.kotlin_version = '2.4.20'
     ext.swagger_annotations_version = "1.6.2"
     ext.gson_version = "2.8.6"
     ext.volley_version = "1.2.0"
@@ -23,7 +23,7 @@ buildscript {
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.5.2'
         {{#useAndroidMavenGradlePlugin}}
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
         {{/useAndroidMavenGradlePlugin}}

modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/build.gradle.kts.mustache

@@ -1,16 +1,16 @@
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 
 plugins {
-    kotlin("multiplatform"){{^omitGradlePluginVersions}} version "2.4.0" // kotlin_version{{/omitGradlePluginVersions}}
-    kotlin("plugin.serialization"){{^omitGradlePluginVersions}} version "2.4.0" // kotlin_version{{/omitGradlePluginVersions}}
+    kotlin("multiplatform"){{^omitGradlePluginVersions}} version "2.4.20" // kotlin_version{{/omitGradlePluginVersions}}
+    kotlin("plugin.serialization"){{^omitGradlePluginVersions}} version "2.4.20" // kotlin_version{{/omitGradlePluginVersions}}
 }
 
 group = "{{groupId}}"
 version = "{{artifactVersion}}"
 
-val kotlin_version = "2.4.0"
+val kotlin_version = "2.4.20"
 val coroutines_version = "1.11.0"
-val serialization_version = "1.11.0"
+val serialization_version = "1.12.0"
 val ktor_version = "3.5.1"
 
 repositories {

modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.kts.mustache

@@ -1,6 +1,6 @@
 @Suppress("DSL_SCOPE_VIOLATION")
 plugins {
-    id("org.jetbrains.kotlin.jvm") version "2.0.21"
+    id("org.jetbrains.kotlin.jvm") version "2.4.20"
     //id("com.squareup.wire") version "5.2.1"
 }
 

modules/openapi-generator/src/main/resources/kotlin-server/README.mustache

@@ -2,8 +2,8 @@
 
 ## Requires
 
-* Kotlin 1.4.31
-* Gradle 6.8.2
+* Kotlin 2.4.20
+* Gradle 8.14.5
 
 ## Build
 

modules/openapi-generator/src/main/resources/kotlin-server/enum_class.mustache

@@ -20,7 +20,7 @@ enum class {{classname}}(val value: {{dataType}}) {
          * @throws IllegalArgumentException if no enum individual is associated with the [value] passed as parameter.
          */
         fun fromValue(value: {{{dataType}}}): {{classname}} =
-            values().firstOrNull { it.value == value } ?: throw IllegalArgumentException("No enum constant {{classname}}.$value")
+            entries.firstOrNull { it.value == value } ?: throw IllegalArgumentException("No enum constant {{classname}}.$value")
     }
 {{/delegatePattern}}
 }

modules/openapi-generator/src/main/resources/kotlin-server/libraries/javalin5/build.gradle.kts.mustache

@@ -1,7 +1,8 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.9.25"
+    kotlin("jvm") version "2.4.20"
 }
 
 group = "{{groupId}}"
@@ -12,8 +13,10 @@ repositories {
     mavenCentral()
 }
 
-tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "17"
+tasks.withType<KotlinCompile>().configureEach {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+    }
 }
 
 dependencies {

modules/openapi-generator/src/main/resources/kotlin-server/libraries/jaxrs-spec/build.gradle.mustache

@@ -1,13 +1,15 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 group "{{groupId}}"
 version "{{artifactVersion}}"
 
 wrapper {
-    gradleVersion = '7.3'
+    gradleVersion = '8.14.5'
     distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip"
 }
 
 buildscript {
-    ext.kotlin_version = "1.7.20"
+    ext.kotlin_version = "2.4.20"
     ext.swagger_annotations_version = "1.5.3"
 {{#useJakartaEe}}
     ext.jakarta_annotations_version = "2.1.1"
@@ -39,12 +41,12 @@ apply plugin: "application"
 
 sourceCompatibility = 11
 
-compileKotlin {
-    kotlinOptions.jvmTarget = "11"
+tasks.named("compileKotlin", org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
+    compilerOptions.jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
 }
 
-compileTestKotlin {
-    kotlinOptions.jvmTarget = "11"
+tasks.named("compileTestKotlin", org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
+    compilerOptions.jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
 }
 
 repositories {

modules/openapi-generator/src/main/resources/kotlin-server/libraries/jaxrs-spec/enum_class.mustache

@@ -57,7 +57,7 @@ import kotlinx.serialization.Serializable
         @OptIn(ExperimentalStdlibApi::class)
         fun decode(data: Any?): {{classname}}? = data?.let {
           val normalizedData = "$it".lowercase()
-          values().firstOrNull { value ->
+          entries.firstOrNull { value ->
             it == value || normalizedData == "$value".lowercase()
           }
         }

modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor/README.mustache

@@ -8,8 +8,8 @@ Generated by OpenAPI Generator {{generatorVersion}}{{^hideGenerationTimestamp}}
 
 ## Requires
 
-* Kotlin 2.0.20
-* Gradle 8.10.2
+* Kotlin 2.4.20
+* Gradle 8.14.5
 
 ## Build
 

modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor/build.gradle.kts.mustache

@@ -6,9 +6,9 @@ group = "{{groupId}}"
 version = "{{artifactVersion}}"
 
 plugins {
-    kotlin("jvm") version "2.3.0"
+    kotlin("jvm") version "2.4.20"
     id("io.ktor.plugin") version "3.4.0"
-    kotlin("plugin.serialization") version "2.3.0"
+    kotlin("plugin.serialization") version "2.4.20"
 }
 
 application {

modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor/gradle.properties

@@ -1,4 +1,4 @@
 kotlin.code.style=official
 ktor_version=3.4.0
-kotlin_version=2.3.0
+kotlin_version=2.4.20
 logback_version=1.5.19

modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor2/README.mustache

@@ -8,8 +8,8 @@ Generated by OpenAPI Generator {{generatorVersion}}{{^hideGenerationTimestamp}}
 
 ## Requires
 
-* Kotlin 2.0.20
-* Gradle 8.10.2
+* Kotlin 2.4.20
+* Gradle 8.14.5
 
 ## Build
 

modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor2/build.gradle.kts.mustache

@@ -6,7 +6,7 @@ group = "{{groupId}}"
 version = "{{artifactVersion}}"
 
 plugins {
-    kotlin("jvm") version "2.0.20"
+    kotlin("jvm") version "2.4.20"
     id("io.ktor.plugin") version "2.3.12"
 }
 

modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor2/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor2/gradle.properties

@@ -1,4 +1,4 @@
 kotlin.code.style=official
 ktor_version=2.3.12
-kotlin_version=2.0.20
+kotlin_version=2.4.20
 logback_version=1.5.19

modules/openapi-generator/src/main/resources/kotlin-spring/dataClass.mustache

@@ -83,7 +83,7 @@
             @JvmStatic
             @JsonCreator
             fun forValue(value: {{#isContainer}}{{#items}}{{{dataType}}}{{/items}}{{/isContainer}}{{^isContainer}}{{{dataType}}}{{/isContainer}}): {{{nameInPascalCase}}} {
-                return values().firstOrNull{ it.value == value }
+                return entries.firstOrNull{ it.value == value }
             {{#enumUnknownDefaultCase}}
             {{#allowableValues}}
             {{#enumVars}}

modules/openapi-generator/src/main/resources/kotlin-spring/enumClass.mustache

@@ -10,7 +10,7 @@ enum class {{classname}}(@get:JsonValue {{#useEnumValueInterface}}override {{/us
         @JvmStatic
         @JsonCreator
         fun forValue(value: {{dataType}}): {{classname}} {
-            return values().firstOrNull{ it.value == value }
+            return entries.firstOrNull{ it.value == value }
         {{#enumUnknownDefaultCase}}
         {{#allowableValues}}
         {{#enumVars}}

modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/buildGradle-sb3-Kts.mustache

@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 group = "{{groupId}}"
@@ -9,8 +10,10 @@ repositories {
     maven { url = uri("https://repo.spring.io/milestone") }
 }
 
-tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "17"
+tasks.withType<KotlinCompile>().configureEach {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+    }
 }
 
 {{#interfaceOnly}}
@@ -20,7 +23,7 @@ tasks.bootJar {
 
 {{/interfaceOnly}}
 plugins {
-    val kotlinVersion = "1.9.25"
+    val kotlinVersion = "2.4.20"
     id("org.jetbrains.kotlin.jvm") version kotlinVersion
     id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion
     id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion

modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/buildGradle-sb4-Kts.mustache

@@ -30,7 +30,7 @@ plugins {
 }
 
 dependencies {
-{{#reactive}}    val kotlinxCoroutinesVersion = "1.10.1"
+{{#reactive}}    val kotlinxCoroutinesVersion = "1.11.0"
 {{/reactive}}    implementation("org.jetbrains.kotlin:kotlin-stdlib")
     implementation("org.jetbrains.kotlin:kotlin-reflect"){{^reactive}}
         implementation("org.springframework.boot:spring-boot-starter-webmvc"){{/reactive}}{{#reactive}}