openapi-generator-gradle-plugin: upgrade Gradle to v8 (#22864)

Author: dennisameling

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

@@ -14,10 +14,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
-      - name: Set up JDK 11
+      - name: Set up JDK 21
         uses: actions/setup-java@v5
         with:
-          java-version: 11
+          java-version: 21
           distribution: 'temurin'
           cache: gradle
       - name: Cache maven dependencies

modules/openapi-generator-gradle-plugin/README.adoc

@@ -541,7 +541,7 @@ This task exposes all options available via OpenAPI Generator CLI and the OpenAP
 openApiGenerate {
     generatorName.set("kotlin")
     inputSpec.set("$rootDir/specs/petstore-v3.0.yaml")
-    outputDir.set("$buildDir/generated")
+    outputDir.set(layout.buildDirectory.dir("generated").get().asFile.path)
     apiPackage.set("org.openapi.example.api")
     invokerPackage.set("org.openapi.example.invoker")
     modelPackage.set("org.openapi.example.model")
@@ -694,15 +694,15 @@ task buildGoClient(type: org.openapitools.generator.gradle.plugin.tasks.Generate
     additionalProperties.set([
             packageName: "petstore"
     ])
-    outputDir.set("$buildDir/go")
+    outputDir.set(layout.buildDirectory.dir("go").get().asFile.path)
     configOptions.set([
             dateLibrary: "threetenp"
     ])
 }
 task buildKotlinClient(type: org.openapitools.generator.gradle.plugin.tasks.GenerateTask) {
     generatorName.set("kotlin")
     inputSpec.set("$rootDir/petstore-v3.0.yaml")
-    outputDir.set("$buildDir/kotlin")
+    outputDir.set(layout.buildDirectory.dir("kotlin").get().asFile.path)
     apiPackage.set("org.openapitools.example.api")
     invokerPackage.set("org.openapitools.example.invoker")
     modelPackage.set("org.openapitools.example.model")

modules/openapi-generator-gradle-plugin/build.gradle

@@ -3,12 +3,12 @@ import io.github.gradlenexus.publishplugin.ReleaseNexusStagingRepository
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    id("com.gradle.plugin-publish") version "1.1.0"
-    id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
+    id("com.gradle.plugin-publish") version "2.0.0"
+    id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
     id("java-gradle-plugin")
     id("maven-publish")
-    id("org.gradle.kotlin.kotlin-dsl") version "2.4.1"
-    id("org.jetbrains.kotlin.jvm") version "1.9.0"
+    id("org.gradle.kotlin.kotlin-dsl") version "5.2.0"
+    id("org.jetbrains.kotlin.jvm") version "2.0.21"
     id("signing")
 }
 
@@ -35,7 +35,7 @@ repositories {
     mavenCentral()
     maven {
         name = "Sonatype Snapshots"
-        url "https://oss.sonatype.org/content/repositories/snapshots/"
+        url = "https://oss.sonatype.org/content/repositories/snapshots/"
     }
 }
 
@@ -117,7 +117,7 @@ nexusPublishing {
 // or stored as key=value pairs in ~/.gradle/gradle.properties
 // You can also apply them in CI via environment variables. See Gradle's docs for details.
 signing {
-    required { isReleaseVersion && gradle.taskGraph.hasTask("publishPluginMavenPublicationToSonatypeRepository") }
+    required = { isReleaseVersion && gradle.taskGraph.hasTask("publishPluginMavenPublicationToSonatypeRepository") }
     sign(publishing.publications)
 }
 

modules/openapi-generator-gradle-plugin/gradle/wrapper/gradle-wrapper.jar

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

modules/openapi-generator-gradle-plugin/gradle/wrapper/gradle-wrapper.properties

@@ -17,7 +17,7 @@
 
     <properties>
         <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
-        <gradleVersion>7.6.4</gradleVersion>
+        <gradleVersion>8.14.4</gradleVersion>
         <gradle-tooling.version>7.4.2</gradle-tooling.version>
     </properties>
 

modules/openapi-generator-gradle-plugin/gradlew

@@ -1,15 +1,15 @@
 buildscript {
     repositories {
         mavenLocal()
-        maven { url "https://repo1.maven.org/maven2" }
+        maven { url = "https://repo1.maven.org/maven2" }
         maven {
-            url "https://plugins.gradle.org/m2/"
+            url = "https://plugins.gradle.org/m2/"
         }
         maven {
-            url "https://oss.sonatype.org/content/repositories/releases/"
+            url = "https://oss.sonatype.org/content/repositories/releases/"
         }
         maven {
-            url "https://oss.sonatype.org/content/repositories/snapshots/"
+            url = "https://oss.sonatype.org/content/repositories/snapshots/"
         }
     }
     dependencies {
@@ -23,7 +23,7 @@ apply plugin: 'org.openapi.generator'
 openApiMeta {
     generatorName = "Sample"
     packageName = "org.openapitools.example"
-    outputFolder = "$buildDir/meta".toString()
+    outputFolder = layout.buildDirectory.dir("meta").get().asFile.toString()
 }
 
 openApiValidate {
@@ -35,7 +35,7 @@ openApiValidate {
 openApiGenerate {
     generatorName = "kotlin"
     inputSpec = "$rootDir/petstore-v3.0.yaml".toString()
-    outputDir = "$buildDir/kotlin".toString()
+    outputDir = layout.buildDirectory.dir("kotlin").get().asFile.toString()
     apiPackage = "org.openapitools.example.api"
     invokerPackage = "org.openapitools.example.invoker"
     modelPackage = "org.openapitools.example.model"
@@ -58,7 +58,7 @@ task buildJavaResttemplateSdk(type: org.openapitools.generator.gradle.plugin.tas
     generatorName = "java"
     library = "resttemplate"
     inputSpec = "$rootDir/petstore-v3.0.yaml".toString()
-    outputDir = "$buildDir/java-resttemplate-api-client"
+    outputDir = layout.buildDirectory.dir("java-resttemplate-api-client").get().asFile.toString()
     apiPackage = "com.example.client"
     invokerPackage = "com.example.invoker"
     modelPackage = "com.example.cdm"
@@ -79,7 +79,7 @@ task buildGoSdk(type: org.openapitools.generator.gradle.plugin.tasks.GenerateTas
     additionalProperties = [
             packageName: "petstore"
     ]
-    outputDir = "$buildDir/go".toString()
+    outputDir = layout.buildDirectory.dir("go").get().asFile.toString()
     configOptions = [
             dateLibrary: "threetenp"
     ]
@@ -92,7 +92,7 @@ task buildDotnetSdk(type: org.openapitools.generator.gradle.plugin.tasks.Generat
             packageGuid: "{321C8C3F-0156-40C1-AE42-D59761FB9B6C}",
             useCompareNetObjects: "true"
     ]
-    outputDir = "$buildDir/csharp".toString()
+    outputDir = layout.buildDirectory.dir("csharp").get().asFile.toString()
     globalProperties = [
             models: "",
             apis  : "",
@@ -106,7 +106,7 @@ task generateGoWithInvalidSpec(type: org.openapitools.generator.gradle.plugin.ta
     additionalProperties = [
             packageName: "petstore"
     ]
-    outputDir = "$buildDir/go".toString()
+    outputDir = layout.buildDirectory.dir("go").get().asFile.toString()
     configOptions = [
             dateLibrary: "threetenp"
     ]