Upgrade Gradle plugin build to Gradle 7.6

Author: erichaagdev

appveyor.yml

@@ -15,14 +15,14 @@ install:
   # install gradle
   - ps: |
       Add-Type -AssemblyName System.IO.Compression.FileSystem
-      if (!(Test-Path -Path "C:\gradle\gradle-7.5.1" )) {
+      if (!(Test-Path -Path "C:\gradle\gradle-7.6" )) {
         (new-object System.Net.WebClient).DownloadFile(
-          'https://services.gradle.org/distributions/gradle-7.5.1-bin.zip',
+          'https://services.gradle.org/distributions/gradle-7.6-bin.zip',
           'C:\gradle-bin.zip'
         )
         [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\gradle-bin.zip", "C:\gradle")
       }
-  - cmd: SET PATH=C:\maven\apache-maven-3.8.3\bin;C:\gradle\gradle-7.5.1\bin;%JAVA_HOME%\bin;%PATH%
+  - cmd: SET PATH=C:\maven\apache-maven-3.8.3\bin;C:\gradle\gradle-7.6\bin;%JAVA_HOME%\bin;%PATH%
   - cmd: SET MAVEN_OPTS=-Xmx4g
   - cmd: SET JAVA_OPTS=-Xmx4g
   - cmd: SET M2_HOME=C:\maven\apache-maven-3.8.3

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

@@ -1,13 +1,14 @@
 import io.github.gradlenexus.publishplugin.CloseNexusStagingRepository
 import io.github.gradlenexus.publishplugin.ReleaseNexusStagingRepository
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     id("com.gradle.plugin-publish") version "1.0.0"
     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.3.3"
-    id("org.jetbrains.kotlin.jvm") version "1.6.21"
+    id("org.gradle.kotlin.kotlin-dsl") version "2.4.1"
+    id("org.jetbrains.kotlin.jvm") version "1.7.10"
     id("signing")
 }
 
@@ -39,13 +40,12 @@ repositories {
 
 dependencies {
     implementation("org.openapitools:openapi-generator:$openApiGeneratorVersion")
-    testImplementation("org.jetbrains.kotlin:kotlin-test-testng:1.6.21")
+    testImplementation("org.jetbrains.kotlin:kotlin-test-testng:1.7.10")
 }
 
-tasks.named("test").configure {
+tasks.named("test", Test).configure {
     useTestNG()
     testLogging.showStandardStreams = false
-    failFast = true
 
     beforeTest { descriptor ->
         logger.lifecycle("Running test: " + descriptor)
@@ -60,7 +60,7 @@ tasks.named("test").configure {
     }
 }
 
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+tasks.withType(KotlinCompile).configureEach {
     kotlinOptions {
         jvmTarget = "1.8"
     }
@@ -81,22 +81,19 @@ tasks.withType(ReleaseNexusStagingRepository).configureEach {
 }
 
 gradlePlugin {
+    website = "https://openapi-generator.tech/"
+    vcsUrl = "https://github.com/OpenAPITools/openapi-generator"
     plugins {
         openApiGenerator {
             id = "org.openapi.generator"
+            description = "OpenAPI Generator allows generation of API client libraries (SDK generation), server stubs, documentation and configuration automatically given an OpenAPI Spec (v2, v3)."
             displayName = "OpenAPI Generator Gradle Plugin"
             implementationClass = "org.openapitools.generator.gradle.plugin.OpenApiGeneratorPlugin"
-            description = "OpenAPI Generator allows generation of API client libraries (SDK generation), server stubs, documentation and configuration automatically given an OpenAPI Spec (v2, v3)."
+            tags.addAll("openapi-3.0", "openapi-2.0", "openapi", "swagger", "codegen", "sdk")
         }
     }
 }
 
-pluginBundle {
-    website = "https://openapi-generator.tech/"
-    vcsUrl = "https://github.com/OpenAPITools/openapi-generator"
-    tags = ["openapi-3.0", "openapi-2.0", "openapi", "swagger", "codegen", "sdk"]
-}
-
 nexusPublishing {
     repositories {
         sonatype {

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

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

modules/openapi-generator-gradle-plugin/pom.xml

@@ -17,7 +17,7 @@
 
     <properties>
         <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
-        <gradleVersion>7.5.1</gradleVersion>
+        <gradleVersion>7.6</gradleVersion>
     </properties>
 
     <pluginRepositories>

modules/openapi-generator-gradle-plugin/src/test/kotlin/GenerateTaskFromCacheTest.kt

@@ -22,7 +22,7 @@ class GenerateTaskFromCacheTest : TestBase() {
     }
 
     @DataProvider(name = "gradle_version_provider")
-    private fun gradleVersionProvider(): Array<Array<String>> = arrayOf(arrayOf("6.9.2"), arrayOf("7.5.1"))
+    private fun gradleVersionProvider(): Array<Array<String>> = arrayOf(arrayOf("6.9.3"), arrayOf("7.6"))
 
     // inputSpec tests
 

modules/openapi-generator-gradle-plugin/src/test/kotlin/GenerateTaskUpToDateTest.kt

@@ -9,7 +9,7 @@ import kotlin.test.assertEquals
 class GenerateTaskUpToDateTest : TestBase() {
 
     @DataProvider(name = "gradle_version_provider")
-    private fun gradleVersionProvider(): Array<Array<String>> = arrayOf(arrayOf("6.9.2"), arrayOf("7.5.1"))
+    private fun gradleVersionProvider(): Array<Array<String>> = arrayOf(arrayOf("6.9.3"), arrayOf("7.6"))
 
     // inputSpec tests
 

shippable.yml

@@ -14,11 +14,11 @@ build:
     - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 23E7166788B63E1E 6A030B21BA07F4FB 4B8EC3BAABDC4346 EB3E94ADBE1229CF 960B2B2623A0BD5D 6B05F25D762E3157
     #- rm /etc/apt/sources.list.d/jonathonf-ubuntu-backports-xenial.list 
     - rm /etc/apt/sources.list.d/basho_riak.list
-    # install Gradle 7.5.1
-    - wget https://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+    # install Gradle 7.6
+    - wget https://services.gradle.org/distributions/gradle-7.6-bin.zip
     - sudo mkdir /opt/gradle
-    - unzip -d /opt/gradle gradle-7.5.1-bin.zip
-    - export PATH=/opt/gradle/gradle-7.5.1/bin:$PATH
+    - unzip -d /opt/gradle gradle-7.6-bin.zip
+    - export PATH=/opt/gradle/gradle-7.6/bin:$PATH
     - gradle -v
     - java -version
     # ensure all modifications created by 'mature' generators are in the git repo