diff --git a/numass-control/build.gradle b/numass-control/build.gradle index 1244676a..61a6a1c8 100644 --- a/numass-control/build.gradle +++ b/numass-control/build.gradle @@ -1,6 +1,5 @@ buildscript { ext.kotlin_version = '1.1.51' - ext.kotlin_version = '1.1.4-2' repositories { mavenCentral() @@ -26,7 +25,7 @@ dependencies { compile project(':numass-client') compile "hep.dataforge:plots-jfc" // project(':dataforge-plots:plots-jfc') compile "hep.dataforge:dataforge-control" //project(':dataforge-control') - compile "hep.dataforge:kodex-fx" + compile "hep.dataforge:kodex-gui" compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" } @@ -74,16 +73,3 @@ task distAll(dependsOn: installAll, type: Zip) { from "$buildDir/install/numass-control" } -repositories { - mavenCentral() -} -compileKotlin { - kotlinOptions { - jvmTarget = "1.8" - } -} -compileTestKotlin { - kotlinOptions { - jvmTarget = "1.8" - } -} \ No newline at end of file diff --git a/numass-control/msp/build.gradle b/numass-control/msp/build.gradle index cee50991..c60bd867 100644 --- a/numass-control/msp/build.gradle +++ b/numass-control/msp/build.gradle @@ -1,5 +1,4 @@ apply plugin: 'application' -apply plugin: 'kotlin' version = "0.4.0" @@ -11,27 +10,4 @@ mainClassName = mainClass dependencies { compile project(':numass-control') - compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" -} -buildscript { - ext.kotlin_version = '1.1.51' - repositories { - mavenCentral() - } - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} -repositories { - mavenCentral() -} -compileKotlin { - kotlinOptions { - jvmTarget = "1.8" - } -} -compileTestKotlin { - kotlinOptions { - jvmTarget = "1.8" - } } \ No newline at end of file diff --git a/numass-control/vac/build.gradle b/numass-control/vac/build.gradle index 73a2b3f2..dbb783d8 100644 --- a/numass-control/vac/build.gradle +++ b/numass-control/vac/build.gradle @@ -1,5 +1,4 @@ apply plugin: 'application' -apply plugin: 'kotlin' version = "0.5.0" @@ -10,7 +9,6 @@ mainClassName = mainClass dependencies { compile project(':numass-control') - compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" } task testDevice(dependsOn: classes, type: JavaExec) { @@ -19,26 +17,4 @@ task testDevice(dependsOn: classes, type: JavaExec) { classpath = sourceSets.main.runtimeClasspath description "Start application in debug mode with default virtual port" group "test" -} -buildscript { - ext.kotlin_version = '1.1.51' - repositories { - mavenCentral() - } - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} -repositories { - mavenCentral() -} -compileKotlin { - kotlinOptions { - jvmTarget = "1.8" - } -} -compileTestKotlin { - kotlinOptions { - jvmTarget = "1.8" - } } \ No newline at end of file diff --git a/numass-main/build.gradle b/numass-main/build.gradle index 9360b26e..7649d477 100644 --- a/numass-main/build.gradle +++ b/numass-main/build.gradle @@ -33,7 +33,7 @@ dependencies { compile "hep.dataforge:dataforge-minuit" //project(':dataforge-stat:dataforge-minuit') compile "hep.dataforge:grind-terminal" //project(':dataforge-grind:grind-terminal') compile "hep.dataforge:kmath" - compile "hep.dataforge:kodex-fx" + compile "hep.dataforge:kodex-gui" // https://mvnrepository.com/artifact/org.ehcache/ehcache compile group: 'org.ehcache', name: 'ehcache', version: '3.4.0' diff --git a/numass-viewer/build.gradle b/numass-viewer/build.gradle index 341f21a4..73502cca 100644 --- a/numass-viewer/build.gradle +++ b/numass-viewer/build.gradle @@ -24,7 +24,7 @@ compileKotlin.kotlinOptions.jvmTarget = "1.8" dependencies { compile project(':numass-core') compile "hep.dataforge:plots-jfc" //project(':dataforge-plots:plots-jfc') - compile "hep.dataforge:kodex-fx" + compile "hep.dataforge:kodex-gui" compile 'com.jcraft:jsch:0.1.54' }