From 38a58f824e0b2401edf34b7f19d8a020f0e414e0 Mon Sep 17 00:00:00 2001 From: "gocardless-ci-robot[bot]" <123969075+gocardless-ci-robot[bot]@users.noreply.github.com> Date: Fri, 27 Feb 2026 14:59:04 +0000 Subject: [PATCH 1/4] Changes generated by 90089b2a9317aea916d0d9b4819917ba9e599e29 This commit was automatically created from gocardless/client-library-templates@90089b2a9317aea916d0d9b4819917ba9e599e29 by the `push-files` action. Workflow run: https://github.com/gocardless/client-library-templates/actions/runs/22491179376 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 28718be3..d1917a9e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Java Client for GoCardless Pro API +# Java Client for GoCardless API This library provides a simple wrapper around the [GoCardless API](http://developer.gocardless.com/api-reference). From ba291b967a1d829d278bea31492a0930ccd682eb Mon Sep 17 00:00:00 2001 From: "gocardless-ci-robot[bot]" <123969075+gocardless-ci-robot[bot]@users.noreply.github.com> Date: Tue, 3 Mar 2026 16:22:42 +0000 Subject: [PATCH 2/4] Changes generated by e37d95edc68018f932b306aa1173aa043ac7d3f3 This commit was automatically created from gocardless/client-library-templates@e37d95edc68018f932b306aa1173aa043ac7d3f3 by the `push-files` action. Workflow run: https://github.com/gocardless/client-library-templates/actions/runs/22632193233 --- build.gradle | 30 +++++++++++++++++------- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index aa696b1a..405367dc 100644 --- a/build.gradle +++ b/build.gradle @@ -11,6 +11,11 @@ buildscript { dependencies { classpath 'ch.raffael.pegdown-doclet:pegdown-doclet:1.2.1' + // Only add Spotless if running on Java 11+ + // TODO: Remove this when we drop support for Java 8 + if (JavaVersion.current() >= JavaVersion.VERSION_11) { + classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.25.0' + } } } @@ -19,7 +24,6 @@ plugins { id "signing" id "maven-publish" id "io.github.gradle-nexus.publish-plugin" version "1.1.0" - id "com.diffplug.spotless" version "5.12.5" } sourceCompatibility = 1.8 @@ -29,6 +33,13 @@ version = '7.6.0' apply plugin: 'ch.raffael.pegdown-doclet' +// TODO: Remove this when we drop support for Java 8 +// Conditionally apply Spotless plugin only on Java 11+ +// (required because Spotless 6.x needs Java 11+ to load) +if (JavaVersion.current() >= JavaVersion.VERSION_11) { + apply plugin: 'com.diffplug.spotless' +} + repositories { mavenCentral() maven { url 'https://plugins.gradle.org/m2/' } @@ -66,12 +77,12 @@ javadoc { task javadocJar(type: Jar, dependsOn: javadoc) { from tasks.javadoc.destinationDir - classifier = 'javadoc' + archiveClassifier = 'javadoc' } task sourcesJar(type: Jar) { from sourceSets.main.allSource - classifier = 'sources' + archiveClassifier = 'sources' } publishing { @@ -147,10 +158,13 @@ nexusPublishing { } } -spotless { - java { - importOrder() - removeUnusedImports() - eclipse().configFile("format.xml") +// Only configure Spotless if it was applied (Java 11+) +if (JavaVersion.current() >= JavaVersion.VERSION_11) { + spotless { + java { + importOrder() + removeUnusedImports() + eclipse().configFile("format.xml") + } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6ea45673..0922d266 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip From baa2022590341e4aec572a4c4407c851864f8388 Mon Sep 17 00:00:00 2001 From: jamiecobbett Date: Tue, 3 Mar 2026 16:25:45 +0000 Subject: [PATCH 3/4] Test against all LTS Java releases --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9bffc383..f9ab5c21 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,13 +12,13 @@ jobs: strategy: fail-fast: false matrix: - jdk-version: [ 8, 11 ] + jdk-version: [25, 21, 17, 11, 8] steps: - uses: actions/checkout@v4 - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v5 with: java-version: "${{ matrix.jdk-version }}" - distribution: adopt + distribution: temurin - name: Verify java installed properly run: java -version - name: Grant execute permission for gradlew From ffc17b06f6873e172ef443079e24b29454f6cf3f Mon Sep 17 00:00:00 2001 From: jamiecobbett Date: Tue, 3 Mar 2026 16:27:37 +0000 Subject: [PATCH 4/4] Update checkout and upload-artifact --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f9ab5c21..cc9925a4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ jobs: matrix: jdk-version: [25, 21, 17, 11, 8] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: actions/setup-java@v5 with: java-version: "${{ matrix.jdk-version }}" @@ -36,7 +36,7 @@ jobs: run: |- mkdir -p ~/junit find . -type f -regex "./build/test-results/test/.*xml" -exec cp {} ~/junit/ \; - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v6 if: always() with: name: test_library_jdk${{ matrix.jdk-version }}_junit