Add support for eclipse 4.13 by k-brooks · Pull Request #482 · diffplug/spotless

k-brooks · 2019-10-31T21:46:11Z

Part 1 of 2: _ext wrapper updates to support 4.13
I broke out (and ordered) the commits by subproject intentionally, although, without project linking / publishing, I have not been able to properly build/test the dependent projects.
I have not attempted to publish, wasn't clear on the process.
Part 2 will come once these libraries have published.

Would you be interested in having the ext projects cleaned up? It would be nice to have project dependencies across these, and potentially the 'root' project.

k-brooks · 2019-10-31T21:50:30Z

 ext_VER_JAVA=1.8

 # Compile dependencies
-VER_ECLIPSE_CDT=9.7


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

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

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

nedtwigg

Looks like a great start! From here, you are blocked on me publishing these new _ext jars, I'll let you know when that is complete. I'll push some small changes to this branch as well.

Re: combining build with the main project. The problem is that the builds for these are really slow because of p2, and I don't know of a good way to speed them up. I am open to a build refactor (best to do in a separate PR to prevent blocking this PR), but it needs to not slow down the current build. Everything in _ext is pretty specialized, it's important for regular java devs to not have to deal with this when contributing normal mavenCentral-based formatters.

nedtwigg · 2019-10-31T22:00:08Z

 # 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


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.

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?

nedtwigg · 2019-10-31T22:02:02Z

 ext_VER_JAVA=1.8

 # Compile dependencies
-VER_ECLIPSE_CDT=9.7


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

This reverts commit 8f167b8.

This reverts commit 1260246.

This reverts commit 85e2f33.

nedtwigg · 2019-10-31T22:20:59Z

@fvgh before I publish this, can you confirm that this is true:

we don't need to publish a new ext-eclipse-base
we don't need to publish a new ext-eclipse-jdt

This is because we can just update lockfiles for jdt. I do need to publish new jars for groovy, cdt, and wtp. Are we missing anything important?

nedtwigg · 2019-11-01T07:56:08Z

Can you give me push permissions on your PR branch?

https://github.com/Vestmark/spotless: git-receive-pack not permitted on 'https://github.com/Vestmark/spotless/'

If not, can you move your issue_480-ext to match the DiffPlug repo? I published the eclipse-cdt 9.8.1 bundled jar, and updated the corresponding lockfile. I also published eclipse-cdt 9.9.0, and I leave it to you to do the lockfile. When we get confirmation from @fvgh that we have done this correctly, then we can move forward with wtp, groovy, and jdt.

fvgh · 2019-11-01T09:11:07Z

Thanks for all your effort. I am really busy at the moment, hence I did not find time to contribute. So if the _ext tests are passing I am fine with the changes. If you get stuck anywhere, let me know. I'll try to answer within 24 hours.

k-brooks · 2019-11-01T12:02:00Z

Can you give me push permissions on your PR branch?
https://github.com/Vestmark/spotless: git-receive-pack not permitted on 'https://github.com/Vestmark/spotless/'
If not, can you move your issue_480-ext to match the DiffPlug repo? I published the eclipse-cdt 9.8.1 bundled jar, and updated the corresponding lockfile. I also published eclipse-cdt 9.9.0, and I leave it to you to do the lockfile. When we get confirmation from @fvgh that we have done this correctly, then we can move forward with wtp, groovy, and jdt.

My apologies @nedtwigg , I thought had checked that box, but perhaps you require permissions at the repo level? I granted you maintenance permissions for the Vestmark fork - if that does not work, then I will push this branch to the Diffplug repo, instead.

k-brooks · 2019-11-01T12:10:18Z

Looks like a great start! From here, you are blocked on me publishing these new _ext jars, I'll let you know when that is complete. I'll push some small changes to this branch as well.
Re: combining build with the main project. The problem is that the builds for these are really slow because of p2, and I don't know of a good way to speed them up. I am open to a build refactor (best to do in a separate PR to prevent blocking this PR), but it needs to not slow down the current build. Everything in _ext is pretty specialized, it's important for regular java devs to not have to deal with this when contributing normal mavenCentral-based formatters.

