diff --git a/numass-control/build.gradle b/numass-control/build.gradle index 97f744c0..1244676a 100644 --- a/numass-control/build.gradle +++ b/numass-control/build.gradle @@ -1,4 +1,5 @@ buildscript { + ext.kotlin_version = '1.1.51' ext.kotlin_version = '1.1.4-2' repositories { @@ -26,6 +27,7 @@ dependencies { compile "hep.dataforge:plots-jfc" // project(':dataforge-plots:plots-jfc') compile "hep.dataforge:dataforge-control" //project(':dataforge-control') compile "hep.dataforge:kodex-fx" + compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" } @@ -71,4 +73,17 @@ task distAll(dependsOn: installAll, type: Zip) { description "Make a distribution of all control projects" 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/control-room/build.gradle b/numass-control/control-room/build.gradle index 7a1e8326..6591064c 100644 --- a/numass-control/control-room/build.gradle +++ b/numass-control/control-room/build.gradle @@ -29,6 +29,7 @@ dependencies { devices project(':numass-control:cryotemp') devices project(':numass-control:msp') devices project(':numass-control:vac') + compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" } shadowJar{ @@ -69,3 +70,4 @@ distributions{ + diff --git a/numass-control/cryotemp/build.gradle b/numass-control/cryotemp/build.gradle index 83144b31..f62ff8a7 100644 --- a/numass-control/cryotemp/build.gradle +++ b/numass-control/cryotemp/build.gradle @@ -1,4 +1,5 @@ apply plugin: 'application' +apply plugin: 'kotlin' if (!hasProperty('mainClass')) { ext.mainClass = 'inr.numass.control.cryotemp.PKT8App' @@ -11,6 +12,7 @@ version = "0.2.0"; dependencies { compile project(':numass-control') + compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" } task testDevice(dependsOn: classes, type: JavaExec) { @@ -20,6 +22,28 @@ task testDevice(dependsOn: classes, type: JavaExec) { 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" + } +} //task testRun(dependsOn: classes, type: JavaExec) { // main mainClass diff --git a/numass-control/msp/build.gradle b/numass-control/msp/build.gradle index c60bd867..cee50991 100644 --- a/numass-control/msp/build.gradle +++ b/numass-control/msp/build.gradle @@ -1,4 +1,5 @@ apply plugin: 'application' +apply plugin: 'kotlin' version = "0.4.0" @@ -10,4 +11,27 @@ 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 dbb783d8..73a2b3f2 100644 --- a/numass-control/vac/build.gradle +++ b/numass-control/vac/build.gradle @@ -1,4 +1,5 @@ apply plugin: 'application' +apply plugin: 'kotlin' version = "0.5.0" @@ -9,6 +10,7 @@ mainClassName = mainClass dependencies { compile project(':numass-control') + compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" } task testDevice(dependsOn: classes, type: JavaExec) { @@ -17,4 +19,26 @@ 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