git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3295 Can now compile/run/debug in Eclipse with Java 1.8. Change JAVA_VERSION...
[jalview.git]
/
gradle.properties
diff --git
a/gradle.properties
b/gradle.properties
index
aeb9f59
..
f5c6f49
100644
(file)
--- a/
gradle.properties
+++ b/
gradle.properties
@@
-1,5
+1,6
@@
jalviewDir = .
jalviewDir = .
+#JAVA_VERSION = 1.8
JAVA_VERSION = 11
JALVIEW_VERSION = DEVELOPMENT
INSTALLATION = Source
JAVA_VERSION = 11
JALVIEW_VERSION = DEVELOPMENT
INSTALLATION = Source
@@
-15,9
+16,6
@@
jalview_keydig = SHA1
testngGroups = Functional
testngGroups = Functional
-javac_source = 11
-javac_target = 11
-
j8libDir = j8lib
j11libDir = j11lib
resourceDir = resources
j8libDir = j8lib
j11libDir = j11lib
resourceDir = resources
@@
-50,7
+48,7
@@
getdown_local = false
getdown_website_dir = getdown/website
getdown_resource_dir = resource
getdown_app_dir = dist
getdown_website_dir = getdown/website
getdown_resource_dir = resource
getdown_app_dir = dist
-getdown_j11lib_dir = j11lib
+#getdown_j11lib_dir = j11lib
getdown_files_dir = getdown/files
getdown_launcher = getdown/lib/getdown-launcher.jar
getdown_core = getdown/lib/getdown-core-1.8.3-SNAPSHOT.jar
getdown_files_dir = getdown/files
getdown_launcher = getdown/lib/getdown-launcher.jar
getdown_core = getdown/lib/getdown-core-1.8.3-SNAPSHOT.jar
@@
-59,7
+57,7
@@
getdown_txt_title = Jalview
getdown_channel_base = http://www.jalview.org/getdown/jalview
getdown_channel_name = TEST
getdown_txt_allow_offline = true
getdown_channel_base = http://www.jalview.org/getdown/jalview
getdown_channel_name = TEST
getdown_txt_allow_offline = true
-getdown_txt_jvmmempc = 95
+getdown_txt_jalview.jvmmempc = 90
getdown_txt_multi_jvmarg = -Dgetdownappdir="%APPDIR%"
getdown_txt_strict_comments = true
getdown_txt_title = Jalview
getdown_txt_multi_jvmarg = -Dgetdownappdir="%APPDIR%"
getdown_txt_strict_comments = true
getdown_txt_title = Jalview
@@
-100,13
+98,17
@@
install4jResourceDir = utils/install4j
install4jTemplate = install4j_template.install4j
install4jInfoPlistFileAssociations = file_associations_auto-Info_plist.xml
install4jInstallerFileAssociations = file_associations_auto-install4j.xml
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
install4jBuildDir = build/install4j
install4jMediaTypes = windows,macosArchive,linuxRPM,linuxDeb,unixArchive,unixInstaller
+install4jFaster = false
+
OSX_KEYSTORE =
OSX_KEYPASS =
JSIGN_SH = echo
eclipse_extra_jdt_prefs_file = .settings/org.eclipse.jdt.core.jalview.prefs
OSX_KEYSTORE =
OSX_KEYPASS =
JSIGN_SH = echo
eclipse_extra_jdt_prefs_file = .settings/org.eclipse.jdt.core.jalview.prefs
+pandoc_exec = /usr/local/bin/pandoc
dev = false
dev = false