tests: Build with Gradle 9/Java 21, but test against Gradle 7/8/9 and Java 17

Author: chadlwilson

.github/workflows/build.yml

@@ -13,25 +13,24 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-2022]
+        java-version: [17, 21]
     steps:
     - uses: actions/checkout@v6
+    - uses: actions/setup-java@v5
+      with:
+        distribution: 'temurin'
+        java-version: '17' # Version for tests
     - uses: actions/setup-java@v5
       with:
         distribution: 'temurin'
         java-version: '21'
+        cache: gradle
     - uses: getgauge/setup-gauge@master
       with:
         gauge-plugins: java, html-report, xml-report
     - uses: gradle/actions/setup-gradle@v5
-    - name: Build with Gradle on ubuntu
-      if: matrix.os != 'windows-latest'
-      run: |
-        ./gradlew plugin:build
-        ./gradlew gaugeValidate gaugeDevRepeat
-    - name: Build with Gradle on windows
-      if: matrix.os == 'windows-latest'
+    - name: Build with Gradle
       run: |
         gauge config runner_connection_timeout 300000
-        .\gradlew.bat plugin:build
-        .\gradlew.bat gaugeDevRepeat
+        ./gradlew build

.github/workflows/release.yml

@@ -17,6 +17,7 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '21'
+          cache: 'gradle'
       - uses: getgauge/setup-gauge@master
         with:
           gauge-plugins: java, html-report, xml-report

README.md

@@ -28,7 +28,7 @@ If you have an existing project, and you would like to add the plugin manually y
 
 ```groovy
 plugins {
-    id 'org.gauge' version '3.1.0'
+    id 'org.gauge' version '3.0.0'
 }
 
 repositories {
@@ -64,7 +64,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "org.gauge.gradle:gauge-gradle-plugin:3.1.0"
+        classpath "org.gauge.gradle:gauge-gradle-plugin:3.0.0"
     }
 }
 

build.gradle

@@ -0,0 +1,9 @@
+plugins {
+    id 'base'
+}
+
+["assemble", "check", "build"].each { task ->
+    tasks.named(task) {
+        dependsOn(gradle.includedBuild("plugin").task(":$task"))
+    }
+}

plugin/build.gradle

@@ -39,6 +39,9 @@ testing {
             targets {
                 all {
                     testTask.configure {
+                        javaLauncher = javaToolchains.launcherFor {
+                            languageVersion = JavaLanguageVersion.of(17)
+                        }
                         shouldRunAfter(test)
                     }
                 }
@@ -56,9 +59,7 @@ tasks.withType(Test).configureEach {
     }
 }
 
-tasks.named('check') {
-    dependsOn(testing.suites.named("integrationTest"))
-}
+tasks.check.dependsOn(tasks.named("integrationTest"))
 
 gradlePlugin {
     testSourceSets(sourceSets.integrationTest)

plugin/gradle.properties

@@ -1 +1 @@
-version=3.1.0
+version=3.0.0

plugin/src/integrationTest/java/org/gauge/gradle/Base.java

@@ -6,13 +6,14 @@
 import java.io.IOException;
 import java.net.URL;
 import java.nio.file.Path;
+
 import org.apache.commons.io.FileUtils;
 import org.gradle.testkit.runner.GradleRunner;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.io.TempDir;
 
-class Base {
+abstract class Base {
 
     @TempDir
     File primaryProjectDir;
@@ -50,12 +51,18 @@ protected void copyGaugeProjectToTemp(final String project, final File testProje
 
     protected String getApplyPluginsBlock() {
         return """
-            plugins {id 'org.gauge'}
-            repositories {mavenLocal()
-            mavenCentral()}
-            dependencies {testImplementation 'com.thoughtworks.gauge:gauge-java:+'}
+            plugins {
+              id 'org.gauge'
+            }
+            repositories {
+              mavenLocal()
+              mavenCentral()
+            }
+            dependencies {
+              testImplementation 'com.thoughtworks.gauge:gauge-java:+'
+            }
             tasks.withType(AbstractTestTask).configureEach {
-                failOnNoDiscoveredTests = false
+                if (GradleVersion.current().version >= '9') failOnNoDiscoveredTests = false
             }
             """;
     }