Merge commit '3fe5792cc63d53a5ace952bd68d3bb673c97f588' into improvement/JAL-3394_add... improvement/JAL-3394_added_categories_to_unix_shell_installer_desktop_file
authorBen Soares <bsoares@dundee.ac.uk>
Thu, 12 Mar 2020 21:30:03 +0000 (21:30 +0000)
committerBen Soares <bsoares@dundee.ac.uk>
Thu, 12 Mar 2020 21:30:03 +0000 (21:30 +0000)
1  2 
build.gradle

diff --combined build.gradle
@@@ -18,7 -18,7 +18,7 @@@ plugins 
    id 'application'
    id 'eclipse'
    id 'com.github.johnrengelman.shadow' version '4.0.3'
-   id 'com.install4j.gradle' version '8.0.2'
+   id 'com.install4j.gradle' version '8.0.4'
    id 'com.dorongold.task-tree' version '1.5' // only needed to display task dependency tree with  gradle task1 [task2 ...] taskTree
  }
  
@@@ -1363,7 -1363,6 +1363,7 @@@ task installers(type: com.install4j.gra
      'GETDOWN_INSTALL_DIR': getdown_install_dir,
      'INFO_PLIST_FILE_ASSOCIATIONS_FILE': install4j_info_plist_file_associations,
      'BUILD_DIR': install4jBuildDir,
 +    'UNIX_DESKTOP_ADDITIONS': install4j_unix_desktop_additions,
    ]
  
    destination = "${jalviewDir}/${install4jBuildDir}"