NPM/numass-framework
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update versions

Browse Source
This commit is contained in:
Alexander Nozik 2023-11-08 16:15:36 +03:00
parent 9a1e9dc996
commit 2baf583473
18 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -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. It is intended to fix this problem with public maven repository later.
# Requirements # # Requirements #
Project requires JDK 8 with JavaFX for desktop controls (https://www.azul.com/downloads/?version=java-8-lts&package=jdk-fx) Project requires JDK 16 in the system. GUI modules must be compiled on the target OS (linux on linux systems)

2
dataforge-gui/build.gradle.kts
View File

@ -4,7 +4,7 @@ plugins {
javafx { javafx {
modules = listOf("javafx.controls", "javafx.web") modules = listOf("javafx.controls", "javafx.web")
version = "11" version = "16"
} }
description = "A tornadofx based kotlin library" description = "A tornadofx based kotlin library"

2
dataforge-gui/gui-demo/build.gradle
View File

@ -7,7 +7,7 @@ apply plugin: 'kotlin'
javafx { javafx {
modules = ["javafx.controls", "javafx.web"] modules = ["javafx.controls", "javafx.web"]
version = "11" version = "16"
} }
if (!hasProperty('mainClass')) { if (!hasProperty('mainClass')) {

2
dataforge-plots/build.gradle.kts
View File

@ -4,7 +4,7 @@ plugins {
javafx { javafx {
modules = listOf("javafx.controls") modules = listOf("javafx.controls")
version = "11" version = "16"
} }
description = "dataforge-plots" description = "dataforge-plots"

2
dataforge-plots/plots-jfc/build.gradle.kts
View File

@ -4,7 +4,7 @@ plugins {
javafx { javafx {
modules = listOf("javafx.controls") modules = listOf("javafx.controls")
version = "11" version = "16"
} }
description = "jFreeChart plugin" description = "jFreeChart plugin"

2
dataforge-plots/plots-viewer/build.gradle
View File

@ -6,7 +6,7 @@ plugins {
javafx { javafx {
modules = ["javafx.controls", "javafx.web"] modules = ["javafx.controls", "javafx.web"]
version = "11" version = "16"
} }
apply plugin: "kotlin" apply plugin: "kotlin"

2
grind/grind-terminal/build.gradle
View File

@ -7,7 +7,7 @@ plugins {
javafx { javafx {
modules = ["javafx.controls", "javafx.web"] modules = ["javafx.controls", "javafx.web"]
version = "11" version = "16"
} }

2
numass-control/build.gradle
View File

@ -4,7 +4,7 @@ plugins {
javafx { javafx {
modules = ["javafx.controls", "javafx.web"] modules = ["javafx.controls", "javafx.web"]
version = "11" version = "16"
} }

4
numass-control/cryotemp/build.gradle
View File

@ -5,7 +5,7 @@ plugins{
javafx { javafx {
modules = ["javafx.controls", "javafx.web"] modules = ["javafx.controls", "javafx.web"]
version = "11" version = "16"
} }
apply plugin: 'application' apply plugin: 'application'
@ -22,7 +22,7 @@ dependencies {
} }
application{ application{
mainClassName("inr.numass.control.cryotemp.PKT8App") mainClassName = "inr.numass.control.cryotemp.PKT8AppKt"
} }
task testDevice(dependsOn: classes, type: JavaExec) { task testDevice(dependsOn: classes, type: JavaExec) {

7
numass-control/cryotemp/src/main/kotlin/inr/numass/control/cryotemp/PKT8App.kt
View File

@ -18,6 +18,7 @@ package inr.numass.control.cryotemp
import hep.dataforge.meta.Meta import hep.dataforge.meta.Meta
import hep.dataforge.meta.MetaUtils import hep.dataforge.meta.MetaUtils
import inr.numass.control.NumassControlApplication import inr.numass.control.NumassControlApplication
import javafx.application.Application
import javafx.stage.Stage import javafx.stage.Stage
/** /**
@ -38,3 +39,9 @@ class PKT8App : NumassControlApplication<PKT8Device>() {
.orElseThrow{RuntimeException("Temperature measurement configuration not found")} .orElseThrow{RuntimeException("Temperature measurement configuration not found")}
} }
} }
fun main() {
Application.launch(PKT8App::class.java)
}

2
numass-control/gun/build.gradle
View File

@ -6,7 +6,7 @@ plugins{
javafx { javafx {
modules = ["javafx.controls", "javafx.web"] modules = ["javafx.controls", "javafx.web"]
version = "11" version = "16"
} }

2
numass-control/magnet/build.gradle
View File

@ -6,7 +6,7 @@ plugins{
javafx { javafx {
modules = ["javafx.controls", "javafx.web"] modules = ["javafx.controls", "javafx.web"]
version = "11" version = "16"
} }
version = "0.3.0" version = "0.3.0"

7
numass-control/msp/build.gradle
View File

@ -5,15 +5,14 @@ plugins{
javafx { javafx {
modules = ["javafx.controls", "javafx.web"] modules = ["javafx.controls", "javafx.web"]
version = "11" version = "16"
} }
version = "0.4.0" version = "0.4.0"
if (!hasProperty('mainClass')) { application{
ext.mainClass = 'inr.numass.control.msp.MspApp' mainClassName = "inr.numass.control.msp.MspAppKt"
} }
mainClassName = mainClass
dependencies { dependencies {

7
numass-control/msp/src/main/kotlin/inr/numass/control/msp/MspApp.kt
View File

@ -18,6 +18,7 @@ package inr.numass.control.msp
import hep.dataforge.meta.Meta import hep.dataforge.meta.Meta
import hep.dataforge.meta.MetaUtils import hep.dataforge.meta.MetaUtils
import inr.numass.control.NumassControlApplication import inr.numass.control.NumassControlApplication
import javafx.application.Application
import javafx.stage.Stage import javafx.stage.Stage
/** /**
@ -39,3 +40,9 @@ class MspApp : NumassControlApplication<MspDevice>() {
} }
} }
fun main() {
Application.launch(MspApp::class.java)
}

4
numass-control/vac/build.gradle
View File

@ -5,7 +5,7 @@ plugins{
javafx { javafx {
modules = ["javafx.controls", "javafx.web"] modules = ["javafx.controls", "javafx.web"]
version = "11" version = "16"
} }
version = "0.6.0" version = "0.6.0"
@ -15,7 +15,7 @@ dependencies {
} }
application{ application{
mainClassName("inr.numass.control.readvac.ReadVac") mainClassName = "inr.numass.control.readvac.ReadVacKt"
} }
task testDevice(dependsOn: classes, type: JavaExec) { task testDevice(dependsOn: classes, type: JavaExec) {

5
numass-control/vac/src/main/kotlin/inr/numass/control/readvac/ReadVac.kt
View File

@ -8,6 +8,7 @@ package inr.numass.control.readvac
import hep.dataforge.meta.Meta import hep.dataforge.meta.Meta
import hep.dataforge.meta.MetaUtils import hep.dataforge.meta.MetaUtils
import inr.numass.control.NumassControlApplication import inr.numass.control.NumassControlApplication
import javafx.application.Application
import javafx.stage.Stage import javafx.stage.Stage
/** /**
@ -30,5 +31,9 @@ class ReadVac : NumassControlApplication<VacCollectorDevice>() {
} }
} }
fun main() {
Application.launch(ReadVac::class.java)
}

2
numass-main/build.gradle
View File

@ -5,7 +5,7 @@ plugins {
javafx { javafx {
modules = ["javafx.controls", "javafx.web"] modules = ["javafx.controls", "javafx.web"]
version = "11" version = "16"
} }
apply plugin: 'kotlin' apply plugin: 'kotlin'

2
numass-viewer/build.gradle.kts
View File

@ -8,7 +8,7 @@ plugins {
javafx { javafx {
modules = listOf("javafx.graphics", "javafx.controls", "javafx.web") modules = listOf("javafx.graphics", "javafx.controls", "javafx.web")
version = "11" version = "16"
} }
repositories { repositories {