Переглянути джерело

Merge branch 'main' into staging

palexdev 3 роки тому
батько
коміт
b709d15f79
4 змінених файлів з 18 додано та 3 видалено
  1. 0 0
      .github/FUNDING.yml
  2. 1 1
      README.md
  3. 1 1
      build.gradle
  4. 16 1
      demo/build.gradle

+ 0 - 0
.github/workflows/FUNDING.yml → .github/FUNDING.yml


+ 1 - 1
README.md

@@ -1,6 +1,6 @@
 [![HitCount](http://hits.dwyl.com/PAlex404/MaterialFX.svg)](http://hits.dwyl.com/PAlex404/MaterialFX)
 ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/palexdev/materialfx/Java%20CI%20with%20Gradle?label=github%20build&style=flat-square)
-![Sonatype Nexus (Releases)](https://img.shields.io/nexus/r/io.github.palexdev/materialfx?server=https%3A%2F%2Foss.sonatype.org&style=flat-square)
+![Sonatype Nexus (Releases)](https://img.shields.io/nexus/r/io.github.palexdev/materialfx?server=https%3A%2F%2Fs01.oss.sonatype.org&style=flat-square)
 ![GitHub issues](https://img.shields.io/github/issues-raw/palexdev/materialfx?style=flat-square)
 ![GitHub pull requests](https://img.shields.io/github/issues-pr/palexdev/materialfx?style=flat-square)
 ![GitHub](https://img.shields.io/github/license/palexdev/materialfx?style=flat-square)

+ 1 - 1
build.gradle

@@ -24,7 +24,7 @@ subprojects {
     apply plugin: 'org.openjfx.javafxplugin'
 
     javafx {
-        version = "17.0.1"
+        version = "17.0.2"
         modules = ['javafx.controls', 'javafx.fxml', 'javafx.media', 'javafx.swing', 'javafx.web']
     }
 }

+ 16 - 1
demo/build.gradle

@@ -38,7 +38,7 @@ application {
 }
 
 jlink {
-    imageZip = file("$buildDir/$rootProject.name-$rootProject.version" + '.zip')
+    options = ['--strip-debug', '--compress', '2', '--no-header-files', '--no-man-pages']
     launcher {
         mainClass = "io.github.palexdev.materialfx.demo.Demo"
         name = 'MaterialFX Demo'
@@ -46,6 +46,21 @@ jlink {
     jpackage {
         imageOptions = ['--icon', 'src/main/resources/logo.ico']
     }
+
+    targetPlatform("linux-x64") {
+        jdkHome = jdkDownload("https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-linux_x64.tar.gz")
+        addExtraModulePath("/home/palexdev/Documents/JavaFX_jmods/linux_x64")
+    }
+
+    targetPlatform("win") {
+        jdkHome = jdkDownload("https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-win_x64.zip")
+        addExtraModulePath("/home/palexdev/Documents/JavaFX_jmods/win_x64")
+    }
+
+    targetPlatform("mac") {
+        jdkHome = jdkDownload("https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-macosx_x64.tar.gz")
+        addExtraModulePath("/home/palexdev/Documents/JavaFX_jmods/mac_x64")
+    }
 }
 
 test {