Index: applications/editors/josm/plugins/mapillary/.gitignore
===================================================================
--- applications/editors/josm/plugins/mapillary/.gitignore	(revision 32336)
+++ applications/editors/josm/plugins/mapillary/.gitignore	(revision 32340)
@@ -1,9 +1,18 @@
+# Eclipse
 /.classpath
 /.project
-/bin
+/bin/
+
+# IntelliJ idea
+/*.iml
+/*.iws
+/*.ipr
+/out/
+/.idea/*
+!/.idea/codeStyleSettings.xml
+
+# Gradle
 /build/
 /.gradle/
-/.settings
+
 /test/data/preferences/
-*.iml
-.idea/
Index: applications/editors/josm/plugins/mapillary/.idea/codeStyleSettings.xml
===================================================================
--- applications/editors/josm/plugins/mapillary/.idea/codeStyleSettings.xml	(revision 32340)
+++ applications/editors/josm/plugins/mapillary/.idea/codeStyleSettings.xml	(revision 32340)
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectCodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS">
+      <value>
+        <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="9999" />
+        <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="9999" />
+        <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
+          <value />
+        </option>
+        <option name="IMPORT_LAYOUT_TABLE">
+          <value>
+            <package name="java" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="javax" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="" withSubpackages="true" static="true" />
+          </value>
+        </option>
+        <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
+        <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
+        <option name="JD_ADD_BLANK_AFTER_PARM_COMMENTS" value="true" />
+        <option name="JD_ADD_BLANK_AFTER_RETURN" value="true" />
+        <option name="JD_P_AT_EMPTY_LINES" value="false" />
+        <option name="JD_KEEP_INVALID_TAGS" value="false" />
+        <option name="JD_DO_NOT_WRAP_ONE_LINE_COMMENTS" value="true" />
+        <option name="JD_PRESERVE_LINE_FEEDS" value="true" />
+        <option name="WRAP_COMMENTS" value="true" />
+        <XML>
+          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
+        </XML>
+        <codeStyleSettings language="JAVA">
+          <option name="SPACE_BEFORE_ANOTATION_PARAMETER_LIST" value="true" />
+          <indentOptions>
+            <option name="INDENT_SIZE" value="2" />
+            <option name="CONTINUATION_INDENT_SIZE" value="4" />
+            <option name="TAB_SIZE" value="2" />
+          </indentOptions>
+          <arrangement>
+            <groups>
+              <group>
+                <type>GETTERS_AND_SETTERS</type>
+                <order>KEEP</order>
+              </group>
+              <group>
+                <type>OVERRIDDEN_METHODS</type>
+                <order>KEEP</order>
+              </group>
+            </groups>
+          </arrangement>
+        </codeStyleSettings>
+      </value>
+    </option>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </component>
+</project>
Index: applications/editors/josm/plugins/mapillary/.project
===================================================================
--- applications/editors/josm/plugins/mapillary/.project	(revision 32336)
+++ applications/editors/josm/plugins/mapillary/.project	(revision 32340)
@@ -3,27 +3,29 @@
 	<name>JOSM-Mapillary</name>
 	<comment>Allows the user to work with pictures hosted at mapillary.com</comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>ch.acanda.eclipse.pmd.builder.PMDBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.sonarlint.eclipse.core.sonarlintBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
+	<projects/>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.sonarlint.eclipse.core.sonarlintNature</nature>
 		<nature>ch.acanda.eclipse.pmd.builder.PMDNature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments/>
+		</buildCommand>
+		<buildCommand>
+			<name>org.sonarlint.eclipse.core.sonarlintBuilder</name>
+			<arguments/>
+		</buildCommand>
+		<buildCommand>
+			<name>ch.acanda.eclipse.pmd.builder.PMDBuilder</name>
+			<arguments/>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments/>
+		</buildCommand>
+	</buildSpec>
+	<linkedResources/>
 </projectDescription>
Index: applications/editors/josm/plugins/mapillary/.settings/Build JOSM-Mapillary.launch
===================================================================
--- applications/editors/josm/plugins/mapillary/.settings/Build JOSM-Mapillary.launch	(revision 32336)
+++ applications/editors/josm/plugins/mapillary/.settings/Build JOSM-Mapillary.launch	(revision 32340)
@@ -15,4 +15,4 @@
     <listEntry value="javadoc"/>
   </listAttribute>
-  <stringAttribute key="working_dir" value="${workspace_loc:/JOSM-Mapillary}"/>
+  <stringAttribute key="working_dir" value="${project_loc}"/>
 </launchConfiguration>
Index: applications/editors/josm/plugins/mapillary/.settings/Launch JOSM with JOSM-Mapillary loaded.launch
===================================================================
--- applications/editors/josm/plugins/mapillary/.settings/Launch JOSM with JOSM-Mapillary loaded.launch	(revision 32336)
+++ applications/editors/josm/plugins/mapillary/.settings/Launch JOSM with JOSM-Mapillary loaded.launch	(revision 32340)
@@ -13,4 +13,4 @@
     <listEntry value="runJosm"/>
   </listAttribute>
-  <stringAttribute key="working_dir" value="${workspace_loc:/JOSM-Mapillary}"/>
+  <stringAttribute key="working_dir" value="${project_loc}"/>
 </launchConfiguration>
Index: applications/editors/josm/plugins/mapillary/.settings/org.eclipse.buildship.core.prefs
===================================================================
--- applications/editors/josm/plugins/mapillary/.settings/org.eclipse.buildship.core.prefs	(revision 32340)
+++ applications/editors/josm/plugins/mapillary/.settings/org.eclipse.buildship.core.prefs	(revision 32340)
@@ -0,0 +1,11 @@
+build.commands=org.eclipse.jdt.core.javabuilder,org.sonarlint.eclipse.core.sonarlintBuilder,ch.acanda.eclipse.pmd.builder.PMDBuilder,org.eclipse.buildship.core.gradleprojectbuilder
+connection.arguments=
+connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
+connection.gradle.user.home=null
+connection.java.home=null
+connection.jvm.arguments=
+connection.project.dir=
+derived.resources=.gradle,build
+eclipse.preferences.version=1
+natures=org.eclipse.jdt.core.javanature,org.sonarlint.eclipse.core.sonarlintNature,ch.acanda.eclipse.pmd.builder.PMDNature,org.eclipse.buildship.core.gradleprojectnature
+project.path=\:
Index: applications/editors/josm/plugins/mapillary/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- applications/editors/josm/plugins/mapillary/.settings/org.eclipse.jdt.core.prefs	(revision 32336)
+++ applications/editors/josm/plugins/mapillary/.settings/org.eclipse.jdt.core.prefs	(revision 32340)
@@ -7,6 +7,6 @@
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -94,3 +94,3 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
Index: applications/editors/josm/plugins/mapillary/.settings/org.eclipse.jdt.ui.prefs
===================================================================
--- applications/editors/josm/plugins/mapillary/.settings/org.eclipse.jdt.ui.prefs	(revision 32340)
+++ applications/editors/josm/plugins/mapillary/.settings/org.eclipse.jdt.ui.prefs	(revision 32340)
@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;;\#;
+org.eclipse.jdt.ui.ondemandthreshold=9999
+org.eclipse.jdt.ui.staticondemandthreshold=9999
Index: applications/editors/josm/plugins/mapillary/build.gradle
===================================================================
--- applications/editors/josm/plugins/mapillary/build.gradle	(revision 32336)
+++ applications/editors/josm/plugins/mapillary/build.gradle	(revision 32340)
@@ -1,4 +1,5 @@
 apply plugin: 'eclipse'
 apply plugin: 'findbugs'
+apply plugin: 'idea'
 apply plugin: 'jacoco'
 apply plugin: 'java'
@@ -66,6 +67,8 @@
     name = 'JOSM-Mapillary'
     comment = property('plugin.description')
-    natures 'org.sonarlint.eclipse.core.sonarlintNature', 'ch.acanda.eclipse.pmd.builder.PMDNature'
+    natures 'org.sonarlint.eclipse.core.sonarlintNature', 'ch.acanda.eclipse.pmd.builder.PMDNature', 'org.eclipse.buildship.core.gradleprojectnature'
+    buildCommand 'org.sonarlint.eclipse.core.sonarlintBuilder'
     buildCommand 'ch.acanda.eclipse.pmd.builder.PMDBuilder'
+    buildCommand 'org.eclipse.buildship.core.gradleprojectbuilder'
   }
 }