[ikonli-browser] Add jlink configuration

kordamp · May 2, 2021 · 5ed36b7 · 5ed36b7
1 parent 8f1aa8a
commit 5ed36b7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 21 deletions.
diff --git a/apps/ikonli-browser/ikonli-browser.gradle b/apps/ikonli-browser/ikonli-browser.gradle
@@ -17,13 +17,13 @@
  */
 plugins {
     id 'application'
-    // id 'com.github.johnrengelman.shadow' version '6.1.0'
+    id 'org.beryx.jlink'
 }
 
 ext.moduleName = 'org.kordamp.ikonli.browser'
 ext.moduleMainClass = 'org.kordamp.ikonli.browser.Launcher'
 
-// mainClassName = "${moduleName}/${moduleMainClass}"
+//mainClassName = "${moduleName}/${moduleMainClass}"
 mainClassName = moduleMainClass
 
 repositories {
@@ -140,28 +140,14 @@ distTar {
     archiveClassifier = osdetector.os
 }
 
-/*
 jlink {
-    imageDir = project.layout.buildDirectory.dir("ikonli-browser-${version}-${platform}".toString())
-    imageZip = project.layout.buildDirectory.file("ikonli-browser-${version}-${platform}.zip".toString())
+    imageName = "ikonli-browser-standalone-${version}-${platform}".toString()
     options = ['--strip-debug', '--compress', '2', '--no-header-files', '--no-man-pages']
     launcher {
         name = 'ikonli-browser'
         noConsole = true
     }
     addExtraDependencies('javafx')
 }
-*/
 
-/*
-shadowJar {
-    archiveClassifier = platform
-    mergeServiceFiles()
-    exclude 'module-info.class'
-    exclude 'META-INF/maven/**'
-
-    manifest {
-        attributes('Main-Class': moduleMainClass)
-    }
-}
- */
+assemble.dependsOn(jlinkZip)
diff --git a/build.gradle b/build.gradle
@@ -132,6 +132,4 @@ project.rootProject.gradle.addBuildListener(new BuildAdapter() {
                 }
             }
     }
-})
-
-new File('VERSION').text = project.version
+})
diff --git a/gradle.properties b/gradle.properties
@@ -30,6 +30,7 @@ kordampBuildVersion     = 2.4.0
 gitPluginVersion        = 3.0.0
 modularityPluginVersion = 1.8.2
 java9cPluginVersion     = 0.2.3
+jlinkPluginVersion      = 2.21.1
 miglayoutVersion        = 11.0
 rxjavaVersion           = 3.0.12
 

diff --git a/settings.gradle b/settings.gradle
@@ -28,6 +28,7 @@ pluginManagement {
         id 'com.google.osdetector'           version osPluginVersion
         id 'org.jonnyzzz.java9c'             version java9cPluginVersion
         id 'org.javamodularity.moduleplugin' version modularityPluginVersion
+        id 'org.beryx.jlink'                 version jlinkPluginVersion
     }
 }