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

:green_heart: Upgrade jlink and jdks

Alessadro Parisi 2 роки тому
батько
коміт
f453137cf8
3 змінених файлів з 30 додано та 25 видалено
  1. 21 21
      .run/MaterialFX [jlinkZip].run.xml
  2. 8 3
      demo/build.gradle
  3. 1 1
      gradle.properties

+ 21 - 21
.run/MaterialFX [jlinkZip].run.xml

@@ -1,23 +1,23 @@
 <component name="ProjectRunConfigurationManager">
-    <configuration default="false" name="MaterialFX [jlinkZip]" type="GradleRunConfiguration" factoryName="Gradle">
-        <ExternalSystemSettings>
-            <option name="executionName"/>
-            <option name="externalProjectPath" value="$PROJECT_DIR$"/>
-            <option name="externalSystemIdString" value="GRADLE"/>
-            <option name="scriptParameters" value="-PchooseMain=io.github.palexdev.materialfx.demo.Demo"/>
-            <option name="taskDescriptions">
-                <list/>
-            </option>
-            <option name="taskNames">
-                <list>
-                    <option value="jlinkZip"/>
-                </list>
-            </option>
-            <option name="vmOptions" value=""/>
-        </ExternalSystemSettings>
-        <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
-        <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-        <DebugAllEnabled>false</DebugAllEnabled>
-        <method v="2"/>
-    </configuration>
+  <configuration default="false" name="MaterialFX [jlinkZip]" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="-PchooseMain=io.github.palexdev.materialfx.demo.Demo --stacktrace" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="jlinkZip" />
+        </list>
+      </option>
+      <option name="vmOptions" value="" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <method v="2" />
+  </configuration>
 </component>

+ 8 - 3
demo/build.gradle

@@ -30,6 +30,11 @@ dependencies {
     implementation project(':materialfx')
 }
 
+compileJava {
+    sourceCompatibility = "$testJdk"
+    targetCompatibility = "$testJdk"
+}
+
 compileTestJava {
     moduleOptions {
         compileOnClasspath = true
@@ -65,17 +70,17 @@ jlink {
     }
 
     targetPlatform("linux-x64") {
-        jdkHome = jdkDownload("https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-linux_x64.tar.gz")
+        jdkHome = jdkDownload("https://cdn.azul.com/zulu/bin/zulu19.32.13-ca-jdk19.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")
+        jdkHome = jdkDownload("https://cdn.azul.com/zulu/bin/zulu19.32.13-ca-jdk19.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")
+        jdkHome = jdkDownload("https://cdn.azul.com/zulu/bin/zulu19.32.13-ca-jdk19.0.2-macosx_x64.tar.gz")
         addExtraModulePath("/home/palexdev/Documents/JavaFX_jmods/mac_x64")
     }
 

+ 1 - 1
gradle.properties

@@ -7,7 +7,7 @@ materialfx=11.13.10
 
 # Plugins
 jfxPlugin=0.0.13
-jlink=2.25.0
+jlink=2.26.0
 bnd=6.2.0
 mavenPublish=0.19.0
 shadowJarPlugin=7.1.2