#483 opened to capture the build work, will comment with thoughts on that thread.

k-brooks · 2019-11-01T16:55:39Z

+
+### 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)).


k-brooks · 2019-11-01T16:56:43Z

+ext_version=9.9.0
 ext_artifactId=spotless-eclipse-cdt
-ext_description=Eclipse's CDT C/C++ formatter bundled for Spotless
+ext_description=Eclipse''s CDT C/C++ formatter bundled for Spotless


not a huge deal, but a typo here, I can fix it but didn't want to mess with your work

The syntax highlighter in VSCode seemed to think I needed to escape the single-quote. That surprised me, and I think it turns out to be wrong. A fix would be appreciated!
.properties spec does not need double-quote
.properties resource bundle does need double-quote

nedtwigg · 2019-11-01T17:40:59Z

I think we have published everything we need so that you can now do the lockfiles for CDT and for JDT. When those are working, I'll publish the jars for WTP and groovy, and then you can do the lockfiles for those too, and then we can merge and publish!

k-brooks · 2019-11-01T18:46:45Z

JDT & CDT are up, thanks again!

…kfiles for cdt/jdt.

nedtwigg · 2019-11-01T19:49:06Z

In the lockfiles, even though eclipse-base can be 3.2.0, we get a bugfix if we ask for 3.2.1.

ext-eclipse-groovy 3.5.0 is up and ready for lockfiles.

ext-eclipse-wtp 3.15.0 is erroring for me, so it is not up:

