[kotlin-client] Update Gradle and dependencies (#18571)

* [kotlin] Target correct library in jvm-spring-webclient sample

* [kotlin] Fixed warning in jvm-spring-restclient

* [kotlin-client] Bump Gradle version

* [kotlin-client] enableFeaturePreview no longer needed as it's enabled by default

* [kotlin-client] Bump kotlin, spotless, and reactor versions

* [kotlin-client] Generated code

* [kotlin-client] Missed a generated sample

* [kotlin-client] Bumped gradle and java version in kotlin-client workflows

* [kotlin-client] First attempt to fix jvm-volley

* [kotlin-client] Use standard gradle action instead of custom one

* [kotlin-client] Use original gradlew action but without specific version

* [kotlin-client] Moved sample kotlin-spring-cloud to servers instead of clients

* [kotlin-client] Added previously missing generated file

* [kotlin-client] Corrected sample path

Author: stefankoppier

.github/workflows/samples-kotlin-client.yaml

@@ -10,9 +10,6 @@ on:
       - 'samples/client/petstore/kotlin*/**'
       - 'samples/client/others/kotlin-jvm-okhttp-parameter-tests/**'
 
-env:
-  GRADLE_VERSION: 6.9
-
 jobs:
   build:
     name: Build Kotlin client
@@ -65,15 +62,14 @@ jobs:
           - samples/client/echo_api/kotlin-jvm-spring-3-webclient
           - samples/client/petstore/kotlin-jvm-spring-3-restclient
           - samples/client/echo_api/kotlin-jvm-spring-3-restclient
-          - samples/client/petstore/kotlin-spring-cloud
           - samples/client/petstore/kotlin-name-parameter-mappings
           - samples/client/others/kotlin-jvm-okhttp-parameter-tests
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 8
+          java-version: 11
       - name: Cache maven dependencies
         uses: actions/cache@v4
         env:
@@ -85,7 +81,6 @@ jobs:
       - name: Install Gradle wrapper
         uses: eskatos/gradle-command-action@v3
         with:
-          gradle-version: ${{ env.GRADLE_VERSION }}
           build-root-directory: ${{ matrix.sample }}
           arguments: wrapper
       - name: Build

.github/workflows/samples-kotlin-echo-api.yaml

@@ -7,8 +7,7 @@ on:
   pull_request:
     paths:
       - samples/client/echo_api/kotlin**
-env:
-  GRADLE_VERSION: 7.4
+
 jobs:
   build:
     name: Build Kotlin Client JDK17
@@ -37,7 +36,6 @@ jobs:
       - name: Install Gradle wrapper
         uses: eskatos/gradle-command-action@v3
         with:
-          gradle-version: ${{ env.GRADLE_VERSION }}
           build-root-directory: ${{ matrix.sample }}
           arguments: wrapper
       - name: Setup node.js

.github/workflows/samples-kotlin-server.yaml

@@ -43,6 +43,7 @@ jobs:
           - samples/server/petstore/kotlin-server/javalin
           - samples/server/others/kotlin-server/jaxrs-spec
           - samples/server/others/kotlin-server/jaxrs-spec-array-response
+          - samples/server/petstore/kotlin-spring-cloud
           # comment out due to gradle build failure
           #- samples/server/petstore/kotlin-spring-default
           # no build.gradle file

bin/configs/kotlin-spring-cloud.yaml

@@ -1,5 +1,5 @@
 generatorName: kotlin-spring
-outputDir: samples/client/petstore/kotlin-spring-cloud
+outputDir: samples/server/petstore/kotlin-spring-cloud
 library: spring-cloud
 inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/kotlin-spring

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

@@ -3,13 +3,13 @@ version '{{artifactVersion}}'
 {{^omitGradleWrapper}}
 
 wrapper {
-    gradleVersion = '7.5'
+    gradleVersion = '8.7'
     distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip"
 }
 {{/omitGradleWrapper}}
 
 buildscript {
-    ext.kotlin_version = '1.8.10'
+    ext.kotlin_version = '1.9.23'
     {{#jvm-ktor}}
     ext.ktor_version = '2.3.9'
     {{/jvm-ktor}}
@@ -24,17 +24,13 @@ buildscript {
     {{/jvm-vertx}}
     {{#jvm-spring}}
     {{#useSpringBoot3}}
-    ext.spring_boot_version = "3.2.4"
+    ext.spring_boot_version = "3.2.5"
     {{/useSpringBoot3}}
     {{^useSpringBoot3}}
     ext.spring_boot_version = "2.7.18"
     {{/useSpringBoot3}}
-    {{#jvm-spring-webclient}}
-    ext.reactor_version = "3.6.4"
-    {{/jvm-spring-webclient}}
     {{/jvm-spring}}
-    // 6.13.0 is the latest stable release that supports JDK8
-    ext.spotless_version = "6.13.0"
+    ext.spotless_version = "6.25.0"
 
     repositories {
         maven { url "https://repo1.maven.org/maven2" }
@@ -167,7 +163,7 @@ dependencies {
     {{/jvm-okhttp4}}
     {{#jvm-spring-webclient}}
     implementation "org.springframework.boot:spring-boot-starter-webflux:$spring_boot_version"
-    implementation "io.projectreactor:reactor-core:$reactor_version"
+    implementation "io.projectreactor:reactor-core:3.6.5"
     {{/jvm-spring-webclient}}
     {{#jvm-spring-restclient}}
     implementation "org.springframework.boot:spring-boot-starter-web:$spring_boot_version"

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

@@ -1,6 +1,12 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
+{{#jvm-volley}}
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-all.zip
+{{/jvm-volley}}
+{{^jvm-volley}}
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+{{/jvm-volley}}
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists