From 6a9dcfd99ccdf5bec5f7330bd4bae9b404d78fc5 Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Tue, 31 Jan 2023 09:31:49 -0800 Subject: [PATCH 1/6] Stop disabling plugin-maven on JITPACK. --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index ac0e81a61b..9573775884 100644 --- a/settings.gradle +++ b/settings.gradle @@ -91,7 +91,7 @@ def getStartProperty(java.lang.String name) { } -if (System.getenv('SPOTLESS_EXCLUDE_MAVEN') != 'true' && getStartProperty('SPOTLESS_EXCLUDE_MAVEN') != 'true' && System.getenv('JITPACK') != 'true') { +if (System.getenv('SPOTLESS_EXCLUDE_MAVEN') != 'true' && getStartProperty('SPOTLESS_EXCLUDE_MAVEN') != 'true') { include 'plugin-maven' // maven-specific glue code } From 4c7b616e510bd83167ff329361ad819fac28ae6e Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Tue, 31 Jan 2023 09:36:09 -0800 Subject: [PATCH 2/6] Set JitPack build JDK to 11. --- jitpack.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 jitpack.yml diff --git a/jitpack.yml b/jitpack.yml new file mode 100644 index 0000000000..adb3fe10c8 --- /dev/null +++ b/jitpack.yml @@ -0,0 +1,2 @@ +jdk: + - openjdk11 From c77a4a609afa04b4f5969b7eabecd468cf88664e Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Tue, 31 Jan 2023 09:49:13 -0800 Subject: [PATCH 3/6] Disable signing on JitPack. --- gradle/java-publish.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/java-publish.gradle b/gradle/java-publish.gradle index 7d2055d78d..4f77a43ac2 100644 --- a/gradle/java-publish.gradle +++ b/gradle/java-publish.gradle @@ -170,7 +170,7 @@ model { } } -if (!version.endsWith('-SNAPSHOT')) { +if (!version.endsWith('-SNAPSHOT') && System.getenv('JITPACK') != 'true') { signing { String gpg_key = decode64('ORG_GRADLE_PROJECT_gpg_key64') useInMemoryPgpKeys(gpg_key, System.env['ORG_GRADLE_PROJECT_gpg_passphrase']) From 1c060830640b39f04b2e16b6ac49da52d7d0d276 Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Tue, 31 Jan 2023 09:58:13 -0800 Subject: [PATCH 4/6] Another attempt to disable signing on JitPack. --- gradle/java-publish.gradle | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gradle/java-publish.gradle b/gradle/java-publish.gradle index 4f77a43ac2..3839391d3a 100644 --- a/gradle/java-publish.gradle +++ b/gradle/java-publish.gradle @@ -170,7 +170,11 @@ model { } } -if (!version.endsWith('-SNAPSHOT') && System.getenv('JITPACK') != 'true') { +if (System.getenv('JITPACK') == 'true') { + signing { + setRequired(false) + } +} else if (!version.endsWith('-SNAPSHOT')) { signing { String gpg_key = decode64('ORG_GRADLE_PROJECT_gpg_key64') useInMemoryPgpKeys(gpg_key, System.env['ORG_GRADLE_PROJECT_gpg_passphrase']) From cc43cf1becc90cf964234fa00bd542c0b873d279 Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Tue, 31 Jan 2023 13:47:59 -0800 Subject: [PATCH 5/6] Another attempt at fixing JitPack. --- gradle/java-publish.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/java-publish.gradle b/gradle/java-publish.gradle index 3839391d3a..7583bbe344 100644 --- a/gradle/java-publish.gradle +++ b/gradle/java-publish.gradle @@ -170,7 +170,7 @@ model { } } -if (System.getenv('JITPACK') == 'true') { +if (System.env['JITPACK'] == 'true') { signing { setRequired(false) } From e3f1ca4c9cd37356c8940c28814e441e78fe02c5 Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Tue, 31 Jan 2023 13:59:54 -0800 Subject: [PATCH 6/6] Update contributing guide and changelog. --- CONTRIBUTING.md | 2 +- plugin-maven/CHANGES.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 782e377d58..783f58b9af 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -207,7 +207,7 @@ If it doesn't work, you can check the JitPack log at `https://jitpack.io/com/git ### Maven -Run `./gradlew publishToMavenLocal` to publish this to your local repository. The maven plugin is not published to JitPack due to [jitpack/jitpack.io#4112](https://github.com/jitpack/jitpack.io/issues/4112). +Run `./gradlew publishToMavenLocal` to publish this to your local repository. You can also use the JitPack artifacts, using the same principles as Gradle above. ## License diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md index c9e0f420a5..0029814ae9 100644 --- a/plugin-maven/CHANGES.md +++ b/plugin-maven/CHANGES.md @@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( ## [Unreleased] ### Added * A synthesis log with the number of considered files is added after each formatter execution ([#1507](https://github.com/diffplug/spotless/pull/1507)) +* Any commit of the Spotless maven plugin now available via JitPack ([#1547](https://github.com/diffplug/spotless/pull/1547)) ## [2.31.0] - 2023-01-26 ### Added