> gradle -b _ext/eclipse-wtp/build.gradle jar
...
Could not resolve all files for configuration ':compileClasspath'.
> Could not find any version that matches org.eclipse.platform:org.eclipse.core.filebuffers:[3.8.0,4.0.0[.
Versions that do not match:
3.6.700
3.6.600
3.6.500
3.6.400
3.6.300
+ 3 more
Searched in the following locations:
https://repo.maven.apache.org/maven2/org/eclipse/platform/org.eclipse.core.filebuffers/maven-metadata.xml
https://jcenter.bintray.com/org/eclipse/platform/org.eclipse.core.filebuffers/maven-metadata.xml
file:/Users/ntwigg/.m2/repository/org/eclipse/platform/org.eclipse.core.filebuffers/maven-metadata.xml
file:/Users/ntwigg/.m2/repository/org/eclipse/platform/org.eclipse.core.filebuffers/
file:/Users/ntwigg/Documents/dev/spotless/_ext/eclipse-wtp/build/p2asmaven/maven/org/eclipse/platform/org.eclipse.core.filebuffers/maven-metadata.xml
file:/Users/ntwigg/Documents/dev/spotless/_ext/eclipse-wtp/build/p2asmaven/maven/org/eclipse/platform/org.eclipse.core.filebuff

k-brooks · 2019-11-01T21:35:23Z

@nedtwigg - sorry for the compile error - looks like the two artifacts (osgi services and filebuffers) diverged in their versioning, updated accordingly
Lock file(s) to follow shortly

k-brooks · 2019-11-04T15:55:29Z

@nedtwigg - I have the wtp formatter lock file staged, ready when you are :-)

fvgh

The rest looks good to me. Thanks again for your work.

nedtwigg · 2019-11-06T19:30:50Z

eclipse-wtp 3.15.0 is published (sorry for delay)

k-brooks · 2019-11-06T23:03:14Z

Looks like wtp 3.15.0 has not propagated?
Caused by: org.eclipse.aether.resolution.ArtifactResolutionException: Could not find artifact com.diffplug.spotless:spotless-eclipse-wtp:jar:3.15.0 in google-maven-central

nedtwigg · 2019-11-06T23:17:48Z

It claims to be published here: https://bintray.com/diffplug/opensource/spotless-eclipse-wtp#

And the mavenCentral sync also claims to be successful. I restart the CI build later today.

k-brooks · 2019-11-06T23:20:24Z

Odd - I was able to run tests locally (assuming travis is running gradlew check, or some derivative thereof), I did not see that failure.

nedtwigg · 2019-11-07T17:52:39Z

I reran the build, looks like we're passing CI now! This looks ready to merge to me, except it needs changelog entries for plugin-maven and plugin-gradle.

k-brooks · 2019-11-07T18:22:54Z

changelogs updated, thanks again for all your help @nedtwigg !

nedtwigg · 2019-11-12T05:51:10Z

Released in x.26.0

k-brooks added 5 commits October 31, 2019 17:25

eclipse-base update for 4.13 (#480)
8f167b8

eclipse-jdt update for 4.13 (#480)
1260246

eclipse-cdt update for 4.13 (#480)
85e2f33

eclipse-wtp update for 4.13 (#480)
02e3223

eclipse-groovy update for 4.13 (#480)
1b8ef41

k-brooks commented Oct 31, 2019
View reviewed changes

nedtwigg reviewed Oct 31, 2019
View reviewed changes

nedtwigg added 3 commits October 31, 2019 15:14

Revert "eclipse-base update for 4.13 (#480)"
ce6662f
This reverts commit 8f167b8.

Revert "eclipse-jdt update for 4.13 (#480)"
d4d01bf
This reverts commit 1260246.

Revert "eclipse-cdt update for 4.13 (#480)"
6c452fe
This reverts commit 85e2f33.

nedtwigg added 2 commits October 31, 2019 21:53

Publish eclipse-cdt 9.8.1.
0b00d79

Publish eclipse-cdt 9.9.0.
d1c8512

fvgh approved these changes Nov 1, 2019
View reviewed changes

k-brooks commented Nov 1, 2019
View reviewed changes

k-brooks added 3 commits November 1, 2019 13:56

revert extra quote (#480)
8c55363

remove version bump to eclipse base (#480)
1c4cb71

cdt/jdt eclipse 4.13 support (#480)
4b63e09

nedtwigg added 2 commits November 1, 2019 12:23

Bump the eclips-base dependency from 3.2.0 to 3.2.1 in the 4.13.0 loc…
15b33b6
…kfiles for cdt/jdt.

Publish groovy 3.5.0
e4ee903

nedtwigg changed the title ~~Issue 480 ext~~Add support for eclipse 4.13Nov 1, 2019

eclipse platform versioning split (#480)
1ad30a8

eclipse 4.13 groovy formatter (#480)
0309d60

fvgh requested changes Nov 4, 2019
View reviewed changes

Comment thread...tra/src/main/resources/com/diffplug/spotless/extra/groovy_eclipse_formatter/v4.13.0.lockfile Outdated

nedtwigg added 2 commits November 6, 2019 09:46

Publish eclipse-wtp 3.15.0
008ac4f

Remove SWT from the groovy lockfile, per@fvgh's advice
7b249b9

k-brooks added 2 commits November 6, 2019 18:13

Eclipse 4.13 support for wtp (#480)
3c86339

Remove swt dependency from cdt lockfile (#480)
52a1d95

Update changelogs (#480)
75f32f9

nedtwigg merged commit 04d5c7d into diffplug:masterNov 7, 2019

k-brooks deleted the issue_480-ext branch November 7, 2019 20:50


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

Uh oh!

Conversation

k-brooks commented Oct 31, 2019

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nedtwigg left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nedtwigg commented Oct 31, 2019

Uh oh!

nedtwigg commented Nov 1, 2019

Uh oh!

fvgh commented Nov 1, 2019

Uh oh!

k-brooks commented Nov 1, 2019• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

k-brooks commented Nov 1, 2019

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nedtwigg commented Nov 1, 2019

Uh oh!

k-brooks commented Nov 1, 2019

Uh oh!

nedtwigg commented Nov 1, 2019

Uh oh!

k-brooks commented Nov 1, 2019

Uh oh!

k-brooks commented Nov 4, 2019

Uh oh!

fvgh left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

nedtwigg commented Nov 6, 2019

Uh oh!

k-brooks commented Nov 6, 2019

Uh oh!

nedtwigg commented Nov 6, 2019

Uh oh!

k-brooks commented Nov 6, 2019

Uh oh!

nedtwigg commented Nov 7, 2019

Uh oh!

k-brooks commented Nov 7, 2019

Uh oh!

nedtwigg commented Nov 12, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

k-brooks commented Nov 1, 2019•
edited
Loading