From 2baf583473feb5c0f2c8bb33dd955e75e6dd597d Mon Sep 17 00:00:00 2001 From: darksnake Date: Wed, 8 Nov 2023 16:15:36 +0300 Subject: [PATCH] Update versions --- README.md | 2 +- dataforge-gui/build.gradle.kts | 2 +- dataforge-gui/gui-demo/build.gradle | 2 +- dataforge-plots/build.gradle.kts | 2 +- dataforge-plots/plots-jfc/build.gradle.kts | 2 +- dataforge-plots/plots-viewer/build.gradle | 2 +- grind/grind-terminal/build.gradle | 2 +- numass-control/build.gradle | 2 +- numass-control/cryotemp/build.gradle | 4 ++-- .../src/main/kotlin/inr/numass/control/cryotemp/PKT8App.kt | 7 +++++++ numass-control/gun/build.gradle | 2 +- numass-control/magnet/build.gradle | 2 +- numass-control/msp/build.gradle | 7 +++---- .../msp/src/main/kotlin/inr/numass/control/msp/MspApp.kt | 7 +++++++ numass-control/vac/build.gradle | 4 ++-- .../src/main/kotlin/inr/numass/control/readvac/ReadVac.kt | 5 +++++ numass-main/build.gradle | 2 +- numass-viewer/build.gradle.kts | 2 +- 18 files changed, 38 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 60cf4077..80a1527c 100644 --- a/README.md +++ b/README.md @@ -9,4 +9,4 @@ This project build using [DataForge](http://www.inr.ru/~nozik/dataforge/) framew It is intended to fix this problem with public maven repository later. # Requirements # -Project requires JDK 8 with JavaFX for desktop controls (https://www.azul.com/downloads/?version=java-8-lts&package=jdk-fx) \ No newline at end of file +Project requires JDK 16 in the system. GUI modules must be compiled on the target OS (linux on linux systems) \ No newline at end of file diff --git a/dataforge-gui/build.gradle.kts b/dataforge-gui/build.gradle.kts index d54d64c6..7ddfe6a6 100644 --- a/dataforge-gui/build.gradle.kts +++ b/dataforge-gui/build.gradle.kts @@ -4,7 +4,7 @@ plugins { javafx { modules = listOf("javafx.controls", "javafx.web") - version = "11" + version = "16" } description = "A tornadofx based kotlin library" diff --git a/dataforge-gui/gui-demo/build.gradle b/dataforge-gui/gui-demo/build.gradle index a1f2a95a..3fa36f41 100644 --- a/dataforge-gui/gui-demo/build.gradle +++ b/dataforge-gui/gui-demo/build.gradle @@ -7,7 +7,7 @@ apply plugin: 'kotlin' javafx { modules = ["javafx.controls", "javafx.web"] - version = "11" + version = "16" } if (!hasProperty('mainClass')) { diff --git a/dataforge-plots/build.gradle.kts b/dataforge-plots/build.gradle.kts index 595216c2..74a18857 100644 --- a/dataforge-plots/build.gradle.kts +++ b/dataforge-plots/build.gradle.kts @@ -4,7 +4,7 @@ plugins { javafx { modules = listOf("javafx.controls") - version = "11" + version = "16" } description = "dataforge-plots" diff --git a/dataforge-plots/plots-jfc/build.gradle.kts b/dataforge-plots/plots-jfc/build.gradle.kts index cf7ac861..60792daa 100644 --- a/dataforge-plots/plots-jfc/build.gradle.kts +++ b/dataforge-plots/plots-jfc/build.gradle.kts @@ -4,7 +4,7 @@ plugins { javafx { modules = listOf("javafx.controls") - version = "11" + version = "16" } description = "jFreeChart plugin" diff --git a/dataforge-plots/plots-viewer/build.gradle b/dataforge-plots/plots-viewer/build.gradle index 384ced12..ca04ffb7 100644 --- a/dataforge-plots/plots-viewer/build.gradle +++ b/dataforge-plots/plots-viewer/build.gradle @@ -6,7 +6,7 @@ plugins { javafx { modules = ["javafx.controls", "javafx.web"] - version = "11" + version = "16" } apply plugin: "kotlin" diff --git a/grind/grind-terminal/build.gradle b/grind/grind-terminal/build.gradle index 994d308f..dda29360 100644 --- a/grind/grind-terminal/build.gradle +++ b/grind/grind-terminal/build.gradle @@ -7,7 +7,7 @@ plugins { javafx { modules = ["javafx.controls", "javafx.web"] - version = "11" + version = "16" } diff --git a/numass-control/build.gradle b/numass-control/build.gradle index 3275bc04..cd919e55 100644 --- a/numass-control/build.gradle +++ b/numass-control/build.gradle @@ -4,7 +4,7 @@ plugins { javafx { modules = ["javafx.controls", "javafx.web"] - version = "11" + version = "16" } diff --git a/numass-control/cryotemp/build.gradle b/numass-control/cryotemp/build.gradle index 34a8e7c6..cd7bb7c7 100644 --- a/numass-control/cryotemp/build.gradle +++ b/numass-control/cryotemp/build.gradle @@ -5,7 +5,7 @@ plugins{ javafx { modules = ["javafx.controls", "javafx.web"] - version = "11" + version = "16" } apply plugin: 'application' @@ -22,7 +22,7 @@ dependencies { } application{ - mainClassName("inr.numass.control.cryotemp.PKT8App") + mainClassName = "inr.numass.control.cryotemp.PKT8AppKt" } task testDevice(dependsOn: classes, type: JavaExec) { diff --git a/numass-control/cryotemp/src/main/kotlin/inr/numass/control/cryotemp/PKT8App.kt b/numass-control/cryotemp/src/main/kotlin/inr/numass/control/cryotemp/PKT8App.kt index c135f44e..25ae4284 100644 --- a/numass-control/cryotemp/src/main/kotlin/inr/numass/control/cryotemp/PKT8App.kt +++ b/numass-control/cryotemp/src/main/kotlin/inr/numass/control/cryotemp/PKT8App.kt @@ -18,6 +18,7 @@ package inr.numass.control.cryotemp import hep.dataforge.meta.Meta import hep.dataforge.meta.MetaUtils import inr.numass.control.NumassControlApplication +import javafx.application.Application import javafx.stage.Stage /** @@ -38,3 +39,9 @@ class PKT8App : NumassControlApplication() { .orElseThrow{RuntimeException("Temperature measurement configuration not found")} } } + +fun main() { + Application.launch(PKT8App::class.java) +} + + diff --git a/numass-control/gun/build.gradle b/numass-control/gun/build.gradle index 91108f6b..59305f9d 100644 --- a/numass-control/gun/build.gradle +++ b/numass-control/gun/build.gradle @@ -6,7 +6,7 @@ plugins{ javafx { modules = ["javafx.controls", "javafx.web"] - version = "11" + version = "16" } diff --git a/numass-control/magnet/build.gradle b/numass-control/magnet/build.gradle index 513e2e00..9b57d269 100644 --- a/numass-control/magnet/build.gradle +++ b/numass-control/magnet/build.gradle @@ -6,7 +6,7 @@ plugins{ javafx { modules = ["javafx.controls", "javafx.web"] - version = "11" + version = "16" } version = "0.3.0" diff --git a/numass-control/msp/build.gradle b/numass-control/msp/build.gradle index d84fd71a..1e51f2f1 100644 --- a/numass-control/msp/build.gradle +++ b/numass-control/msp/build.gradle @@ -5,15 +5,14 @@ plugins{ javafx { modules = ["javafx.controls", "javafx.web"] - version = "11" + version = "16" } version = "0.4.0" -if (!hasProperty('mainClass')) { - ext.mainClass = 'inr.numass.control.msp.MspApp' +application{ + mainClassName = "inr.numass.control.msp.MspAppKt" } -mainClassName = mainClass dependencies { diff --git a/numass-control/msp/src/main/kotlin/inr/numass/control/msp/MspApp.kt b/numass-control/msp/src/main/kotlin/inr/numass/control/msp/MspApp.kt index 8f923ddf..2949e625 100644 --- a/numass-control/msp/src/main/kotlin/inr/numass/control/msp/MspApp.kt +++ b/numass-control/msp/src/main/kotlin/inr/numass/control/msp/MspApp.kt @@ -18,6 +18,7 @@ package inr.numass.control.msp import hep.dataforge.meta.Meta import hep.dataforge.meta.MetaUtils import inr.numass.control.NumassControlApplication +import javafx.application.Application import javafx.stage.Stage /** @@ -39,3 +40,9 @@ class MspApp : NumassControlApplication() { } } + +fun main() { + Application.launch(MspApp::class.java) +} + + diff --git a/numass-control/vac/build.gradle b/numass-control/vac/build.gradle index 9e727fc0..5b1bbe3e 100644 --- a/numass-control/vac/build.gradle +++ b/numass-control/vac/build.gradle @@ -5,7 +5,7 @@ plugins{ javafx { modules = ["javafx.controls", "javafx.web"] - version = "11" + version = "16" } version = "0.6.0" @@ -15,7 +15,7 @@ dependencies { } application{ - mainClassName("inr.numass.control.readvac.ReadVac") + mainClassName = "inr.numass.control.readvac.ReadVacKt" } task testDevice(dependsOn: classes, type: JavaExec) { diff --git a/numass-control/vac/src/main/kotlin/inr/numass/control/readvac/ReadVac.kt b/numass-control/vac/src/main/kotlin/inr/numass/control/readvac/ReadVac.kt index 871a1e21..969d8b0b 100644 --- a/numass-control/vac/src/main/kotlin/inr/numass/control/readvac/ReadVac.kt +++ b/numass-control/vac/src/main/kotlin/inr/numass/control/readvac/ReadVac.kt @@ -8,6 +8,7 @@ package inr.numass.control.readvac import hep.dataforge.meta.Meta import hep.dataforge.meta.MetaUtils import inr.numass.control.NumassControlApplication +import javafx.application.Application import javafx.stage.Stage /** @@ -30,5 +31,9 @@ class ReadVac : NumassControlApplication() { } } +fun main() { + Application.launch(ReadVac::class.java) +} + diff --git a/numass-main/build.gradle b/numass-main/build.gradle index 78c423f2..ab3103cd 100644 --- a/numass-main/build.gradle +++ b/numass-main/build.gradle @@ -5,7 +5,7 @@ plugins { javafx { modules = ["javafx.controls", "javafx.web"] - version = "11" + version = "16" } apply plugin: 'kotlin' diff --git a/numass-viewer/build.gradle.kts b/numass-viewer/build.gradle.kts index d033aed4..84f48548 100644 --- a/numass-viewer/build.gradle.kts +++ b/numass-viewer/build.gradle.kts @@ -8,7 +8,7 @@ plugins { javafx { modules = listOf("javafx.graphics", "javafx.controls", "javafx.web") - version = "11" + version = "16" } repositories {