Skip to content

Commit 04d5c7d

Browse files
nedtwiggnedtwigg
authored
Merge pull request #482 from Vestmark/issue_480-ext
Add support for eclipse 4.13
2 parents 3a2620b + 75f32f9 commit 04d5c7d

File tree

23 files changed

+147
-30
lines changed

23 files changed

+147
-30
lines changed

‎CHANGES.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,13 @@ You might be looking for:
66
- [plugin-maven/CHANGES.md](plugin-maven/CHANGES.md)
77

88
### 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/))
9-
* Fix project URLs in poms. ([#478](https://github.com/diffplug/spotless/pull/478))
109

10+
* Fix project URLs in poms. ([#478](https://github.com/diffplug/spotless/pull/478))
1111
* Fix `ImportSorter` crashing with empty files. ([#474](https://github.com/diffplug/spotless/pull/474))
1212
* Fixes [#305](https://github.com/diffplug/spotless/issues/305) StringIndexOutOfBoundsException for empty Groovy file when performing importOrder
13+
* 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))
14+
15+
* Add support for Eclipse 4.13 and all related formatters (JDT, CDT, WTP, and Groovy). ([#480](https://github.com/diffplug/spotless/issues/480))
1316

1417
* bump default version of KtLint from `0.34.2` to `0.35.0`
1518

@@ -42,6 +45,7 @@ You might be looking for:
4245
* Updated default eclipse-groovy from 4.10 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)).
4346
* Updated default eclipse-jdt from 4.11.0 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)).
4447
* Updated default eclipse-cdt from 4.11.0 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)).
48+
* **KNOWN BUG - accidentally published CDT 9.7 rather than 9.8 - fixed in 1.26.0**
4549
* Added new maven coordinates for scalafmt 2.0.0+, maintains backwards compatability ([#415](https://github.com/diffplug/spotless/issues/415))
4650

4751
### 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)))

‎_ext/eclipse-cdt/CHANGES.md‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,22 @@
11
# spotless-eclipse-cdt
22

3+
### Version 9.9.0 - October 31st 2019 ([artifact]([jcenter](https://bintray.com/diffplug/opensource/spotless-eclipse-cdt)))
4+
5+
* Switch to Eclipse CDT release 9.9 for Eclipse 4.13 ([#480](https://github.com/diffplug/spotless/issues/480)).
6+
7+
### Version 9.8.1 - October 31st 2019 ([artifact]([jcenter](https://bintray.com/diffplug/opensource/spotless-eclipse-cdt)))
8+
9+
* Really publish Eclipse CDT release 9.8 for Eclipse 4.12 ([#482](https://github.com/diffplug/spotless/pull/482)).
10+
311
### Version 9.8.0 - July 24th 2019 ([artifact]([jcenter](https://bintray.com/diffplug/opensource/spotless-eclipse-cdt)))
412

13+
**Known bug - we actually published Eclipse CDT 9.7 instead of 9.8 - fixed in 9.8.1**
14+
515
* Switch to Eclipse CDT release 9.8 for Eclipse 4.12 ([#423](https://github.com/diffplug/spotless/pull/423)).
616

717
### Version 9.7.0 - March 31st 2019 ([artifact]([jcenter](https://bintray.com/diffplug/opensource/spotless-eclipse-cdt)))
818

9-
* Switch to Eclipse CTD release 9.7 for Eclipse 4.11 ([#389](https://github.com/diffplug/spotless/pull/389)).
19+
* Switch to Eclipse CDT release 9.7 for Eclipse 4.11 ([#389](https://github.com/diffplug/spotless/pull/389)).
1020
* Include Eclipse logging allowing formatter warnings/errors to be logged via SLF4J ([#236](https://github.com/diffplug/spotless/issues/236)).
1121

1222
### Version 9.4.5 - February 25th 2019 ([artifact]([jcenter](https://bintray.com/diffplug/opensource/spotless-eclipse-cdt)))

‎_ext/eclipse-cdt/gradle.properties‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Versions correspond to the Eclipse-CDT version used for the fat-JAR.
22
# See https://www.eclipse.org/cdt/ for further information about Eclipse-CDT versions.
33
# Patch version can be incremented independently for backward compatible patches of this library.
4-
ext_version=9.8.0
4+
ext_version=9.9.0
55
ext_artifactId=spotless-eclipse-cdt
66
ext_description=Eclipse's CDT C/C++ formatter bundled for Spotless
77
ext_org=diffplug
@@ -11,11 +11,10 @@ ext_group=com.diffplug.spotless
1111
ext_VER_JAVA=1.8
1212

1313
# Compile dependencies
14-
VER_ECLIPSE_CDT=9.7
14+
VER_ECLIPSE_CDT=9.9
1515
VER_SPOTLESS_ECLISPE_BASE=[3.2.0,4.0.0[
16-
VER_ECLISPE_JFACE=[3.12.0,4.0.0[
17-
VER_ECLISPE_WORKBENCH=[3.11.0,4.0.0[
18-
VER_ECLISPE_PLATFORM=[3.6.0,4.0.0[
16+
VER_ECLISPE_JFACE=[3.15.300,4.0.0[
17+
VER_ECLISPE_PLATFORM=[3.6.700,4.0.0[
1918
VER_IBM_ICU=[61,62[
2019

2120
# Provided dependencies

‎_ext/eclipse-groovy/CHANGES.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# spotless-eclipse-groovy
22

3+
### Version 3.5.0 - November 1st 2019 ([artifact]([jcenter](https://bintray.com/diffplug/opensource/spotless-eclipse-groovy)))
4+
5+
* Switch to Groovy-Eclipse release 3.5.0 for Eclipse 4.13 ([#480](https://github.com/diffplug/spotless/issues/480)).
6+
37
### Version 3.4.0 - July 24th 2019 ([artifact]([jcenter](https://bintray.com/diffplug/opensource/spotless-eclipse-groovy)))
48

59
* 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)).

‎_ext/eclipse-groovy/gradle.properties‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Versions correspond to the Groovy-Eclipse version used for the fat-JAR.
22
# See https://github.com/groovy/groovy-eclipse/releases for further information about Groovy-Eclipse versions.
33
# Patch version can be incremented independently for backward compatible patches of this library.
4-
ext_version=3.4.0
4+
ext_version=3.5.0
55
ext_artifactId=spotless-eclipse-groovy
66
ext_description=Groovy Eclipse's formatter bundled for Spotless
77

@@ -12,10 +12,10 @@ ext_group=com.diffplug.spotless
1212
ext_VER_JAVA=1.8
1313

1414
# Compile
15-
VER_ECLIPSE=4.12
15+
VER_ECLIPSE=4.13
1616
VER_SPOTLESS_ECLISPE_BASE=[3.2.0,4.0.0[
17-
VER_ECLISPE_JFACE=[3.12.0,4.0.0[
18-
VER_GRECLIPSE=3.4.0
17+
VER_ECLISPE_JFACE=[3.15.300,4.0.0[
18+
VER_GRECLIPSE=3.5.0
1919
VER_GROOVY=3.0.0
2020

2121
# Provided dependencies

‎_ext/eclipse-wtp/CHANGES.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# spotless-eclipse-wtp
22

3+
### Version 3.15.0 - November 6th 2019 ([artifact]([jcenter](https://bintray.com/diffplug/opensource/spotless-eclipse-wtp)))
4+
5+
* Switch to Eclipse WTP release 3.15.0 for Eclipse 4.13 ([#480](https://github.com/diffplug/spotless/issues/480)).
6+
37
### Version 3.14.0 - July 24th 2019 ([artifact]([jcenter](https://bintray.com/diffplug/opensource/spotless-eclipse-wtp)))
48

59
* Switch to Eclipse WTP release 3.14.0 for Eclipse 4.12 ([#423](https://github.com/diffplug/spotless/pull/423)).

‎_ext/eclipse-wtp/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ dependencies {
6161
compile "org.eclipse.emf:org.eclipse.emf.common:${VER_ECLISPE_EMF}"
6262
compile "org.eclipse.emf:org.eclipse.emf.ecore:${VER_ECLISPE_EMF}"
6363
// Some WPT plugins requires OSGI bundle interfaces (but not effectively used)
64-
compile "org.eclipse.platform:org.eclipse.osgi.services:${VER_ECLISPE_PLATFORM}"
64+
compile "org.eclipse.platform:org.eclipse.osgi.services:${VER_ECLIPSE_OSGI_SERVICES}"
6565
// Provides document data structure and file buffers for formatters
66-
compile "org.eclipse.platform:org.eclipse.core.filebuffers:${VER_ECLISPE_PLATFORM}"
66+
compile "org.eclipse.platform:org.eclipse.core.filebuffers:${VER_ECLIPSE_FILE_BUFFERS}"
6767
// Provides text partitioners for formatters
6868
compile ("org.eclipse.platform:org.eclipse.jface.text:${VER_ECLISPE_JFACE}") {
6969
exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt'

‎_ext/eclipse-wtp/gradle.properties‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Versions correspond to the Eclipse-WTP version used for the fat-JAR.
22
# See https://www.eclipse.org/webtools/ for further information about Eclipse-WTP versions.
33
# Patch version can be incremented independently for backward compatible patches of this library.
4-
ext_version=3.14.0
4+
ext_version=3.15.0
55
ext_artifactId=spotless-eclipse-wtp
66
ext_description=Eclipse's WTP formatters bundled for Spotless
77

@@ -12,13 +12,14 @@ ext_group=com.diffplug.spotless
1212
ext_VER_JAVA=1.8
1313

1414
# Compile
15-
VER_ECLIPSE_WTP=2019-06
15+
VER_ECLIPSE_WTP=2019-09
1616
VER_SPOTLESS_ECLISPE_BASE=[3.2.0,4.0.0[
1717
VER_IBM_ICU=[61,62[
18-
VER_ECLISPE_EMF=[2.12.0,3.0.0[
19-
VER_ECLISPE_PLATFORM=[3.6.0,4.0.0[
20-
VER_ECLISPE_JFACE=[3.12.0,4.0.0[
21-
VER_ECLISPE_EFS=[1.6.0,2.0.0[
18+
VER_ECLISPE_EMF=[2.16.0,3.0.0[
19+
VER_ECLIPSE_OSGI_SERVICES=[3.8.0,4.0.0[
20+
VER_ECLIPSE_FILE_BUFFERS=[3.6.700,4.0.0[
21+
VER_ECLISPE_JFACE=[3.15.300,4.0.0[
22+
VER_ECLISPE_EFS=[1.7.500,2.0.0[
2223
VER_ECLISPE_XSD=[2.12.0,3.0.0[
2324

2425
# Provided dependencies

‎lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ private EclipseCdtFormatterStep() {}
3030

3131
private static final String NAME = "eclipse cdt formatter";
3232
private static final String FORMATTER_CLASS = "com.diffplug.spotless.extra.eclipse.cdt.EclipseCdtFormatterStepImpl";
33-
private static final String DEFAULT_VERSION = "4.12.0";
33+
private static final String DEFAULT_VERSION = "4.13.0";
3434
private static final String FORMATTER_METHOD = "format";
3535

3636
public static String defaultVersion() {

‎lib-extra/src/main/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStep.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ private GrEclipseFormatterStep() {}
3535
private static final String FORMATTER_CLASS = "com.diffplug.spotless.extra.eclipse.groovy.GrEclipseFormatterStepImpl";
3636
private static final String FORMATTER_CLASS_OLD = "com.diffplug.gradle.spotless.groovy.eclipse.GrEclipseFormatterStepImpl";
3737
private static final String MAVEN_GROUP_ARTIFACT = "com.diffplug.spotless:spotless-eclipse-groovy";
38-
private static final String DEFAULT_VERSION = "4.12.0";
38+
private static final String DEFAULT_VERSION = "4.13.0";
3939
private static final String FORMATTER_METHOD = "format";
4040

4141
/** Creates a formatter step using the default version for the given settings file. */

0 commit comments

Comments
 (0)