merge from develop: the fixy bit

[jalview.git] / gradle.properties

diff --git a/gradle.properties b/gradle.properties
index 832026c..1507117 100644 (file)
--- a/gradle.properties
+++ b/gradle.properties
@@ -122,7 +122,8 @@ install4j_installer_file_associations = file_associations_auto-install4j8.xml
 install4j_build_dir = build/install4j
 install4j_media_types = windows,macosArchive,unixArchive,unixInstaller
 install4j_faster = false
-install4j_unix_desktop_additions = Categories=Science;Biology;Java;
+install4j_application_categories = Science;Biology;Java;
+install4j_release_win_application_id = 6595-2347-1923-0725
 
 OSX_KEYSTORE =
 OSX_KEYPASS =
@@ -145,6 +146,7 @@ bamboo_channelbase = https://builds.jalview.org/browse
 bamboo_planKey = 
 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_project_name = jalview
 eclipse_bin_dir = bin
@@ -157,7 +159,7 @@ jalviewjs_eclipse_root = ~/buildtools/eclipse/jee-2019-09
 
 jalviewjs_eclipse_dropins_dir = utils/jalviewjs/eclipse/dropins
 jalviewjs_swingjs_zip = swingjs/SwingJS-site.zip
-jalviewjs_j2s_plugin = swingjs/net.sf.j2s.core.jar
+jalviewjs_j2s_plugin = swingjs/net.sf.j2s.core-j11.jar
 jalviewjs_libjs_dir = utils/jalviewjs/libjs
 jalviewjs_site_resource_dir = utils/jalviewjs/site-resources
 jalviewjs_classlists_dir = utils/jalviewjs/classlists
@@ -181,8 +183,10 @@ jalviewjs_core_name = _jalview
 jalviewjs_name = JalviewJS
 jalviewjs_core_key = core
 #jalviewjs_core_key = preloadCore
+jalviewjs_ignore_transpile_errors = true
 
 j2s.compiler.status = enable
+j2s.compiler.java.version = 11
 #j2s.site.directory = null ## site defined from buildDir+'/jalviewjs/'+jalviewjs_site_dir
 #j2s.log.methods.declared = j2s_methods_declared.log
 #j2s.log.methods.called = j2s_methods_called.log