X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=gradle.properties;h=b48397888768ad5d62d71b12b57355f2fe881530;hb=955252e4a9e1f2707570979508e85cad34c1a9b8;hp=3063eb76ecab97f2f259e904c33ef71efa8a4526;hpb=d6914d9c40f632c848e9936254400bfcd64720a6;p=jalview.git diff --git a/gradle.properties b/gradle.properties index 3063eb7..b483978 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,6 @@ jalviewDir = . +#JAVA_VERSION = 1.8 JAVA_VERSION = 11 JALVIEW_VERSION = DEVELOPMENT INSTALLATION = Source @@ -15,9 +16,6 @@ jalview_keydig = SHA1 testngGroups = Functional -javac_source = 11 -javac_target = 11 - j8libDir = j8lib j11libDir = j11lib resourceDir = resources @@ -50,9 +48,10 @@ getdown_local = false 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_launcher_new = getdown-launcher-new.jar getdown_core = getdown/lib/getdown-core-1.8.3-SNAPSHOT.jar getdown_base_txt = getdown/files/getdown.txt getdown_txt_title = Jalview @@ -60,7 +59,7 @@ getdown_channel_base = http://www.jalview.org/getdown/jalview getdown_channel_name = TEST getdown_txt_allow_offline = true getdown_txt_jalview.jvmmempc = 90 -getdown_txt_multi_jvmarg = -Dgetdownappdir="%APPDIR%" +getdown_txt_multi_jvmarg = -Dgetdownappdir=%APPDIR% getdown_txt_strict_comments = true getdown_txt_title = Jalview getdown_txt_ui.name = Jalview @@ -79,7 +78,7 @@ getdown_txt_ui.install_error = http://www.jalview.org/download/error getdown_txt_ui.mac_dock_icon = resources/images/jalview_logos.ico getdown_alt_java8_min_version = 01080000 getdown_alt_java11_min_version = 11000000 -getdown_alt_java11_txt_multi_java_location = [windows-amd64] /getdown/jre/windows-jre11.tgz,[linux-amd64] /getdown/jre/linux-jre11.tgz,[mac os x] /getdown/jre/macos-jre11.tgz +getdown_alt_java11_txt_multi_java_location = [windows-amd64] /getdown/jre/windows-jre11.jar,[linux-amd64] /getdown/jre/linux-jre11.tgz,[mac os x] /getdown/jre/macos-jre11.tgz getdown_alt_java8_txt_multi_java_location = [windows-amd64] /getdown/jre/windows-jre1.8.tgz,[linux-amd64] /getdown/jre/linux-jre1.8.tgz,[mac os x] /getdown/jre/macos-jre1.8.tgz JRE_installs = /Users/bsoares/Java/installs Windows_JRE8 = OpenJDK8U-jdk_x64_windows_hotspot_8u202b08/jdk8u202-b08 @@ -100,6 +99,7 @@ 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 @@ -110,5 +110,6 @@ JSIGN_SH = echo eclipse_extra_jdt_prefs_file = .settings/org.eclipse.jdt.core.jalview.prefs +pandoc_exec = /usr/local/bin/pandoc,/usr/bin/pandoc dev = false