Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for eclipse 4.13 #482

Merged
merged 22 commits into from Nov 7, 2019
Merged

Add support for eclipse 4.13 #482

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
8f167b8
eclipse-base update for 4.13 (#480)
Oct 31, 2019
1260246
eclipse-jdt update for 4.13 (#480)
Oct 31, 2019
85e2f33
eclipse-cdt update for 4.13 (#480)
Oct 31, 2019
02e3223
eclipse-wtp update for 4.13 (#480)
Oct 31, 2019
1b8ef41
eclipse-groovy update for 4.13 (#480)
Oct 31, 2019
ce6662f
Revert "eclipse-base update for 4.13 (#480)"
nedtwigg Oct 31, 2019
d4d01bf
Revert "eclipse-jdt update for 4.13 (#480)"
nedtwigg Oct 31, 2019
6c452fe
Revert "eclipse-cdt update for 4.13 (#480)"
nedtwigg Oct 31, 2019
0b00d79
Publish eclipse-cdt 9.8.1.
nedtwigg Nov 1, 2019
d1c8512
Publish eclipse-cdt 9.9.0.
nedtwigg Nov 1, 2019
8c55363
revert extra quote (#480)
Nov 1, 2019
1c4cb71
remove version bump to eclipse base (#480)
Nov 1, 2019
4b63e09
cdt/jdt eclipse 4.13 support (#480)
Nov 1, 2019
15b33b6
Bump the eclips-base dependency from 3.2.0 to 3.2.1 in the 4.13.0 loc…
nedtwigg Nov 1, 2019
e4ee903
Publish groovy 3.5.0
nedtwigg Nov 1, 2019
1ad30a8
eclipse platform versioning split (#480)
Nov 1, 2019
0309d60
eclipse 4.13 groovy formatter (#480)
Nov 4, 2019
008ac4f
Publish eclipse-wtp 3.15.0
nedtwigg Nov 6, 2019
7b249b9
Remove SWT from the groovy lockfile, per @fvgh's advice
nedtwigg Nov 6, 2019
3c86339
Eclipse 4.13 support for wtp (#480)
Nov 6, 2019
52a1d95
Remove swt dependency from cdt lockfile (#480)
Nov 6, 2019
75f32f9
Update changelogs (#480)
Nov 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions _ext/eclipse-base/CHANGES.md
View file
Open in desktop
@@ -1,5 +1,9 @@
# spotless-eclipse-base

### Version 3.3.0 - October 31st 2019 ([artifact]([jcenter](https://bintray.com/diffplug/opensource/spotless-eclipse-base)))

* Added support of Eclipse 4.13 framework. ([#480](https://github.com/diffplug/spotless/issues/480))

### Version 3.2.1 - September 3rd 2019 ([artifact]([jcenter](https://bintray.com/diffplug/opensource/spotless-eclipse-base)))

* Fixed deletion of temporary workspace. ([#447](https://github.com/diffplug/spotless/issues/447))
Expand Down
4 changes: 2 additions & 2 deletions _ext/eclipse-base/gradle.properties
View file
Open in desktop
@@ -1,7 +1,7 @@
# Mayor versions correspond to the supported Eclipse core version.
# Minor version is incremented for features or incompatible changes (including changes to supported dependency versions).
# Patch version is incremented for backward compatible patches of this library.
ext_version=3.2.1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we don't change the code in eclipse-base, then we don't need to publish a new eclipse-base. We only change this when something about the OSGi plumbing needs to change, which is generally rare.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was under the impression that the compile-scoped dependencies were included in the fat jar, but if that is incorrect, then I can back this and the related changes out.
Are you OK with me rewriting these commits to suit, or would you prefer new commits?

ext_version=3.3.0
ext_artifactId=spotless-eclipse-base
ext_description=Eclipse bundle controller and services for Spotless

Expand All @@ -12,7 +12,7 @@ ext_group=com.diffplug.spotless
ext_VER_JAVA=1.8

# Compile dependencies
VER_ECLIPSE_CORE_RESOURCES=[3.13.400,4.0.0[
VER_ECLIPSE_CORE_RESOURCES=[3.13.500,4.0.0[

# Provided dependencies
VER_SLF4J=[1.6,2.0[
4 changes: 4 additions & 0 deletions _ext/eclipse-cdt/CHANGES.md
View file
Open in desktop
@@ -1,5 +1,9 @@
# 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.0 - July 24th 2019 ([artifact]([jcenter](https://bintray.com/diffplug/opensource/spotless-eclipse-cdt)))

* Switch to Eclipse CDT release 9.8 for Eclipse 4.12 ([#423](https://github.com/diffplug/spotless/pull/423)).
Expand Down
11 changes: 5 additions & 6 deletions _ext/eclipse-cdt/gradle.properties
View file
Open in desktop
@@ -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
Expand All @@ -11,11 +11,10 @@ ext_group=com.diffplug.spotless
ext_VER_JAVA=1.8

# Compile dependencies
VER_ECLIPSE_CDT=9.7
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm wondering if this was a bug in the eclipse-cdt release of 9.8, as it referenced 9.7

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch! I looked at it, and I believe you are correct. I should publish a 9.8.1 bugfix.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the fix. I really missed to commit the vital change.

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_ECLIPSE_CDT=9.9
VER_SPOTLESS_ECLISPE_BASE=[3.3.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
Expand Down
4 changes: 4 additions & 0 deletions _ext/eclipse-groovy/CHANGES.md
View file
Open in desktop
@@ -1,5 +1,9 @@
# spotless-eclipse-groovy

### Version 3.5.0 - October 31st 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)).
Expand Down
10 changes: 5 additions & 5 deletions _ext/eclipse-groovy/gradle.properties
View file
Open in desktop
@@ -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

Expand All @@ -12,10 +12,10 @@ ext_group=com.diffplug.spotless
ext_VER_JAVA=1.8

# Compile
VER_ECLIPSE=4.12
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_ECLIPSE=4.13
VER_SPOTLESS_ECLISPE_BASE=[3.3.0,4.0.0[
VER_ECLISPE_JFACE=[3.15.300,4.0.0[
VER_GRECLIPSE=3.5.0
VER_GROOVY=3.0.0

# Provided dependencies
Expand Down
6 changes: 3 additions & 3 deletions _ext/eclipse-jdt/gradle.properties
View file
Open in desktop
@@ -1,6 +1,6 @@
# Mayor/Minor versions correspond to the minimum Eclipse version supported/tested.
# Patch version is incremented for backward compatible patches of this library.
ext_version=4.12.0
ext_version=4.13.0
ext_artifactId=spotless-eclipse-jdt
ext_description=Eclipse's JDT formatter bundled for Spotless

Expand All @@ -11,5 +11,5 @@ ext_group=com.diffplug.spotless
ext_VER_JAVA=1.8

# Compile
VER_ECLIPSE_JDT_CORE=[3.12.0,4.0.0[
VER_SPOTLESS_ECLISPE_BASE=[3.2.0,4.0.0[
VER_ECLIPSE_JDT_CORE=[3.19.0,4.0.0[
VER_SPOTLESS_ECLISPE_BASE=[3.3.0,4.0.0[
4 changes: 4 additions & 0 deletions _ext/eclipse-wtp/CHANGES.md
View file
Open in desktop
@@ -1,5 +1,9 @@
# spotless-eclipse-wtp

### Version 3.15.0 - October 31st 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)).
Expand Down
14 changes: 7 additions & 7 deletions _ext/eclipse-wtp/gradle.properties
View file
Open in desktop
@@ -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

Expand All @@ -12,13 +12,13 @@ ext_group=com.diffplug.spotless
ext_VER_JAVA=1.8

# Compile
VER_ECLIPSE_WTP=2019-06
VER_SPOTLESS_ECLISPE_BASE=[3.2.0,4.0.0[
VER_ECLIPSE_WTP=2019-09
VER_SPOTLESS_ECLISPE_BASE=[3.3.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_ECLISPE_PLATFORM=[3.8.0,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
Expand Down