From a0470d13983d0662ade330683fca9aa2dd049170 Mon Sep 17 00:00:00 2001 From: Marcus Hirt Date: Tue, 17 Feb 2026 22:35:47 +0100 Subject: [PATCH 1/2] Gradle and JDK update --- calibration/robo4j-magviz/build.gradle | 65 ++++++++++++----------- calibration/robo4j-magviz/settings.gradle | 8 ++- 2 files changed, 40 insertions(+), 33 deletions(-) diff --git a/calibration/robo4j-magviz/build.gradle b/calibration/robo4j-magviz/build.gradle index b70c1ca..5025b70 100644 --- a/calibration/robo4j-magviz/build.gradle +++ b/calibration/robo4j-magviz/build.gradle @@ -1,48 +1,41 @@ -group 'com.robo4j' +plugins { + id 'java' + id 'application' + id 'org.openjfx.javafxplugin' version '0.1.0' +} -apply plugin: 'java' -apply plugin: 'idea' -apply plugin: 'maven' +group = 'com.robo4j' +version = '0.5-SNAPSHOT' -apply from: 'libraries.gradle' +java { + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 +} -version "${robo4jVersion}" +application { + mainClass = 'com.robo4j.tools.magviz.MagViz' + applicationDefaultJvmArgs = ['-Dprism.forceGPU=true'] +} -sourceCompatibility = 1.8 +javafx { + version = '22.0.2' + modules = ['javafx.controls', 'javafx.fxml'] +} repositories { mavenCentral() mavenLocal() } -//create a single Jar with all dependencies -task fatJar(type: Jar) { - manifest { - attributes 'Implementation-Title': 'robo4j-magviz', - 'Implementation-Version': version, - 'Main-Class': 'com.robo4j.tools.magviz.MagViz' - } - //baseName = project.name + '-all' - baseName = 'robo4j-magviz' - from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } - with jar -} - -task wrapper(type: Wrapper) { - gradleVersion = "${roboGradleVersion}" -} - -//sources sourceSets { main { java { - srcDirs = ['src/main/java', 'src/examples/java', 'src/test/java'] + srcDirs = ['src/main/java', 'src/examples/java'] } resources { - srcDirs = ['src/main/resources', 'src/examples/resources', 'src/test/resources'] + srcDirs = ['src/main/resources', 'src/examples/resources'] } } - test { java { srcDirs = ['src/test/java'] @@ -54,8 +47,16 @@ sourceSets { } dependencies { - compile "org.apache.commons:commons-math3:${apacheCommonsMath3}" - testCompile "junit:junit:${junitVersion}@jar" - testCompile "org.hamcrest:hamcrest-all:${hamcrestAllVersion}@jar" - testCompile "org.mockito:mockito-all:${mockitoAllVersion}@jar" + implementation 'org.apache.commons:commons-math3:3.6.1' + testImplementation 'junit:junit:4.12' + testImplementation 'org.hamcrest:hamcrest-all:1.3' + testImplementation 'org.mockito:mockito-all:1.10.19' +} + +tasks.named('jar') { + manifest { + attributes 'Implementation-Title': 'robo4j-magviz', + 'Implementation-Version': version, + 'Main-Class': 'com.robo4j.tools.magviz.MagViz' + } } diff --git a/calibration/robo4j-magviz/settings.gradle b/calibration/robo4j-magviz/settings.gradle index 1fc2415..1456528 100644 --- a/calibration/robo4j-magviz/settings.gradle +++ b/calibration/robo4j-magviz/settings.gradle @@ -15,5 +15,11 @@ * along with Robo4J. If not, see . */ -rootProject.name = 'robo4j-magviz' +pluginManagement { + repositories { + gradlePluginPortal() + mavenCentral() + } +} +rootProject.name = 'robo4j-magviz' From f7286602fff4997fd995f3180a241afc9f29077f Mon Sep 17 00:00:00 2001 From: Marcus Hirt Date: Tue, 17 Feb 2026 22:36:29 +0100 Subject: [PATCH 2/2] Run script --- calibration/robo4j-magviz/run.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100755 calibration/robo4j-magviz/run.sh diff --git a/calibration/robo4j-magviz/run.sh b/calibration/robo4j-magviz/run.sh new file mode 100755 index 0000000..d98c208 --- /dev/null +++ b/calibration/robo4j-magviz/run.sh @@ -0,0 +1,18 @@ +#!/bin/bash +JFXDIR="/home/marcus/.gradle/caches/modules-2/files-2.1/org.openjfx" +MP="${JFXDIR}/javafx-base/22.0.2/87652b5069e97b488058450586ba29c7acf6208a/javafx-base-22.0.2-linux-aarch64.jar" +MP="${MP}:${JFXDIR}/javafx-controls/22.0.2/379031448fffd870bc2d36a2898702d7c642ddc3/javafx-controls-22.0.2-linux-aarch64.jar" +MP="${MP}:${JFXDIR}/javafx-fxml/22.0.2/2235e2d20c7616ddb4015bc58a32fbd564714f48/javafx-fxml-22.0.2-linux-aarch64.jar" +MP="${MP}:${JFXDIR}/javafx-graphics/22.0.2/4298fee56400e286cbb7282594fd4c5f79104da3/javafx-graphics-22.0.2-linux-aarch64.jar" +CP="build/classes/java/main:build/resources/main:/home/marcus/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-math3/3.6.1/e4ba98f1d4b3c80ec46392f25e094a6a2e58fcbf/commons-math3-3.6.1.jar" + +cd /home/marcus/git/forks/robo4j-tools/calibration/robo4j-magviz + +exec java \ + -p "${MP}" \ + --add-modules javafx.controls,javafx.fxml \ + -Dprism.verbose=true \ + -Dprism.forceGPU=true \ + "$@" \ + -cp "${CP}" \ + com.robo4j.tools.magviz.MagViz src/examples/resources/magnetometer.csv