diff --git a/pom.xml b/pom.xml index 1422811f..a5e42da5 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ ${basedir} UTF-8 1.8 - https://download.eclipse.org/releases/2019-03/201903201000 + https://download.eclipse.org/releases/2019-09/201909181001/ https://dl.bintray.com/eclipse-cs/eclipse-cs/8.18.0 true 1.8.1 diff --git a/spring-javaformat-eclipse/io.spring.javaformat.eclipse/META-INF/MANIFEST.MF b/spring-javaformat-eclipse/io.spring.javaformat.eclipse/META-INF/MANIFEST.MF index 8a19dd26..f256228d 100644 --- a/spring-javaformat-eclipse/io.spring.javaformat.eclipse/META-INF/MANIFEST.MF +++ b/spring-javaformat-eclipse/io.spring.javaformat.eclipse/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.m2e.jdt;resolution:=optional, org.eclipse.m2e.core;resolution:=optional, org.eclipse.m2e.maven.runtime;resolution:=optional, - org.eclipse.buildship.core;bundle-version="[3.0.0,3.1.0)";resolution:=optional, + org.eclipse.buildship.core;bundle-version="[3.0.0,3.3.0)";resolution:=optional, net.sf.eclipsecs.core;bundle-version="8.18.0";resolution:=optional Bundle-ClassPath: ., lib/spring-javaformat-formatter-eclipse.jar, diff --git a/spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/gradle/GradleProjectSettingsConfigurator.java b/spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/gradle/GradleProjectSettingsConfigurator.java index 28ee5b5c..0170bd29 100644 --- a/spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/gradle/GradleProjectSettingsConfigurator.java +++ b/spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/gradle/GradleProjectSettingsConfigurator.java @@ -18,6 +18,7 @@ import java.io.File; import java.io.IOException; +import java.util.Collection; import java.util.LinkedHashSet; import java.util.Optional; import java.util.Set; @@ -30,7 +31,6 @@ import org.eclipse.buildship.core.internal.workspace.FetchStrategy; import org.eclipse.buildship.core.internal.workspace.InternalGradleBuild; import org.eclipse.buildship.core.internal.workspace.InternalGradleWorkspace; -import org.eclipse.buildship.core.internal.workspace.ModelProviderUtil; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; @@ -74,8 +74,8 @@ private void configureProject(IProject project, IProgressMonitor monitor) throws InternalGradleWorkspace workspace = CorePlugin.internalGradleWorkspace(); Optional build = workspace.getBuild(project); if (build.isPresent()) { - Set projects = ModelProviderUtil.fetchAllEclipseProjects((InternalGradleBuild) build.get(), - this.tokenSource, FetchStrategy.FORCE_RELOAD, monitor); + Collection projects = ((InternalGradleBuild) build.get()).getModelProvider() + .fetchModels(EclipseProject.class, FetchStrategy.FORCE_RELOAD, this.tokenSource, monitor); if (hasSpringFormatPlugin(projects)) { ProjectSettingsFilesLocator locator = new ProjectSettingsFilesLocator(getSearchFolders(projects)); locator.locateSettingsFiles().applyToProject(project, monitor); @@ -83,7 +83,7 @@ private void configureProject(IProject project, IProgressMonitor monitor) throws } } - private boolean hasSpringFormatPlugin(Set projects) { + private boolean hasSpringFormatPlugin(Collection projects) { for (EclipseProject project : projects) { for (GradleTask task : project.getGradleProject().getTasks()) { if (isSpringFormatPlugin(task)) { @@ -98,7 +98,7 @@ private boolean isSpringFormatPlugin(GradleTask task) { return TASK_NAME.equals(task.getName()); } - private Set getSearchFolders(Set projects) { + private Set getSearchFolders(Collection projects) { Set searchFolders = new LinkedHashSet<>(); for (EclipseProject project : projects) { while (project != null) {