Upgrade to Buildship 3.1.0

Closes gh-117

Author: wilkinsona

pom.xml

@@ -32,6 +32,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
 		<eclipse.repository>https://download.eclipse.org/releases/2019-03/201903201000</eclipse.repository>
+		<eclipse.buildship.repository>https://download.eclipse.org/buildship/updates/e411/releases/3.x/3.1.0.v20190501-0832</eclipse.buildship.repository>
 		<eclipse.checkstyle.repository>https://dl.bintray.com/eclipse-cs/eclipse-cs/8.18.0</eclipse.checkstyle.repository>
 		<tycho.disableP2Mirrors>true</tycho.disableP2Mirrors>
 		<ant.version>1.8.1</ant.version>
@@ -592,6 +593,11 @@
 			<layout>p2</layout>
 			<url>${eclipse.repository}</url>
 		</repository>
+		<repository>
+			<id>eclipse-buildship</id>
+			<layout>p2</layout>
+			<url>${eclipse.buildship.repository}</url>
+		</repository>
 		<repository>
 			<id>eclipse-checkstyle</id>
 			<layout>p2</layout>

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

@@ -14,7 +14,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;resolution:=optional,
+ org.eclipse.buildship.core;bundle-version="3.1.0";resolution:=optional,
  net.sf.eclipsecs.core;bundle-version="8.18.0";resolution:=optional,
  org.slf4j.api;bundle-version="1.7.0"
 Bundle-ClassPath: .,

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

@@ -18,16 +18,15 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Collection;
 import java.util.LinkedHashSet;
 import java.util.Optional;
 import java.util.Set;
 
 import org.eclipse.buildship.core.GradleBuild;
 import org.eclipse.buildship.core.internal.CorePlugin;
-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.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
@@ -86,15 +85,15 @@ private void configureProjects(IProgressMonitor monitor) throws CoreException, I
 
 	private void configureProject(IProject project, InternalGradleBuild build, IProgressMonitor monitor)
 			throws CoreException, IOException {
-		Set<EclipseProject> projects = ModelProviderUtil.fetchAllEclipseProjects(build, this.tokenSource,
-				FetchStrategy.FORCE_RELOAD, monitor);
+		Collection<EclipseProject> projects = build.getModelProvider()
+				.fetchEclipseProjectAndRunSyncTasks(this.tokenSource, monitor);
 		if (hasSpringFormatPlugin(projects)) {
 			ProjectSettingsFilesLocator locator = new ProjectSettingsFilesLocator(getSearchFolders(projects));
 			locator.locateSettingsFiles().applyToProject(project, monitor);
 		}
 	}
 
-	private boolean hasSpringFormatPlugin(Set<EclipseProject> projects) {
+	private boolean hasSpringFormatPlugin(Collection<EclipseProject> projects) {
 		for (EclipseProject project : projects) {
 			for (GradleTask task : project.getGradleProject().getTasks()) {
 				if (isSpringFormatPlugin(task)) {
@@ -109,7 +108,7 @@ private boolean isSpringFormatPlugin(GradleTask task) {
 		return TASK_NAME.equals(task.getName());
 	}
 
-	private Set<File> getSearchFolders(Set<EclipseProject> projects) {
+	private Set<File> getSearchFolders(Collection<EclipseProject> projects) {
 		Set<File> searchFolders = new LinkedHashSet<>();
 		for (EclipseProject project : projects) {
 			while (project != null) {