From e9f73f02e37cd8c2e1ea6d70e6da7235ce9dd18a Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Wed, 25 Jan 2023 04:47:26 -0800 Subject: [PATCH 1/8] Run `equoIde` and get an IDE with the Spotless project imported and ready to go. --- CONTRIBUTING.md | 2 +- build.gradle | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 782e377d58..af2e690784 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # Contributing to Spotless -Pull requests are welcome, preferably against `main`. Feel free to develop spotless any way you like. +Pull requests are welcome, preferably against `main`. Feel free to develop spotless any way you like, but if you like Eclipse and Gradle Buildship then [`gradlew equoIde` will install an IDE and set it up for you](https://github.com/equodev/equo-ide). ## How Spotless works diff --git a/build.gradle b/build.gradle index f9e3d0de21..450ee61583 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,26 @@ +plugins { + // https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md + id 'dev.equo.ide' version '0.12.1' +} +equoIde { + branding.title('Spotless').icon(file('_images/spotless_logo.png')) + + // waiting on https://github.com/equodev/equo-ide/pull/65 + //welcome().openUrlOnStartup('https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md') + + // everything below becomes the default after https://github.com/equodev/equo-ide/pull/66 + p2repo 'https://download.eclipse.org/eclipse/updates/4.26/' + install 'org.eclipse.releng.java.languages.categoryIU' + install 'org.eclipse.platform.ide.categoryIU' + + p2repo 'https://download.eclipse.org/buildship/updates/e423/releases/3.x/3.1.6.v20220511-1359/' + install 'org.eclipse.buildship.feature.group' +} + repositories { mavenCentral() } + apply from: rootProject.file('gradle/java-publish.gradle') apply from: rootProject.file('gradle/changelog.gradle') allprojects { @@ -18,4 +38,4 @@ spotless { trimTrailingWhitespace() endWithNewline() } -} \ No newline at end of file +} From f634ef00ec2fc70288601e439f8e1f86440171e4 Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Wed, 25 Jan 2023 22:45:17 -0800 Subject: [PATCH 2/8] https://github.com/equodev/equo-ide/pull/65 has merged --- build.gradle | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 450ee61583..d1ae14750e 100644 --- a/build.gradle +++ b/build.gradle @@ -4,9 +4,7 @@ plugins { } equoIde { branding.title('Spotless').icon(file('_images/spotless_logo.png')) - - // waiting on https://github.com/equodev/equo-ide/pull/65 - //welcome().openUrlOnStartup('https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md') + welcome().openUrlOnStartup('https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md') // everything below becomes the default after https://github.com/equodev/equo-ide/pull/66 p2repo 'https://download.eclipse.org/eclipse/updates/4.26/' From b48f511c652282ff04738b84214dbc8944ba5412 Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Mon, 30 Jan 2023 22:41:18 -0800 Subject: [PATCH 3/8] Move towards API changes. --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index d1ae14750e..7cfca1fb56 100644 --- a/build.gradle +++ b/build.gradle @@ -3,8 +3,8 @@ plugins { id 'dev.equo.ide' version '0.12.1' } equoIde { - branding.title('Spotless').icon(file('_images/spotless_logo.png')) - welcome().openUrlOnStartup('https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md') + branding().title('Spotless').icon(file('_images/spotless_logo.png')) + welcome().openUrl('https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md') // everything below becomes the default after https://github.com/equodev/equo-ide/pull/66 p2repo 'https://download.eclipse.org/eclipse/updates/4.26/' From a7b4da4934957d051f5da027efcd157d92aed586 Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Tue, 31 Jan 2023 23:29:02 -0800 Subject: [PATCH 4/8] We can rely on the defaults within equoIde now. --- build.gradle | 8 -------- 1 file changed, 8 deletions(-) diff --git a/build.gradle b/build.gradle index 7cfca1fb56..28bc589212 100644 --- a/build.gradle +++ b/build.gradle @@ -5,14 +5,6 @@ plugins { equoIde { branding().title('Spotless').icon(file('_images/spotless_logo.png')) welcome().openUrl('https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md') - - // everything below becomes the default after https://github.com/equodev/equo-ide/pull/66 - p2repo 'https://download.eclipse.org/eclipse/updates/4.26/' - install 'org.eclipse.releng.java.languages.categoryIU' - install 'org.eclipse.platform.ide.categoryIU' - - p2repo 'https://download.eclipse.org/buildship/updates/e423/releases/3.x/3.1.6.v20220511-1359/' - install 'org.eclipse.buildship.feature.group' } repositories { From ec4bb0ad20298f4b0d05d5fbe82e79276b34cf5c Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Sun, 5 Feb 2023 15:42:06 -0800 Subject: [PATCH 5/8] Fix a long-broken package-info that somehow only the Eclipse compiler noticed. --- lib/src/main/java/com/diffplug/spotless/json/package-info.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/main/java/com/diffplug/spotless/json/package-info.java b/lib/src/main/java/com/diffplug/spotless/json/package-info.java index 0d62356d77..625de57180 100644 --- a/lib/src/main/java/com/diffplug/spotless/json/package-info.java +++ b/lib/src/main/java/com/diffplug/spotless/json/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @ReturnValuesAreNonnullByDefault -package com.diffplug.spotless.extra.json.java; +package com.diffplug.spotless.json; import javax.annotation.ParametersAreNonnullByDefault; From 9aefc2ebc1e901e899e279f501879e83f77c0cf5 Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Wed, 8 Feb 2023 10:56:45 -0800 Subject: [PATCH 6/8] Bump equo-ide to latest release. --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 28bc589212..0b00b4c9f1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { // https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md - id 'dev.equo.ide' version '0.12.1' + id 'dev.equo.ide' version '0.13.0' } equoIde { branding().title('Spotless').icon(file('_images/spotless_logo.png')) From b4d9de586c6ca7d40a9f1c2ed21584c91e73497f Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Sun, 26 Feb 2023 12:15:32 -0800 Subject: [PATCH 7/8] Adopt the latest version of Equo now that it's production ready on Gradle. --- build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0b00b4c9f1..312f84727d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,11 @@ plugins { // https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md - id 'dev.equo.ide' version '0.13.0' + id 'dev.equo.ide' version '0.16.0' } equoIde { branding().title('Spotless').icon(file('_images/spotless_logo.png')) welcome().openUrl('https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md') + gradleBuildship() } repositories { From 2a54d8475296baeaa6557e8d269ccb441b7f11f8 Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Sun, 26 Feb 2023 12:27:18 -0800 Subject: [PATCH 8/8] Update changelogs. --- CHANGES.md | 5 +++++ plugin-gradle/CHANGES.md | 4 ++-- plugin-maven/CHANGES.md | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index efb88d972d..11f3f9da3b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -10,8 +10,13 @@ This document is intended for Spotless developers. We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`). ## [Unreleased] +### Added +* `gradlew equoIde` opens a repeatable clean Spotless dev environment. ([#1523](https://github.com/diffplug/spotless/pull/1523)) +* `cleanthat` added `includeDraft` option, to include draft mutators from composite mutators. ([#1574](https://github.com/diffplug/spotless/pull/1574)) ### Fixed * `JacksonJsonFormatterFunc` handles json files with an Array as root. ([#1585](https://github.com/diffplug/spotless/pull/1585)) +### Changes +* Bump default `cleanthat` version to latest `2.1` -> `2.6` ([#1569](https://github.com/diffplug/spotless/pull/1569) and [#1574](https://github.com/diffplug/spotless/pull/1574)) ## [2.35.0] - 2023-02-10 ### Added diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md index 84b02012b8..63aef7c8d9 100644 --- a/plugin-gradle/CHANGES.md +++ b/plugin-gradle/CHANGES.md @@ -4,11 +4,11 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( ## [Unreleased] ### Added -* `cleanthat` now has `includeDraft` option, to include draft mutators from composite mutators ([#1574](https://github.com/diffplug/spotless/pull/1574)) +* `cleanthat` now has `includeDraft` option, to include draft mutators from composite mutators. ([#1574](https://github.com/diffplug/spotless/pull/1574)) ### Fixed * `json { jackson()` can now handle `Array` as a root element. ([#1585](https://github.com/diffplug/spotless/pull/1585)) ### Changes -* Bump default `cleanthat` version to latest `2.1` -> `2.6` ([#1569](https://github.com/diffplug/spotless/pull/1569) and [#1574](https://github.com/diffplug/spotless/pull/1574)) +* Bump default `cleanthat` version to latest `2.1` -> `2.6`. ([#1569](https://github.com/diffplug/spotless/pull/1569) and [#1574](https://github.com/diffplug/spotless/pull/1574)) ## [6.15.0] - 2023-02-10 ### Added diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md index c21ec5dcb9..f8930c6873 100644 --- a/plugin-maven/CHANGES.md +++ b/plugin-maven/CHANGES.md @@ -3,10 +3,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`). ## [Unreleased] +### Added +* `cleanthat` added `includeDraft` option, to include draft mutators from composite mutators. ([#1574](https://github.com/diffplug/spotless/pull/1574)) ### Fixed * `` can now handle `Array` as a root element. ([#1585](https://github.com/diffplug/spotless/pull/1585)) -### Added -* `cleanthat` added `includeDraft` option, to include draft mutators from composite mutators ([#XXX](https://github.com/diffplug/spotless/pull/XXX)) ### Changes * Bump default `cleanthat` version to latest `2.1` -> `2.6` ([#1569](https://github.com/diffplug/spotless/pull/1569) and [#1574](https://github.com/diffplug/spotless/pull/1574))