upgrade gradle

Author: Picazsoo

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

@@ -7,7 +7,7 @@ plugins {
     id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
     id("java-gradle-plugin")
     id("maven-publish")
-    id("org.gradle.kotlin.kotlin-dsl") version "2.4.1"
+    id("org.gradle.kotlin.kotlin-dsl") version "5.2.0"
     id("org.jetbrains.kotlin.jvm") version "1.9.0"
     id("signing")
 }

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,8 +17,8 @@
 
     <properties>
         <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
-        <gradleVersion>7.6.4</gradleVersion>
-        <gradle-tooling.version>7.4.2</gradle-tooling.version>
+        <gradleVersion>8.14.4</gradleVersion>
+        <gradle-tooling.version>8.14.4</gradle-tooling.version>
     </properties>
 
     <pluginRepositories>

modules/openapi-generator-gradle-plugin/gradlew

@@ -23,19 +23,19 @@ apply plugin: 'org.openapi.generator'
 openApiMeta {
     generatorName = "Sample"
     packageName = "org.openapitools.example"
-    outputFolder = "$buildDir/meta".toString()
+    outputFolder = layout.buildDirectory.dir("meta")
 }
 
 openApiValidate {
-    inputSpec = "$rootDir/petstore-v3.0-invalid.yaml".toString()
+    inputSpec = layout.projectDirectory.file("petstore-v3.0-invalid.yaml")
     recommend = true
 }
 
 // Builds a Kotlin client by default.
 openApiGenerate {
     generatorName = "kotlin"
-    inputSpec = "$rootDir/petstore-v3.0.yaml".toString()
-    outputDir = "$buildDir/kotlin".toString()
+    inputSpec = layout.projectDirectory.file("petstore-v3.0.yaml")
+    outputDir = layout.buildDirectory.dir("kotlin")
     apiPackage = "org.openapitools.example.api"
     invokerPackage = "org.openapitools.example.invoker"
     modelPackage = "org.openapitools.example.model"
@@ -57,8 +57,8 @@ openApiGenerate {
 task buildJavaResttemplateSdk(type: org.openapitools.generator.gradle.plugin.tasks.GenerateTask) {
     generatorName = "java"
     library = "resttemplate"
-    inputSpec = "$rootDir/petstore-v3.0.yaml".toString()
-    outputDir = "$buildDir/java-resttemplate-api-client"
+    inputSpec = layout.projectDirectory.file("petstore-v3.0.yaml")
+    outputDir = layout.buildDirectory.dir("java-resttemplate-api-client")
     apiPackage = "com.example.client"
     invokerPackage = "com.example.invoker"
     modelPackage = "com.example.cdm"
@@ -75,24 +75,24 @@ task buildJavaResttemplateSdk(type: org.openapitools.generator.gradle.plugin.tas
 
 task buildGoSdk(type: org.openapitools.generator.gradle.plugin.tasks.GenerateTask){
     generatorName = "go"
-    inputSpec = "$rootDir/petstore-v3.0.yaml".toString()
+    inputSpec = layout.projectDirectory.file("petstore-v3.0.yaml")
     additionalProperties = [
             packageName: "petstore"
     ]
-    outputDir = "$buildDir/go".toString()
+    outputDir = layout.buildDirectory.dir("go")
     configOptions = [
             dateLibrary: "threetenp"
     ]
 }
 
 task buildDotnetSdk(type: org.openapitools.generator.gradle.plugin.tasks.GenerateTask){
     generatorName = "csharp"
-    inputSpec = "$rootDir/petstore-v3.0.yaml".toString()
+    inputSpec = layout.projectDirectory.file("petstore-v3.0.yaml")
     additionalProperties = [
             packageGuid: "{321C8C3F-0156-40C1-AE42-D59761FB9B6C}",
             useCompareNetObjects: "true"
     ]
-    outputDir = "$buildDir/csharp".toString()
+    outputDir = layout.buildDirectory.dir("csharp")
     globalProperties = [
             models: "",
             apis  : "",
@@ -102,22 +102,22 @@ task buildDotnetSdk(type: org.openapitools.generator.gradle.plugin.tasks.Generat
 task generateGoWithInvalidSpec(type: org.openapitools.generator.gradle.plugin.tasks.GenerateTask){
     validateSpec = true
     generatorName = "go"
-    inputSpec = "$rootDir/petstore-v3.0-invalid.yaml".toString()
+    inputSpec = layout.projectDirectory.file("petstore-v3.0-invalid.yaml")
     additionalProperties = [
             packageName: "petstore"
     ]
-    outputDir = "$buildDir/go".toString()
+    outputDir = layout.buildDirectory.dir("go")
     configOptions = [
             dateLibrary: "threetenp"
     ]
 }
 
 task validateGoodSpec(type: org.openapitools.generator.gradle.plugin.tasks.ValidateTask){
-    inputSpec = "$rootDir/petstore-v3.0.yaml".toString()
+    inputSpec = layout.projectDirectory.file("petstore-v3.0.yaml")
 }
 
 task validateBadSpec(type: org.openapitools.generator.gradle.plugin.tasks.ValidateTask){
-    inputSpec = "$rootDir/petstore-v3.0-invalid.yaml".toString()
+    inputSpec = layout.projectDirectory.file("petstore-v3.0-invalid.yaml")
 }
 
 task validateSpecs(dependsOn: ['validateGoodSpec', 'validateBadSpec'])

modules/openapi-generator-gradle-plugin/gradlew.bat

@@ -1,5 +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