diff --git a/CHANGES.md b/CHANGES.md index 18f971e36f..586f8afa19 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,10 +6,13 @@ You might be looking for: - [plugin-maven/CHANGES.md](plugin-maven/CHANGES.md) ### Version 1.26.0-SNAPSHOT - TBD (javadoc [lib](https://diffplug.github.io/spotless/javadoc/spotless-lib/snapshot/) [lib-extra](https://diffplug.github.io/spotless/javadoc/spotless-lib-extra/snapshot/), [snapshot repo](https://oss.sonatype.org/content/repositories/snapshots/com/diffplug/spotless/)) -* Fix project URLs in poms. ([#478](https://github.com/diffplug/spotless/pull/478)) +* Fix project URLs in poms. ([#478](https://github.com/diffplug/spotless/pull/478)) * Fix `ImportSorter` crashing with empty files. ([#474](https://github.com/diffplug/spotless/pull/474)) * Fixes [#305](https://github.com/diffplug/spotless/issues/305) StringIndexOutOfBoundsException for empty Groovy file when performing importOrder +* Bugfix: CDT version `4.12.0` now properly uses `9.8`, whereas before it used `9.7`. ([#482](https://github.com/diffplug/spotless/pull/482#discussion_r341380884)) + +* Add support for Eclipse 4.13 and all related formatters (JDT, CDT, WTP, and Groovy). ([#480](https://github.com/diffplug/spotless/issues/480)) ### Version 1.25.0 - October 6th 2019 (javadoc [lib](https://diffplug.github.io/spotless/javadoc/spotless-lib/1.25.0/) [lib-extra](https://diffplug.github.io/spotless/javadoc/spotless-lib-extra/1.25.0/), artifact [lib]([jcenter](https://bintray.com/diffplug/opensource/spotless-lib), [lib-extra]([jcenter](https://bintray.com/diffplug/opensource/spotless-lib-extra))) @@ -40,6 +43,7 @@ You might be looking for: * Updated default eclipse-groovy from 4.10 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)). * Updated default eclipse-jdt from 4.11.0 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)). * Updated default eclipse-cdt from 4.11.0 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)). + * **KNOWN BUG - accidentally published CDT 9.7 rather than 9.8 - fixed in 1.26.0** * Added new maven coordinates for scalafmt 2.0.0+, maintains backwards compatability ([#415](https://github.com/diffplug/spotless/issues/415)) ### Version 1.23.1 - June 17th 2019 (javadoc [lib](https://diffplug.github.io/spotless/javadoc/spotless-lib/1.23.1/) [lib-extra](https://diffplug.github.io/spotless/javadoc/spotless-lib-extra/1.23.1/), artifact [lib]([jcenter](https://bintray.com/diffplug/opensource/spotless-lib), [lib-extra]([jcenter](https://bintray.com/diffplug/opensource/spotless-lib-extra))) diff --git a/_ext/eclipse-cdt/CHANGES.md b/_ext/eclipse-cdt/CHANGES.md index 41d28a984b..f5df3fd87f 100644 --- a/_ext/eclipse-cdt/CHANGES.md +++ b/_ext/eclipse-cdt/CHANGES.md @@ -1,12 +1,22 @@ # spotless-eclipse-cdt +### Version 9.9.0 - October 31st 2019 ([artifact]([jcenter](https://bintray.com/diffplug/opensource/spotless-eclipse-cdt))) + +* Switch to Eclipse CDT release 9.9 for Eclipse 4.13 ([#480](https://github.com/diffplug/spotless/issues/480)). + +### Version 9.8.1 - October 31st 2019 ([artifact]([jcenter](https://bintray.com/diffplug/opensource/spotless-eclipse-cdt))) + +* Really publish Eclipse CDT release 9.8 for Eclipse 4.12 ([#482](https://github.com/diffplug/spotless/pull/482)). + ### Version 9.8.0 - July 24th 2019 ([artifact]([jcenter](https://bintray.com/diffplug/opensource/spotless-eclipse-cdt))) +**Known bug - we actually published Eclipse CDT 9.7 instead of 9.8 - fixed in 9.8.1** + * Switch to Eclipse CDT release 9.8 for Eclipse 4.12 ([#423](https://github.com/diffplug/spotless/pull/423)). ### Version 9.7.0 - March 31st 2019 ([artifact]([jcenter](https://bintray.com/diffplug/opensource/spotless-eclipse-cdt))) -* Switch to Eclipse CTD release 9.7 for Eclipse 4.11 ([#389](https://github.com/diffplug/spotless/pull/389)). +* Switch to Eclipse CDT release 9.7 for Eclipse 4.11 ([#389](https://github.com/diffplug/spotless/pull/389)). * Include Eclipse logging allowing formatter warnings/errors to be logged via SLF4J ([#236](https://github.com/diffplug/spotless/issues/236)). ### Version 9.4.5 - February 25th 2019 ([artifact]([jcenter](https://bintray.com/diffplug/opensource/spotless-eclipse-cdt))) diff --git a/_ext/eclipse-cdt/gradle.properties b/_ext/eclipse-cdt/gradle.properties index 168e8037f0..a5109e3128 100644 --- a/_ext/eclipse-cdt/gradle.properties +++ b/_ext/eclipse-cdt/gradle.properties @@ -1,7 +1,7 @@ # Versions correspond to the Eclipse-CDT version used for the fat-JAR. # See https://www.eclipse.org/cdt/ for further information about Eclipse-CDT versions. # Patch version can be incremented independently for backward compatible patches of this library. -ext_version=9.8.0 +ext_version=9.9.0 ext_artifactId=spotless-eclipse-cdt ext_description=Eclipse's CDT C/C++ formatter bundled for Spotless ext_org=diffplug @@ -11,11 +11,10 @@ ext_group=com.diffplug.spotless ext_VER_JAVA=1.8 # Compile dependencies -VER_ECLIPSE_CDT=9.7 +VER_ECLIPSE_CDT=9.9 VER_SPOTLESS_ECLISPE_BASE=[3.2.0,4.0.0[ -VER_ECLISPE_JFACE=[3.12.0,4.0.0[ -VER_ECLISPE_WORKBENCH=[3.11.0,4.0.0[ -VER_ECLISPE_PLATFORM=[3.6.0,4.0.0[ +VER_ECLISPE_JFACE=[3.15.300,4.0.0[ +VER_ECLISPE_PLATFORM=[3.6.700,4.0.0[ VER_IBM_ICU=[61,62[ # Provided dependencies diff --git a/_ext/eclipse-groovy/CHANGES.md b/_ext/eclipse-groovy/CHANGES.md index f75e1a3153..338165d806 100644 --- a/_ext/eclipse-groovy/CHANGES.md +++ b/_ext/eclipse-groovy/CHANGES.md @@ -1,5 +1,9 @@ # spotless-eclipse-groovy +### Version 3.5.0 - November 1st 2019 ([artifact]([jcenter](https://bintray.com/diffplug/opensource/spotless-eclipse-groovy))) + +* Switch to Groovy-Eclipse release 3.5.0 for Eclipse 4.13 ([#480](https://github.com/diffplug/spotless/issues/480)). + ### Version 3.4.0 - July 24th 2019 ([artifact]([jcenter](https://bintray.com/diffplug/opensource/spotless-eclipse-groovy))) * Switch to Groovy-Eclipse release 3.4.0 for Eclipse 4.12 using Groovy-Indy 3.0.0 ([#423](https://github.com/diffplug/spotless/pull/423)). diff --git a/_ext/eclipse-groovy/gradle.properties b/_ext/eclipse-groovy/gradle.properties index 0c2867e315..c0eff9e8d8 100644 --- a/_ext/eclipse-groovy/gradle.properties +++ b/_ext/eclipse-groovy/gradle.properties @@ -1,7 +1,7 @@ # Versions correspond to the Groovy-Eclipse version used for the fat-JAR. # See https://github.com/groovy/groovy-eclipse/releases for further information about Groovy-Eclipse versions. # Patch version can be incremented independently for backward compatible patches of this library. -ext_version=3.4.0 +ext_version=3.5.0 ext_artifactId=spotless-eclipse-groovy ext_description=Groovy Eclipse's formatter bundled for Spotless @@ -12,10 +12,10 @@ ext_group=com.diffplug.spotless ext_VER_JAVA=1.8 # Compile -VER_ECLIPSE=4.12 +VER_ECLIPSE=4.13 VER_SPOTLESS_ECLISPE_BASE=[3.2.0,4.0.0[ -VER_ECLISPE_JFACE=[3.12.0,4.0.0[ -VER_GRECLIPSE=3.4.0 +VER_ECLISPE_JFACE=[3.15.300,4.0.0[ +VER_GRECLIPSE=3.5.0 VER_GROOVY=3.0.0 # Provided dependencies diff --git a/_ext/eclipse-wtp/CHANGES.md b/_ext/eclipse-wtp/CHANGES.md index 0e612c817f..82f28179a6 100644 --- a/_ext/eclipse-wtp/CHANGES.md +++ b/_ext/eclipse-wtp/CHANGES.md @@ -1,5 +1,9 @@ # spotless-eclipse-wtp +### Version 3.15.0 - November 6th 2019 ([artifact]([jcenter](https://bintray.com/diffplug/opensource/spotless-eclipse-wtp))) + +* Switch to Eclipse WTP release 3.15.0 for Eclipse 4.13 ([#480](https://github.com/diffplug/spotless/issues/480)). + ### Version 3.14.0 - July 24th 2019 ([artifact]([jcenter](https://bintray.com/diffplug/opensource/spotless-eclipse-wtp))) * Switch to Eclipse WTP release 3.14.0 for Eclipse 4.12 ([#423](https://github.com/diffplug/spotless/pull/423)). diff --git a/_ext/eclipse-wtp/build.gradle b/_ext/eclipse-wtp/build.gradle index aed6173ddb..1dca2707c4 100644 --- a/_ext/eclipse-wtp/build.gradle +++ b/_ext/eclipse-wtp/build.gradle @@ -61,9 +61,9 @@ dependencies { compile "org.eclipse.emf:org.eclipse.emf.common:${VER_ECLISPE_EMF}" compile "org.eclipse.emf:org.eclipse.emf.ecore:${VER_ECLISPE_EMF}" // Some WPT plugins requires OSGI bundle interfaces (but not effectively used) - compile "org.eclipse.platform:org.eclipse.osgi.services:${VER_ECLISPE_PLATFORM}" + compile "org.eclipse.platform:org.eclipse.osgi.services:${VER_ECLIPSE_OSGI_SERVICES}" // Provides document data structure and file buffers for formatters - compile "org.eclipse.platform:org.eclipse.core.filebuffers:${VER_ECLISPE_PLATFORM}" + compile "org.eclipse.platform:org.eclipse.core.filebuffers:${VER_ECLIPSE_FILE_BUFFERS}" // Provides text partitioners for formatters compile ("org.eclipse.platform:org.eclipse.jface.text:${VER_ECLISPE_JFACE}") { exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt' diff --git a/_ext/eclipse-wtp/gradle.properties b/_ext/eclipse-wtp/gradle.properties index a5f52ed9ea..b6f191d259 100644 --- a/_ext/eclipse-wtp/gradle.properties +++ b/_ext/eclipse-wtp/gradle.properties @@ -1,7 +1,7 @@ # Versions correspond to the Eclipse-WTP version used for the fat-JAR. # See https://www.eclipse.org/webtools/ for further information about Eclipse-WTP versions. # Patch version can be incremented independently for backward compatible patches of this library. -ext_version=3.14.0 +ext_version=3.15.0 ext_artifactId=spotless-eclipse-wtp ext_description=Eclipse's WTP formatters bundled for Spotless @@ -12,13 +12,14 @@ ext_group=com.diffplug.spotless ext_VER_JAVA=1.8 # Compile -VER_ECLIPSE_WTP=2019-06 +VER_ECLIPSE_WTP=2019-09 VER_SPOTLESS_ECLISPE_BASE=[3.2.0,4.0.0[ VER_IBM_ICU=[61,62[ -VER_ECLISPE_EMF=[2.12.0,3.0.0[ -VER_ECLISPE_PLATFORM=[3.6.0,4.0.0[ -VER_ECLISPE_JFACE=[3.12.0,4.0.0[ -VER_ECLISPE_EFS=[1.6.0,2.0.0[ +VER_ECLISPE_EMF=[2.16.0,3.0.0[ +VER_ECLIPSE_OSGI_SERVICES=[3.8.0,4.0.0[ +VER_ECLIPSE_FILE_BUFFERS=[3.6.700,4.0.0[ +VER_ECLISPE_JFACE=[3.15.300,4.0.0[ +VER_ECLISPE_EFS=[1.7.500,2.0.0[ VER_ECLISPE_XSD=[2.12.0,3.0.0[ # Provided dependencies diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java index a718ddea3a..f3b267bced 100644 --- a/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java +++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java @@ -30,7 +30,7 @@ private EclipseCdtFormatterStep() {} private static final String NAME = "eclipse cdt formatter"; private static final String FORMATTER_CLASS = "com.diffplug.spotless.extra.eclipse.cdt.EclipseCdtFormatterStepImpl"; - private static final String DEFAULT_VERSION = "4.12.0"; + private static final String DEFAULT_VERSION = "4.13.0"; private static final String FORMATTER_METHOD = "format"; public static String defaultVersion() { diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStep.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStep.java index 610393c121..19c0f1d3f1 100644 --- a/lib-extra/src/main/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStep.java +++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStep.java @@ -35,7 +35,7 @@ private GrEclipseFormatterStep() {} private static final String FORMATTER_CLASS = "com.diffplug.spotless.extra.eclipse.groovy.GrEclipseFormatterStepImpl"; private static final String FORMATTER_CLASS_OLD = "com.diffplug.gradle.spotless.groovy.eclipse.GrEclipseFormatterStepImpl"; private static final String MAVEN_GROUP_ARTIFACT = "com.diffplug.spotless:spotless-eclipse-groovy"; - private static final String DEFAULT_VERSION = "4.12.0"; + private static final String DEFAULT_VERSION = "4.13.0"; private static final String FORMATTER_METHOD = "format"; /** Creates a formatter step using the default version for the given settings file. */ diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStep.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStep.java index 1c68221349..0662b52a15 100644 --- a/lib-extra/src/main/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStep.java +++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStep.java @@ -32,7 +32,7 @@ private EclipseJdtFormatterStep() {} private static final String FORMATTER_CLASS_OLD = "com.diffplug.gradle.spotless.java.eclipse.EclipseFormatterStepImpl"; private static final String FORMATTER_CLASS = "com.diffplug.spotless.extra.eclipse.java.EclipseJdtFormatterStepImpl"; private static final String MAVEN_GROUP_ARTIFACT = "com.diffplug.spotless:spotless-eclipse-jdt"; - private static final String DEFAULT_VERSION = "4.12.0"; + private static final String DEFAULT_VERSION = "4.13.0"; private static final String FORMATTER_METHOD = "format"; public static String defaultVersion() { diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStep.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStep.java index e9961328ed..045fcc3038 100644 --- a/lib-extra/src/main/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStep.java +++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStep.java @@ -37,7 +37,7 @@ public enum EclipseWtpFormatterStep { private static final String NAME = "eclipse wtp formatters"; private static final String FORMATTER_PACKAGE = "com.diffplug.spotless.extra.eclipse.wtp."; - private static final String DEFAULT_VERSION = "4.12.0"; + private static final String DEFAULT_VERSION = "4.13.0"; private static final String FORMATTER_METHOD = "format"; private final String implementationClassName; diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.12.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.12.0.lockfile index a894c93136..6fd639528a 100644 --- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.12.0.lockfile +++ b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.12.0.lockfile @@ -1,5 +1,5 @@ # Spotless formatter based on CDT version 9.8.0 (see https://www.eclipse.org/cdt/) -com.diffplug.spotless:spotless-eclipse-cdt:9.8.0 +com.diffplug.spotless:spotless-eclipse-cdt:9.8.1 com.diffplug.spotless:spotless-eclipse-base:3.2.1 com.google.code.findbugs:annotations:3.0.0 com.google.code.findbugs:jsr305:3.0.0 diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.13.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.13.0.lockfile new file mode 100644 index 0000000000..1d169ff087 --- /dev/null +++ b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.13.0.lockfile @@ -0,0 +1,21 @@ +# Spotless formatter based on CDT version 9.9.0 (see https://www.eclipse.org/cdt/) +com.diffplug.spotless:spotless-eclipse-cdt:9.9.0 +com.diffplug.spotless:spotless-eclipse-base:3.2.1 +com.google.code.findbugs:annotations:3.0.0 +com.google.code.findbugs:jsr305:3.0.0 +com.ibm.icu:icu4j:61.2 +org.eclipse.platform:org.eclipse.core.commands:3.9.500 +org.eclipse.platform:org.eclipse.core.contenttype:3.7.400 +org.eclipse.platform:org.eclipse.core.filebuffers:3.6.700 +org.eclipse.platform:org.eclipse.core.filesystem:1.7.500 +org.eclipse.platform:org.eclipse.core.jobs:3.10.500 +org.eclipse.platform:org.eclipse.core.resources:3.13.500 +org.eclipse.platform:org.eclipse.core.runtime:3.16.0 +org.eclipse.platform:org.eclipse.equinox.app:1.4.300 +org.eclipse.platform:org.eclipse.equinox.common:3.10.500 +org.eclipse.platform:org.eclipse.equinox.preferences:3.7.500 +org.eclipse.platform:org.eclipse.equinox.registry:3.8.500 +org.eclipse.platform:org.eclipse.jface.text:3.15.300 +org.eclipse.platform:org.eclipse.jface:3.17.0 +org.eclipse.platform:org.eclipse.osgi:3.15.0 +org.eclipse.platform:org.eclipse.text:3.9.0 diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.13.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.13.0.lockfile new file mode 100644 index 0000000000..4ee0adb3cf --- /dev/null +++ b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.13.0.lockfile @@ -0,0 +1,18 @@ +# Spotless formatter based on JDT version 4.13.0 (see https://projects.eclipse.org/projects/eclipse.jdt) +# Compare tag in M2 pom with https://git.eclipse.org/c/jdt/eclipse.jdt.core.git/tag/?h=R4_13 to determine core version. +com.diffplug.spotless:spotless-eclipse-jdt:4.8.0 +com.diffplug.spotless:spotless-eclipse-base:3.2.1 +com.google.code.findbugs:annotations:3.0.0 +com.google.code.findbugs:jsr305:3.0.0 +org.eclipse.jdt:org.eclipse.jdt.core:3.19.0 +org.eclipse.platform:org.eclipse.core.commands:3.9.500 +org.eclipse.platform:org.eclipse.core.contenttype:3.7.400 +org.eclipse.platform:org.eclipse.core.jobs:3.10.500 +org.eclipse.platform:org.eclipse.core.resources:3.13.500 +org.eclipse.platform:org.eclipse.core.runtime:3.16.0 +org.eclipse.platform:org.eclipse.equinox.app:1.4.300 +org.eclipse.platform:org.eclipse.equinox.common:3.10.500 +org.eclipse.platform:org.eclipse.equinox.preferences:3.7.500 +org.eclipse.platform:org.eclipse.equinox.registry:3.8.500 +org.eclipse.platform:org.eclipse.osgi:3.15.0 +org.eclipse.platform:org.eclipse.text:3.9.0 diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_wtp_formatters/v4.13.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_wtp_formatters/v4.13.0.lockfile new file mode 100644 index 0000000000..1650402c53 --- /dev/null +++ b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_wtp_formatters/v4.13.0.lockfile @@ -0,0 +1,25 @@ +# Spotless formatter based on Eclipse-WTP version 3.15 (see https://www.eclipse.org/webtools/) +com.diffplug.spotless:spotless-eclipse-wtp:3.15.0 +com.diffplug.spotless:spotless-eclipse-base:3.2.1 +com.google.code.findbugs:annotations:3.0.0 +com.google.code.findbugs:jsr305:3.0.0 +com.ibm.icu:icu4j:61.2 +org.eclipse.emf:org.eclipse.emf.common:2.16.0 +org.eclipse.emf:org.eclipse.emf.ecore:2.19.0 +org.eclipse.platform:org.eclipse.core.commands:3.9.500 +org.eclipse.platform:org.eclipse.core.contenttype:3.7.400 +org.eclipse.platform:org.eclipse.core.filebuffers:3.6.700 +org.eclipse.platform:org.eclipse.core.filesystem:1.7.500 +org.eclipse.platform:org.eclipse.core.jobs:3.10.500 +org.eclipse.platform:org.eclipse.core.resources:3.13.500 +org.eclipse.platform:org.eclipse.core.runtime:3.16.0 +org.eclipse.platform:org.eclipse.equinox.app:1.4.300 +org.eclipse.platform:org.eclipse.equinox.common:3.10.500 +org.eclipse.platform:org.eclipse.equinox.preferences:3.7.500 +org.eclipse.platform:org.eclipse.equinox.registry:3.8.500 +org.eclipse.platform:org.eclipse.jface.text:3.15.300 +org.eclipse.platform:org.eclipse.jface:3.17.0 +org.eclipse.platform:org.eclipse.osgi.services:3.8.0 +org.eclipse.platform:org.eclipse.osgi:3.15.0 +org.eclipse.platform:org.eclipse.text:3.9.0 +org.eclipse.xsd:org.eclipse.xsd:2.12.0 diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/groovy_eclipse_formatter/v4.13.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/groovy_eclipse_formatter/v4.13.0.lockfile new file mode 100644 index 0000000000..aede5b0a76 --- /dev/null +++ b/lib-extra/src/main/resources/com/diffplug/spotless/extra/groovy_eclipse_formatter/v4.13.0.lockfile @@ -0,0 +1,18 @@ +# Spotless formatter based on Groovy-Eclipse version 3.5.0 (see https://github.com/groovy/groovy-eclipse/releases) +com.diffplug.spotless:spotless-eclipse-groovy:3.5.0 +com.diffplug.spotless:spotless-eclipse-base:3.2.1 +com.google.code.findbugs:annotations:3.0.0 +com.google.code.findbugs:jsr305:3.0.0 +org.eclipse.platform:org.eclipse.core.commands:3.9.500 +org.eclipse.platform:org.eclipse.core.contenttype:3.7.400 +org.eclipse.platform:org.eclipse.core.jobs:3.10.500 +org.eclipse.platform:org.eclipse.core.resources:3.13.500 +org.eclipse.platform:org.eclipse.core.runtime:3.16.0 +org.eclipse.platform:org.eclipse.equinox.app:1.4.300 +org.eclipse.platform:org.eclipse.equinox.common:3.10.500 +org.eclipse.platform:org.eclipse.equinox.preferences:3.7.500 +org.eclipse.platform:org.eclipse.equinox.registry:3.8.500 +org.eclipse.platform:org.eclipse.jface.text:3.15.300 +org.eclipse.platform:org.eclipse.jface:3.17.0 +org.eclipse.platform:org.eclipse.osgi:3.15.0 +org.eclipse.platform:org.eclipse.text:3.9.0 diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStepTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStepTest.java index 44058bd896..079f255f93 100644 --- a/lib-extra/src/test/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStepTest.java +++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStepTest.java @@ -24,7 +24,7 @@ public class EclipseCdtFormatterStepTest extends EclipseCommonTests { @Override protected String[] getSupportedVersions() { - return new String[]{"4.7.3a", "4.11.0", "4.12.0"}; + return new String[]{"4.7.3a", "4.11.0", "4.12.0", "4.13.0"}; } @Override diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java index 8f5a803cf4..816b60e45c 100644 --- a/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java +++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java @@ -23,7 +23,7 @@ public class GrEclipseFormatterStepTest extends EclipseCommonTests { @Override protected String[] getSupportedVersions() { - return new String[]{"2.3.0", "4.6.3", "4.8.0", "4.8.1", "4.10.0", "4.12.0"}; + return new String[]{"2.3.0", "4.6.3", "4.8.0", "4.8.1", "4.10.0", "4.12.0", "4.13.0"}; } @Override diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepTest.java index 2cb8d38b1d..04cce4fbfb 100644 --- a/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepTest.java +++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepTest.java @@ -25,7 +25,7 @@ public class EclipseJdtFormatterStepTest extends EclipseCommonTests { @Override protected String[] getSupportedVersions() { return new String[]{"4.6.1", "4.6.2", "4.6.3", "4.7.0", "4.7.1", "4.7.2", "4.7.3a", "4.8.0", "4.9.0", "4.10.0", - "4.11.0", "4.12.0"}; + "4.11.0", "4.12.0", "4.13.0"}; } @Override diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStepTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStepTest.java index de60581d1e..90b2e81258 100644 --- a/lib-extra/src/test/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStepTest.java +++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStepTest.java @@ -76,7 +76,7 @@ public static Iterable data() { @Override protected String[] getSupportedVersions() { - return new String[]{"4.7.3a", "4.7.3b", "4.8.0", "4.12.0"}; + return new String[]{"4.7.3a", "4.7.3b", "4.8.0", "4.12.0", "4.13.0"}; } @Override diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md index dc034781d0..13f2022f2a 100644 --- a/plugin-gradle/CHANGES.md +++ b/plugin-gradle/CHANGES.md @@ -1,10 +1,16 @@ # spotless-plugin-gradle releases ### Version 3.26.0-SNAPSHOT - TBD ([javadoc](https://diffplug.github.io/spotless/javadoc/snapshot/), [snapshot](https://oss.sonatype.org/content/repositories/snapshots/com/diffplug/spotless/spotless-plugin-gradle/)) -* Fix project URLs in poms. ([#478](https://github.com/diffplug/spotless/pull/478)) +* Fix project URLs in poms. ([#478](https://github.com/diffplug/spotless/pull/478)) * Fix `ImportSorter` crashing with empty files. ([#474](https://github.com/diffplug/spotless/pull/474)) * Fixes [#305](https://github.com/diffplug/spotless/issues/305) StringIndexOutOfBoundsException for empty Groovy file when performing importOrder +* Bugfix: CDT version `4.12.0` now properly uses `9.8`, whereas before it used `9.7`. ([#482](https://github.com/diffplug/spotless/pull/482#discussion_r341380884)) +* Updated default eclipse-wtp from 4.12.0 to 4.13.0 ([#482](https://github.com/diffplug/spotless/pull/482)). +* Updated default eclipse-groovy from 4.12.0 to 4.13.0 ([#482](https://github.com/diffplug/spotless/pull/482)). +* Updated default eclipse-jdt from 4.12.0 to 4.13.0 ([#482](https://github.com/diffplug/spotless/pull/482)). +* Updated default eclipse-cdt from 4.12.0 to 4.13.0 ([#482](https://github.com/diffplug/spotless/pull/482)). + ### Version 3.25.0 - October 6th 2019 ([javadoc](https://diffplug.github.io/spotless/javadoc/spotless-plugin-gradle/3.25.0/), [jcenter](https://bintray.com/diffplug/opensource/spotless-plugin-gradle/3.25.0)) @@ -42,6 +48,7 @@ * Updated default eclipse-groovy from 4.10 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)). * Updated default eclipse-jdt from 4.11.0 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)). * Updated default eclipse-cdt from 4.11.0 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)). + * **KNOWN BUG - accidentally published CDT 9.7 rather than 9.8 - fixed in 3.26.0** * Added new maven coordinates for scalafmt 2.0.0+, maintains backwards compatability ([#415](https://github.com/diffplug/spotless/issues/415)) ### Version 3.23.1 - June 17th 2019 ([javadoc](https://diffplug.github.io/spotless/javadoc/spotless-plugin-gradle/3.23.1/), [jcenter](https://bintray.com/diffplug/opensource/spotless-plugin-gradle/3.23.1)) diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md index 16e2617644..a82674a792 100644 --- a/plugin-maven/CHANGES.md +++ b/plugin-maven/CHANGES.md @@ -1,10 +1,15 @@ # spotless-plugin-maven releases ### Version 1.26.0-SNAPSHOT - TBD ([javadoc](https://diffplug.github.io/spotless/javadoc/spotless-maven-plugin/snapshot/), [snapshot](https://oss.sonatype.org/content/repositories/snapshots/com/diffplug/spotless/spotless-maven-plugin/)) -* Fix project URLs in poms. ([#478](https://github.com/diffplug/spotless/pull/478)) +* Fix project URLs in poms. ([#478](https://github.com/diffplug/spotless/pull/478)) * Fix `ImportSorter` crashing with empty files. ([#474](https://github.com/diffplug/spotless/pull/474)) * Fixes [#305](https://github.com/diffplug/spotless/issues/305) StringIndexOutOfBoundsException for empty Groovy file when performing importOrder +* Bugfix: CDT version `4.12.0` now properly uses `9.8`, whereas before it used `9.7`. ([#482](https://github.com/diffplug/spotless/pull/482#discussion_r341380884)) +* Updated default eclipse-wtp from 4.12.0 to 4.13.0 ([#482](https://github.com/diffplug/spotless/pull/482)). +* Updated default eclipse-groovy from 4.12.0 to 4.13.0 ([#482](https://github.com/diffplug/spotless/pull/482)). +* Updated default eclipse-jdt from 4.12.0 to 4.13.0 ([#482](https://github.com/diffplug/spotless/pull/482)). +* Updated default eclipse-cdt from 4.12.0 to 4.13.0 ([#482](https://github.com/diffplug/spotless/pull/482)). ### Version 1.25.1 - October 7th 2019 ([javadoc](https://diffplug.github.io/spotless/javadoc/spotless-maven-plugin/1.25.1/), [jcenter](https://bintray.com/diffplug/opensource/spotless-maven-plugin/1.25.1)) @@ -33,6 +38,7 @@ * Updated default eclipse-groovy from 4.10 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)). * Updated default eclipse-jdt from 4.11.0 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)). * Updated default eclipse-cdt from 4.11.0 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)). + * **KNOWN BUG - accidentally published CDT 9.7 rather than 9.8 - fixed in 1.26.0** * Added new maven coordinates for scalafmt 2.0.0+, maintains backwards compatability ([#415](https://github.com/diffplug/spotless/issues/415)) ### Version 1.23.1 - June 17th 2019 ([javadoc](https://diffplug.github.io/spotless/javadoc/spotless-maven-plugin/1.23.1/), [jcenter](https://bintray.com/diffplug/opensource/spotless-maven-plugin/1.23.1))