Update to BA JLink Gradle plugin 2.14.1

* Remove workarounds for BA JLink issues bitcoinj#74 and bitcoinj#75 * Install rpm on GitLab CI so we can build “deb” and “rpm”
ConsensusJ · Aug 14, 2019 · 61f511a · 61f511a
1 parent ae6e6bf
commit 61f511a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ before_script:
   - echo $GRADLE_OPTS
   - apt-get update
   - apt-get -y upgrade
-  - apt-get -y install openjdk-11-jdk gradle curl fakeroot
+  - apt-get -y install openjdk-11-jdk gradle curl rpm fakeroot
   - curl --silent --show-error -O $JDK14_URL
   - tar xf $JDK14_FILENAME
   - $BADASS_JLINK_JPACKAGE_HOME/bin/jpackage --version

diff --git a/bitcoinj-walletfx-template/build.gradle b/bitcoinj-walletfx-template/build.gradle
@@ -4,7 +4,7 @@ plugins {
     id 'eclipse'
     id 'application'
     id 'org.openjfx.javafxplugin' version '0.0.8'
-    id 'org.beryx.jlink' version '2.14.0'
+    id 'org.beryx.jlink' version '2.14.1'
     id 'org.javamodularity.moduleplugin'    version "1.5.0"
 }
 
@@ -76,13 +76,6 @@ jlink {
         // (Currently you need to manually install a OpenJDK 14 Early Access Build including jpackage)
         jpackageHome = System.getenv('BADASS_JLINK_JPACKAGE_HOME')
         skipInstaller = false
-        if (System.properties['os.name'].toLowerCase() == "mac os x") {
-            installerType = "dmg"
-        } else if (System.properties['os.name'].toLowerCase().contains('windows')) {
-            installerType = "exe"
-        } else {
-            installerType = "deb"
-        }
-        installerOptions = ["--identifier", appName]
+        identifier = appName
     }
 }