JAL-3210 Another commit for goomph powered jalviewjs build

diff --git a/build.gradle b/build.gradle
index e6430f1..8c35bf8 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -2,21 +2,42 @@ import org.apache.tools.ant.filters.ReplaceTokens
 import org.gradle.internal.os.OperatingSystem
 import org.gradle.plugins.ide.eclipse.model.*
 import groovy.transform.ExternalizeMethods
+import org.eclipse.osgi.*
+
+/*
+buildscript {
+  repositories {
+    repos
+    mavenCentral()
+    jcenter()
+  }
+  dependencies {
+    //eclipseDeps.each { compile "p2:${it}:+" }
+    //classpath 'org.eclipse.platform:org.eclipse.osgi:3.15.0'
+    //compile group: 'org.eclipse.platform', name: 'org.eclipse.osgi', version: '3.15.0'
+    //classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:4.4.0'
+  }
+}
+*/
 
 plugins {
   id 'java'
   id 'application'
   id 'eclipse'
-  id 'com.diffplug.gradle.oomph.ide' version '3.18.0'
-  id 'com.diffplug.gradle.equinoxlaunch' version '3.18.0'
+  id 'com.diffplug.gradle.oomph.ide' version '3.18.1'
+  id 'com.diffplug.gradle.equinoxlaunch' version '3.18.1'
 
-  id 'com.diffplug.gradle.p2.asmaven' version '3.18.0'
-}
+  id 'com.diffplug.gradle.spotless' version '3.24.2'
 
+  //id 'com.diffplug.gradle.p2.asmaven' version '3.18.1'
+
+  //id 'org.eclipse.osgi' version '3.15.0'
+  //id 'osgi'
+}
 
 
-def eclipseDeps = [
 /*
+def eclipseDeps = [
     // The dependencies we actually use
     'org.eclipse.jdt.core',
     'org.eclipse.text',
@@ -28,10 +49,11 @@ def eclipseDeps = [
     'org.eclipse.core.resources',
     'org.eclipse.equinox.common',
     'org.eclipse.equinox.preferences',
-*/
-    'org.eclipse.osgi'
+    //'org.eclipse.osgi'
 ]
+*/
 
+/*
 p2AsMaven {
   group 'p2', {
     repoEclipse goomph_eclipse_version
@@ -39,19 +61,29 @@ p2AsMaven {
     eclipseDeps.each { p2.addIU(it + '.source') }
   }
 }
+*/
+
 
+/*
 dependencies {
-    eclipseDeps.each { compile "p2:${it}:+" }
+  //eclipseDeps.each { compile "p2:${it}:+" }
+  //implementation 'org.eclipse.platform:org.eclipse.osgi:3.15.0'
+  //compile 'org.eclipse.platform:org.eclipse.osgi:3.15.0'
+  //classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:4.4.0'
 }
+*/
 
 
-
+spotless {
+  java {
+    eclipse(spotless_eclipse_version).configFile eclipse_extra_jdt_prefs_file
+  }
+}
 
 
 repositories {
   jcenter()
   mavenCentral()
-  mavenLocal()
   flatDir {
     dirs gradlePluginsDir
   }
@@ -281,6 +313,7 @@ oomphIde {
 
 equinoxLaunch {
   headlessAppSetup {
+
     launchTask 'ideJalviewjsBuild', {
       //it.args = ["-nosplash", "--launcher.suppressErrors", "-application", "org.eclipse.jdt.apt.core.aptBuild", "-data", tempEclipseWorkspace, "-"+jalviewjs_eclipseBuildArg, eclipse_project_name ]
       it.args = ["-nosplash", "--launcher.suppressErrors", "-application", "org.eclipse.jdt.apt.core.aptBuild", "-"+jalviewjs_eclipseBuildArg, eclipse_project_name ]

diff --git a/gradle.properties b/gradle.properties
index 9b82d59..d2c5394 100644 (file)
--- a/gradle.properties
+++ b/gradle.properties
@@ -33,6 +33,8 @@ j11libDir = j11lib
 #j11modDir = j11mod
 #j11modules = com.sun.istack.runtime,com.sun.xml.bind,com.sun.xml.fastinfoset,com.sun.xml.streambuffer,com.sun.xml.txw2,com.sun.xml.ws.policy,java.activation,java.annotation,java.base,java.compiler,java.datatransfer,java.desktop,java.logging,java.management,java.management.rmi,java.naming,java.prefs,java.rmi,java.scripting,java.security.sasl,java.sql,java.xml,java.xml.bind,java.xml.soap,java.xml.ws,javax.jws,jdk.httpserver,jdk.jsobject,jdk.unsupported,jdk.xml.dom,org.jvnet.mimepull,org.jvnet.staxex,javax.servlet.api,java.ws.rs
 
+eclipse_extra_jdt_prefs_file = .settings/org.eclipse.jdt.core.jalview.prefs
+
 dev = false
 
 jalviewjs_eclipse_root = ~/buildtools/eclipse/eclipse-jee-2019-06
@@ -77,6 +79,7 @@ j2s.class.replacements = org.apache.log4j.->jalview.javascript.log4j.
 #output will be comma-separated: called method,caller class 
 #j2s.prop.j2s.log.all.calls=true
 
-goomph_eclipse_version = 4.12
+spotless_eclipse_version = 4.12.0
+goomph_eclipse_version = 4.13
 goomph_repo_buildship = https://download.eclipse.org/buildship/updates/e47/releases/3.x/
 goomph_feature_buildship = org.eclipse.buildship