Skip to content

Update Gradle wrapper to 9.2.1 and resolve pmd issues #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chadlwilson wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Update Gradle wrapper to 9.2.1 and resolve pmd issues #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
08c2d7d
Update Gradle wrapper to 9.2.1 and resolve pmd issues
haroon-sheikh Nov 28, 2025
6e7aeba
Update Gradle wrapper to 9.2.1 and resolve pmd issues
haroon-sheikh Nov 28, 2025
9787388
Update Gradle wrapper to 9.2.1 and resolve pmd issues
haroon-sheikh Nov 28, 2025
d530f86
tests: Simplify sample
chadlwilson Jan 13, 2026
a24da80
tests: Build with Gradle 9/Java 21, but test against Gradle 7/8/9 and…
chadlwilson Jan 13, 2026
480d049
Remove maven local
chadlwilson Jan 13, 2026
3b8bfff
Remove v7
chadlwilson Jan 13, 2026
67b53c7
Try with debug
chadlwilson Jan 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 '2.1.0'
id 'org.gauge' version '3.0.0'
}

repositories {
Expand Down Expand Up @@ -64,7 +64,7 @@ buildscript {
}
}
dependencies {
classpath "org.gauge.gradle:gauge-gradle-plugin:2.1.0"
classpath "org.gauge.gradle:gauge-gradle-plugin:3.0.0"
}
}

Expand Down
9 changes: 9 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
plugins {
id 'base'
}

["assemble", "check", "build"].each { task ->
tasks.named(task) {
dependsOn(gradle.includedBuild("plugin").task(":$task"))
}
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
distributionSha256Sum=72f44c9f8ebcb1af43838f45ee5c4aa9c5444898b3468ab3f4af7b6076c5bc3f
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
5 changes: 1 addition & 4 deletions gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions gradlew.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions plugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ plugins {
}

repositories {
mavenLocal()
mavenCentral()
}

Expand Down Expand Up @@ -39,6 +38,9 @@ testing {
targets {
all {
testTask.configure {
javaLauncher = javaToolchains.launcherFor {
languageVersion = JavaLanguageVersion.of(17)
}
shouldRunAfter(test)
}
}
Expand All @@ -56,9 +58,7 @@ tasks.withType(Test).configureEach {
}
}

tasks.named('check') {
dependsOn(testing.suites.named("integrationTest"))
}
tasks.check.dependsOn(tasks.named("integrationTest"))

gradlePlugin {
testSourceSets(sourceSets.integrationTest)
Expand Down
22 changes: 17 additions & 5 deletions plugin/src/integrationTest/java/org/gauge/gradle/Base.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -22,7 +23,7 @@ class Base {
protected static final String GAUGE_TASK_PATH = ":gauge";

@BeforeEach
public void setup() {
void setup() {
settingsFile = new File(primaryProjectDir, "settings.gradle");
buildFile = new File(primaryProjectDir, "build.gradle");
}
Expand All @@ -49,9 +50,20 @@ protected void copyGaugeProjectToTemp(final String project, final File testProje
}

protected String getApplyPluginsBlock() {
return "plugins {id 'org.gauge'}\n"
+ "repositories {mavenLocal()\nmavenCentral()}\n"
+ "dependencies {testImplementation 'com.thoughtworks.gauge:gauge-java:+'}\n";
return """
plugins {
id 'org.gauge'
}
repositories {
mavenCentral()
}
dependencies {
testImplementation 'com.thoughtworks.gauge:gauge-java:+'
}
tasks.withType(AbstractTestTask).configureEach {
if (GradleVersion.current().version >= '9') failOnNoDiscoveredTests = false
}
""";
}

protected GradleRunner defaultGradleRunner() {
Expand Down
29 changes: 0 additions & 29 deletions plugin/src/integrationTest/java/org/gauge/gradle/ClasspathTest.java
View file
Open in desktop

This file was deleted.

Loading
Loading