Upgrades to latest Java FX for core module.

Other modules are way too far behind for my m1 machine.
This commit is contained in:
Julien Lengrand-Lambert
2025-04-13 11:01:39 +02:00
parent a8f766f4d0
commit 7b78de5920
6 changed files with 12 additions and 25 deletions

View File

@@ -1,3 +1,4 @@
# Enable auto-env through the sdkman_auto_env config
# Add key=value pairs of SDKs to use below
java=17.0.14.fx-zulu
# java=17.0.14.fx-zulu
java=23.0.2.fx-librca

View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

View File

@@ -5,8 +5,6 @@
* @author [Krešimir Pripužić](mailto:kresimir.pripuzic@fer.hr)
*/
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
id("org.jetbrains.kotlin.jvm")
@@ -20,32 +18,21 @@ tasks.withType<Jar> {
}
dependencies {
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
implementation("org.jetbrains.kotlin:kotlin-stdlib")
implementation("org.jetbrains.kotlin:kotlin-reflect")
testImplementation("org.jetbrains.kotlin:kotlin-test")
testImplementation("org.jetbrains.kotlin:kotlin-test-junit")
implementation("org.hamcrest:hamcrest-all:1.3")
testImplementation("org.hamcrest:hamcrest:3.0")
implementation("ch.qos.logback:logback-classic:1.2.3")
implementation("ch.qos.logback:logback-core:1.2.3")
implementation("ch.qos.logback:logback-classic:1.5.18")
implementation("ch.qos.logback:logback-core:1.5.18")
implementation("org.slf4j:slf4j-api:1.7.30")
}
val compileKotlin: KotlinCompile by tasks
compileKotlin.kotlinOptions {
jvmTarget = "1.8"
}
val compileTestKotlin: KotlinCompile by tasks
compileTestKotlin.kotlinOptions {
jvmTarget = "1.8"
implementation("org.slf4j:slf4j-api:2.0.17")
}
javafx {
version = "17.0.14"
modules("javafx.controls", "javafx.fxml", "javafx.graphics", "javafx.swing")
}

View File

@@ -48,7 +48,7 @@ class `5_SimulationOutputsTest` {
simulation.outputs {
csvExporter = CsvExporter("output_data.csv", ";")
pngExporter = PngExporter("output_chart.png")
// winSimulator = WinSimulator()
winSimulator = WinSimulator()
// !!! Mobile simulator test has to be run from Android Test, because Java modules
// cannot depend on Android modules (reverse is ok).

View File

@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
id("org.jetbrains.kotlin.jvm")
id("org.gretty") version "3.0.3"
id("org.gretty") version "3.1.0"
id("com.devsoap.plugin.vaadin") version "2.0.0.beta2"
}

View File

@@ -10,12 +10,11 @@ pluginManagement {
repositories {
google()
gradlePluginPortal()
jcenter()
mavenLocal()
}
val kotlinVersion = "1.4.20"
val androidGradlePluginVersion = "4.0.2"
val kotlinVersion = "2.1.10"
val androidGradlePluginVersion = "8.9"
plugins {
id("org.jetbrains.kotlin.jvm") version kotlinVersion apply false