X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=gradle.properties;h=bf23db9393bb007de327459df4a57cca0b1bcdba;hb=352007652b62587a2f2cc626516768765422cb50;hp=7337984a0cffbba49b6eb8c9a97270ad50398abe;hpb=d4ff3d58065a0f8c7ea7c8f56be182ae39e6f20b;p=jalview.git

diff --git a/gradle.properties b/gradle.properties
index 7337984..bf23db9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -66,10 +66,7 @@ getdown_build_properties = build_properties
 getdown_txt_title = Jalview
 getdown_txt_allow_offline = true
 getdown_txt_max_concurrent_downloads = 10
-# now got better defaults when not set
-#getdown_txt_jalview.jvmmempc = 90
-# now got better defaults when not set
-#getdown_txt_jalview.jvmmemmax = 32G
+getdown_txt_jalview.jvmmempc = 90
 getdown_txt_multi_jvmarg = -Dgetdownappdir=%APPDIR%
 getdown_txt_strict_comments = true
 getdown_txt_title = Jalview
@@ -92,7 +89,7 @@ getdown_txt_ui.progress_text = 000000
 getdown_txt_ui.status = 20, 380, 600, 58
 getdown_txt_ui.status_text = 000066
 #getdown_txt_ui.text_shadow = FFFFFF
-getdown_txt_ui.install_error = https://www.jalview.org/faq/getdownerror
+getdown_txt_ui.install_error = http://www.jalview.org/faq/getdownerror
 getdown_txt_ui.mac_dock_icon = resources/images/jalview_logos.ico
 getdown_alt_java8_min_version  = 01080000
 getdown_alt_java8_max_version  = 01089999
@@ -113,17 +110,16 @@ 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
 
-install4j_home_dir = ~/buildtools/install4j8
-install4j_copyright_message = ...
-install4j_macOS_bundle_id = org.jalview.jalview-desktop
-install4j_utils_dir = utils/install4j
-install4j_template = install4j8_template.install4j
-install4j_info_plist_file_associations = file_associations_auto-Info_plist.xml
-install4j_installer_file_associations = file_associations_auto-install4j8.xml
-#install4j_DMG_uninstaller_app_files = uninstall_old_jalview_files.xml
-install4j_build_dir = build/install4j
-install4j_media_types = windows,macosArchive,linuxRPM,linuxDeb,unixArchive,unixInstaller
-install4j_faster = false
+install4jCopyrightMessage = ...
+install4jMacOSBundleId = org.jalview.jalview-desktop
+install4jResourceDir = utils/install4j
+install4jTemplate = install4j_template.install4j
+install4jInfoPlistFileAssociations = file_associations_auto-Info_plist.xml
+install4jInstallerFileAssociations = file_associations_auto-install4j.xml
+install4jDMGUninstallerAppFiles = uninstall_old_jalview_files.xml
+install4jBuildDir = build/install4j
+install4jMediaTypes = windows,macosArchive,linuxRPM,linuxDeb,unixArchive,unixInstaller
+install4jFaster = false
 
 OSX_KEYSTORE =
 OSX_KEYPASS =
@@ -133,11 +129,10 @@ pandoc_exec = /usr/local/bin/pandoc,/usr/bin/pandoc
 dev = false
 
 CHANNEL=LOCAL
-getdown_channel_base = https://www.jalview.org/getdown
+getdown_channel_base = http://www.jalview.org/getdown
 getdown_channel_name = SCRATCH-DEFAULT
 getdown_app_dir_release = release
 getdown_app_dir_alt = alt
-getdown_app_dir_java = jre
 getdown_install_dir = install
 getdown_rsync_dest = /Volumes/jalview/docroot/getdown
 reportRsyncCommand =
@@ -147,19 +142,19 @@ bamboo_channelbase = https://builds.jalview.org/browse
 bamboo_planKey = 
 bamboo_getdown_channel_suffix = /latest/artifact/shared/getdown-channel
 
-eclipse_extra_jdt_prefs_file = .settings/org.eclipse.jdt.core.jalview.prefs
+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
 eclipse_debug = false
 
-# for developing in Eclipse as IDE, set this to automatically copy current swingjs/net.sf.j2s.core.jar to your dropins dir
-jalviewjs_eclipseIDE_auto_copy_j2s_plugin = false
 # Override this in a local.properties file
 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_j11 = 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
@@ -183,8 +178,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