Skip to content

Commit 0440e36

Browse files
committed
Update to latest Eclipse 2019-09
1 parent b6611a1 commit 0440e36

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<main.basedir>${basedir}</main.basedir>
3232
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3333
<java.version>1.8</java.version>
34-
<eclipse.repository>https://download.eclipse.org/releases/2019-03/201903201000</eclipse.repository>
34+
<eclipse.repository>https://download.eclipse.org/releases/2019-09/</eclipse.repository>
3535
<eclipse.checkstyle.repository>https://dl.bintray.com/eclipse-cs/eclipse-cs/8.18.0</eclipse.checkstyle.repository>
3636
<tycho.disableP2Mirrors>true</tycho.disableP2Mirrors>
3737
<ant.version>1.8.1</ant.version>

spring-javaformat-eclipse/io.spring.javaformat.eclipse/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.ui,
1616
org.eclipse.m2e.jdt;resolution:=optional,
1717
org.eclipse.m2e.core;resolution:=optional,
1818
org.eclipse.m2e.maven.runtime;resolution:=optional,
19-
org.eclipse.buildship.core;bundle-version="[3.0.0,3.1.0)";resolution:=optional,
19+
org.eclipse.buildship.core;bundle-version="[3.0.0,3.3.0)";resolution:=optional,
2020
net.sf.eclipsecs.core;bundle-version="8.18.0";resolution:=optional
2121
Bundle-ClassPath: .,
2222
lib/spring-javaformat-formatter-eclipse.jar,

spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/gradle/GradleProjectSettingsConfigurator.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import java.io.File;
2020
import java.io.IOException;
21+
import java.util.Collection;
2122
import java.util.LinkedHashSet;
2223
import java.util.Optional;
2324
import java.util.Set;
@@ -30,7 +31,6 @@
3031
import org.eclipse.buildship.core.internal.workspace.FetchStrategy;
3132
import org.eclipse.buildship.core.internal.workspace.InternalGradleBuild;
3233
import org.eclipse.buildship.core.internal.workspace.InternalGradleWorkspace;
33-
import org.eclipse.buildship.core.internal.workspace.ModelProviderUtil;
3434
import org.eclipse.core.resources.IProject;
3535
import org.eclipse.core.runtime.CoreException;
3636
import org.eclipse.core.runtime.IProgressMonitor;
@@ -74,16 +74,16 @@ private void configureProject(IProject project, IProgressMonitor monitor) throws
7474
InternalGradleWorkspace workspace = CorePlugin.internalGradleWorkspace();
7575
Optional<GradleBuild> build = workspace.getBuild(project);
7676
if (build.isPresent()) {
77-
Set<EclipseProject> projects = ModelProviderUtil.fetchAllEclipseProjects((InternalGradleBuild) build.get(),
78-
this.tokenSource, FetchStrategy.FORCE_RELOAD, monitor);
77+
Collection<EclipseProject> projects = ((InternalGradleBuild) build.get()).getModelProvider()
78+
.fetchModels(EclipseProject.class, FetchStrategy.FORCE_RELOAD, this.tokenSource, monitor);
7979
if (hasSpringFormatPlugin(projects)) {
8080
ProjectSettingsFilesLocator locator = new ProjectSettingsFilesLocator(getSearchFolders(projects));
8181
locator.locateSettingsFiles().applyToProject(project, monitor);
8282
}
8383
}
8484
}
8585

86-
private boolean hasSpringFormatPlugin(Set<EclipseProject> projects) {
86+
private boolean hasSpringFormatPlugin(Collection<EclipseProject> projects) {
8787
for (EclipseProject project : projects) {
8888
for (GradleTask task : project.getGradleProject().getTasks()) {
8989
if (isSpringFormatPlugin(task)) {
@@ -98,7 +98,7 @@ private boolean isSpringFormatPlugin(GradleTask task) {
9898
return TASK_NAME.equals(task.getName());
9999
}
100100

101-
private Set<File> getSearchFolders(Set<EclipseProject> projects) {
101+
private Set<File> getSearchFolders(Collection<EclipseProject> projects) {
102102
Set<File> searchFolders = new LinkedHashSet<>();
103103
for (EclipseProject project : projects) {
104104
while (project != null) {

0 commit comments

Comments
 (0)