JAL-3847 Some attempts to fix a few eclipse import problems

diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs
index e479558..a47c876 100644 (file)
--- a/.settings/org.eclipse.buildship.core.prefs
+++ b/.settings/org.eclipse.buildship.core.prefs
@@ -1,13 +1,13 @@
 arguments=
 auto.sync=false
 build.scans.enabled=false
-connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
+connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(7.6.2))
 connection.project.dir=
 eclipse.preferences.version=1
 gradle.user.home=
 java.home=
 jvm.arguments=
 offline.mode=false
-override.workspace.settings=false
+override.workspace.settings=true
 show.console.view=false
 show.executions.view=false

diff --git a/build.gradle b/build.gradle
index 7ad6f99..f61eaa0 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -838,14 +838,27 @@ task eclipseGroovyCorePreferences(type: PropertiesFileTask) {
   }
 }
 
+task eclipseBuildshipCorePreferences(type: PropertiesFileTask) {
+  description = "Generate Eclipse additional settings"
+  def filename = "org.eclipse.buildship.core.prefs"
+  outputFile = "$projectDir/.settings/${filename}" as File
+  file {
+    withProperties {
+      it.load new FileInputStream("$projectDir/utils/eclipse/${filename}" as String)
+    }
+  }
+}
+
 task eclipseAllPreferences {
   dependsOn eclipseJdt
   dependsOn eclipseUIPreferences
   dependsOn eclipseGroovyCorePreferences
+  dependsOn eclipseBuildshipCorePreferences
 }
 
 eclipseUIPreferences.mustRunAfter eclipseJdt
 eclipseGroovyCorePreferences.mustRunAfter eclipseJdt
+eclipseBuildshipCorePreferences.mustRunAfter eclipseJdt
 
 /* end of eclipse preferences hack */
 

diff --git a/gradle.properties b/gradle.properties
index 547304f..b80934d 100644 (file)
--- a/gradle.properties
+++ b/gradle.properties
@@ -181,6 +181,7 @@ bamboo_getdown_channel_suffix = /latest/artifact/shared/getdown-channel
 
 eclipse_codestyle_file = utils/eclipse/JalviewCodeStyle.xml
 eclipse_extra_jdt_prefs_file = utils/eclipse/org.eclipse.jdt.core.jalview.prefs
+eclipse_extra_buildship_prefs_file = utils/eclipse/org.eclipse.buildship.core.prefs
 eclipse_project_name = jalview
 eclipse_bin_dir = bin
 eclipse_debug = false

diff --git a/utils/eclipse/org.eclipse.buildship.core.prefs b/utils/eclipse/org.eclipse.buildship.core.prefs
new file mode 100644 (file)
index 0000000..933a80c
--- /dev/null
+++ b/utils/eclipse/org.eclipse.buildship.core.prefs
@@ -0,0 +1,13 @@
+arguments=
+auto.sync=false
+build.scans.enabled=false
+connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(7.6))
+connection.project.dir=
+eclipse.preferences.version=1
+gradle.user.home=
+java.home=
+jvm.arguments=
+offline.mode=false
+override.workspace.settings=true
+show.console.view=false
+show.executions.view=false

diff --git a/utils/eclipse/org.eclipse.jdt.groovy.core.prefs b/utils/eclipse/org.eclipse.jdt.groovy.core.prefs
index 09d843d..2665b53 100644 (file)
--- a/utils/eclipse/org.eclipse.jdt.groovy.core.prefs
+++ b/utils/eclipse/org.eclipse.jdt.groovy.core.prefs
@@ -1,2 +1,2 @@
 eclipse.preferences.version=1
-groovy.compiler.level=30
+groovy.compiler.level=50