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

Added support for eclipse-jdt 4.14.0, 4.15.0 and 4.16.0 #678

Merged
merged 1 commit into from
Aug 29, 2020
Merged

Added support for eclipse-jdt 4.14.0, 4.15.0 and 4.16.0 #678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ 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
* Added support for eclipse-jdt 4.14.0, 4.15.0 and 4.16.0 ([#678](https://github.com/diffplug/spotless/pull/678)).
### Changed
* Updated default eclipse-jdt from 4.13.0 to 4.16.0 ([#678](https://github.com/diffplug/spotless/pull/678)).

## [2.2.2] - 2020-08-21
### Fixed
Expand Down
4 changes: 2 additions & 2 deletions lib-extra/src/main/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016 DiffPlug
* Copyright 2016-2020 DiffPlug
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -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.13.0";
private static final String DEFAULT_VERSION = "4.16.0";
private static final String FORMATTER_METHOD = "format";

public static String defaultVersion() {
Expand Down
19 changes: 19 additions & 0 deletions ...tra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.14.0.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Spotless formatter based on JDT version 4.14.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/log/?h=R4_14 to determine core version.
com.diffplug.spotless:spotless-eclipse-jdt:4.8.0
com.diffplug.spotless:spotless-eclipse-base:3.3.0
com.github.spotbugs:spotbugs-annotations:4.0.2
com.google.code.findbugs:jsr305:3.0.2
net.jcip:jcip-annotations:1.0
org.eclipse.jdt:org.eclipse.jdt.core:3.20.0
org.eclipse.platform:org.eclipse.core.commands:3.9.600
org.eclipse.platform:org.eclipse.core.contenttype:3.7.500
org.eclipse.platform:org.eclipse.core.jobs:3.10.600
org.eclipse.platform:org.eclipse.core.resources:3.13.600
org.eclipse.platform:org.eclipse.core.runtime:3.17.0
org.eclipse.platform:org.eclipse.equinox.app:1.4.300
org.eclipse.platform:org.eclipse.equinox.common:3.10.600
org.eclipse.platform:org.eclipse.equinox.preferences:3.7.600
org.eclipse.platform:org.eclipse.equinox.registry:3.8.600
org.eclipse.platform:org.eclipse.osgi:3.15.100
org.eclipse.platform:org.eclipse.text:3.10.0
19 changes: 19 additions & 0 deletions ...tra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.15.0.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Spotless formatter based on JDT version 4.15.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/log/?h=R4_15 to determine core version.
com.diffplug.spotless:spotless-eclipse-jdt:4.8.0
com.diffplug.spotless:spotless-eclipse-base:3.3.0
com.github.spotbugs:spotbugs-annotations:4.0.2
com.google.code.findbugs:jsr305:3.0.2
net.jcip:jcip-annotations:1.0
org.eclipse.jdt:org.eclipse.jdt.core:3.21.0
org.eclipse.platform:org.eclipse.core.commands:3.9.700
org.eclipse.platform:org.eclipse.core.contenttype:3.7.600
org.eclipse.platform:org.eclipse.core.jobs:3.10.700
org.eclipse.platform:org.eclipse.core.resources:3.13.600
org.eclipse.platform:org.eclipse.core.runtime:3.17.100
org.eclipse.platform:org.eclipse.equinox.app:1.4.400
org.eclipse.platform:org.eclipse.equinox.common:3.11.0
org.eclipse.platform:org.eclipse.equinox.preferences:3.7.700
org.eclipse.platform:org.eclipse.equinox.registry:3.8.700
org.eclipse.platform:org.eclipse.osgi:3.15.200
org.eclipse.platform:org.eclipse.text:3.10.100
19 changes: 19 additions & 0 deletions ...tra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.16.0.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Spotless formatter based on JDT version 4.16.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/log/?h=R4_16 to determine core version.
com.diffplug.spotless:spotless-eclipse-jdt:4.8.0
com.diffplug.spotless:spotless-eclipse-base:3.3.0
com.github.spotbugs:spotbugs-annotations:4.0.2
com.google.code.findbugs:jsr305:3.0.2
net.jcip:jcip-annotations:1.0
org.eclipse.jdt:org.eclipse.jdt.core:3.22.0
org.eclipse.platform:org.eclipse.core.commands:3.9.700
org.eclipse.platform:org.eclipse.core.contenttype:3.7.700
org.eclipse.platform:org.eclipse.core.jobs:3.10.800
org.eclipse.platform:org.eclipse.core.resources:3.13.700
org.eclipse.platform:org.eclipse.core.runtime:3.18.0
org.eclipse.platform:org.eclipse.equinox.app:1.4.500
org.eclipse.platform:org.eclipse.equinox.common:3.12.0
org.eclipse.platform:org.eclipse.equinox.preferences:3.8.0
org.eclipse.platform:org.eclipse.equinox.registry:3.8.800
org.eclipse.platform:org.eclipse.osgi:3.15.300
org.eclipse.platform:org.eclipse.text:3.10.200
4 changes: 2 additions & 2 deletions lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016 DiffPlug
* Copyright 2016-2020 DiffPlug
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -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.13.0"};
"4.11.0", "4.12.0", "4.13.0", "4.14.0", "4.15.0", "4.16.0"};
}

@Override
Expand Down
4 changes: 4 additions & 0 deletions plugin-gradle/CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).

## [Unreleased]
### Added
* Added support for eclipse-jdt 4.14.0, 4.15.0 and 4.16.0 ([#678](https://github.com/diffplug/spotless/pull/678)).
### Changed
* Updated default eclipse-jdt from 4.13.0 to 4.16.0 ([#678](https://github.com/diffplug/spotless/pull/678)).

## [5.1.2] - 2020-08-21
### Fixed
Expand Down
4 changes: 4 additions & 0 deletions plugin-maven/CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).

## [Unreleased]
### Added
* Added support for eclipse-jdt 4.14.0, 4.15.0 and 4.16.0 ([#678](https://github.com/diffplug/spotless/pull/678)).
### Changed
* Updated default eclipse-jdt from 4.13.0 to 4.16.0 ([#678](https://github.com/diffplug/spotless/pull/678)).

## [2.0.3] - 2020-08-21
### Fixed
Expand Down