From 4162f771a8dcad24ccc8080a5d1e9309164eb3ee Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Sat, 17 Nov 2018 22:27:12 +0300 Subject: [PATCH] Reverted gradle to `compile` scope --- build.gradle | 4 ++-- numass-control/build.gradle | 8 ++++---- numass-control/control-room/build.gradle | 4 ++-- numass-control/cryotemp/build.gradle | 2 +- numass-control/dante/build.gradle | 4 ++-- numass-control/magnet/build.gradle | 2 +- numass-control/msp/build.gradle | 2 +- numass-control/vac/build.gradle | 2 +- numass-core/build.gradle | 8 ++++---- numass-main/build.gradle | 16 ++++++++-------- numass-server/build.gradle | 8 ++++---- numass-viewer/build.gradle | 6 +++--- numass-web/build.gradle | 8 ++++---- 13 files changed, 37 insertions(+), 37 deletions(-) diff --git a/build.gradle b/build.gradle index a8d7f9ea..cbf22cb7 100644 --- a/build.gradle +++ b/build.gradle @@ -28,8 +28,8 @@ allprojects { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" + compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" testImplementation group: 'junit', name: 'junit', version: '4.+' } diff --git a/numass-control/build.gradle b/numass-control/build.gradle index 7e8230af..cbf2f947 100644 --- a/numass-control/build.gradle +++ b/numass-control/build.gradle @@ -16,12 +16,12 @@ allprojects { } dependencies { - implementation "hep.dataforge:plots-jfc" // project(':dataforge-plots:plots-jfc') - implementation "hep.dataforge:dataforge-control" //project(':dataforge-control') - implementation "hep.dataforge:dataforge-gui" + compile "hep.dataforge:plots-jfc" // project(':dataforge-plots:plots-jfc') + compile "hep.dataforge:dataforge-control" //project(':dataforge-control') + compile "hep.dataforge:dataforge-gui" // https://mvnrepository.com/artifact/commons-cli/commons-cli - implementation group: 'commons-cli', name: 'commons-cli', version: '1.4' + compile group: 'commons-cli', name: 'commons-cli', version: '1.4' } diff --git a/numass-control/control-room/build.gradle b/numass-control/control-room/build.gradle index 19c8e98a..24a8919b 100644 --- a/numass-control/control-room/build.gradle +++ b/numass-control/control-room/build.gradle @@ -22,8 +22,8 @@ configurations { dependencies { //DataForge dependencies - implementation project(':numass-control') - //implementation project(':numass-server') + compile project(':numass-control') + //compile project(':numass-server') // optional device classpath devices project(':numass-control:cryotemp') diff --git a/numass-control/cryotemp/build.gradle b/numass-control/cryotemp/build.gradle index a45537f3..2f3112ad 100644 --- a/numass-control/cryotemp/build.gradle +++ b/numass-control/cryotemp/build.gradle @@ -11,7 +11,7 @@ version = "0.2.0"; //mainClassName = "inr.numass.readvac.Main" dependencies { - implementation project(':numass-control') + compile project(':numass-control') } task testDevice(dependsOn: classes, type: JavaExec) { diff --git a/numass-control/dante/build.gradle b/numass-control/dante/build.gradle index 00b67661..5289c705 100644 --- a/numass-control/dante/build.gradle +++ b/numass-control/dante/build.gradle @@ -17,6 +17,6 @@ version = "0.1.0" dependencies { - implementation project(':numass-control') - implementation project(':numass-core') + compile project(':numass-control') + compile project(':numass-core') } \ No newline at end of file diff --git a/numass-control/magnet/build.gradle b/numass-control/magnet/build.gradle index 66e3450f..ea7023b2 100644 --- a/numass-control/magnet/build.gradle +++ b/numass-control/magnet/build.gradle @@ -8,7 +8,7 @@ if (!hasProperty('mainClass')) { mainClassName = mainClass dependencies { - implementation project(':numass-control') + compile project(':numass-control') } task talkToServer(type: JavaExec) { diff --git a/numass-control/msp/build.gradle b/numass-control/msp/build.gradle index b76c1a45..c60bd867 100644 --- a/numass-control/msp/build.gradle +++ b/numass-control/msp/build.gradle @@ -9,5 +9,5 @@ mainClassName = mainClass dependencies { - implementation project(':numass-control') + compile project(':numass-control') } \ No newline at end of file diff --git a/numass-control/vac/build.gradle b/numass-control/vac/build.gradle index 793d84b0..dbb783d8 100644 --- a/numass-control/vac/build.gradle +++ b/numass-control/vac/build.gradle @@ -8,7 +8,7 @@ if (!hasProperty('mainClass')) { mainClassName = mainClass dependencies { - implementation project(':numass-control') + compile project(':numass-control') } task testDevice(dependsOn: classes, type: JavaExec) { diff --git a/numass-core/build.gradle b/numass-core/build.gradle index 56bc2e7b..8cb3dc4a 100644 --- a/numass-core/build.gradle +++ b/numass-core/build.gradle @@ -13,12 +13,12 @@ description = "A bse package with minimal dependencies for numass" dependencies { - implementation "hep.dataforge:dataforge-storage2" - implementation "hep.dataforge:dataforge-json" - implementation 'com.google.protobuf:protobuf-java:3.5.0' + compile "hep.dataforge:dataforge-storage2" + compile "hep.dataforge:dataforge-json" + compile 'com.google.protobuf:protobuf-java:3.5.0' // https://mvnrepository.com/artifact/com.github.robtimus/sftp-fs - implementation group: 'com.github.robtimus', name: 'sftp-fs', version: '1.1.3' + compile group: 'com.github.robtimus', name: 'sftp-fs', version: '1.1.3' } protobuf { diff --git a/numass-main/build.gradle b/numass-main/build.gradle index 6ed7aba6..bdd6a545 100644 --- a/numass-main/build.gradle +++ b/numass-main/build.gradle @@ -27,16 +27,16 @@ compileGroovy.dependsOn(compileKotlin) compileGroovy.classpath += files(compileKotlin.destinationDir) dependencies { - implementation group: 'commons-cli', name: 'commons-cli', version: '1.+' - implementation group: 'commons-io', name: 'commons-io', version: '2.+' - implementation project(':numass-core') - implementation "hep.dataforge:dataforge-minuit" //project(':dataforge-stat:dataforge-minuit') - implementation "hep.dataforge:grind-terminal" //project(':dataforge-grind:grind-terminal') - implementation "hep.dataforge:dataforge-gui" - //implementation "hep.dataforge:dataforge-html" + compile group: 'commons-cli', name: 'commons-cli', version: '1.+' + compile group: 'commons-io', name: 'commons-io', version: '2.+' + compile project(':numass-core') + compile "hep.dataforge:dataforge-minuit" //project(':dataforge-stat:dataforge-minuit') + compile "hep.dataforge:grind-terminal" //project(':dataforge-grind:grind-terminal') + compile "hep.dataforge:dataforge-gui" + //compile "hep.dataforge:dataforge-html" // https://mvnrepository.com/artifact/org.ehcache/ehcache - //implementation group: 'org.ehcache', name: 'ehcache', version: '3.4.0' + //compile group: 'org.ehcache', name: 'ehcache', version: '3.4.0' } diff --git a/numass-server/build.gradle b/numass-server/build.gradle index 0a80818d..c39b86a8 100644 --- a/numass-server/build.gradle +++ b/numass-server/build.gradle @@ -17,10 +17,10 @@ apply plugin: 'com.github.johnrengelman.shadow' mainClassName = "inr.numass.server.ServerRunner" dependencies { - implementation project(':numass-core') - implementation "hep.dataforge:storage-server" // project(':dataforge-storage:storage-servlet') - implementation "hep.dataforge:dataforge-messages" - implementation 'commons-daemon:commons-daemon:1.+' + compile project(':numass-core') + compile "hep.dataforge:storage-server" // project(':dataforge-storage:storage-servlet') + compile "hep.dataforge:dataforge-messages" + compile 'commons-daemon:commons-daemon:1.+' } //processResources { diff --git a/numass-viewer/build.gradle b/numass-viewer/build.gradle index 0a531623..3a4c54b1 100644 --- a/numass-viewer/build.gradle +++ b/numass-viewer/build.gradle @@ -18,8 +18,8 @@ description = "The viewer for numass data" dependencies { - implementation project(':numass-core') - implementation "hep.dataforge:plots-jfc" //project(':dataforge-plots:plots-jfc') - implementation "hep.dataforge:dataforge-gui" + compile project(':numass-core') + compile "hep.dataforge:plots-jfc" //project(':dataforge-plots:plots-jfc') + compile "hep.dataforge:dataforge-gui" } diff --git a/numass-web/build.gradle b/numass-web/build.gradle index 6a30e7f8..f06762f2 100644 --- a/numass-web/build.gradle +++ b/numass-web/build.gradle @@ -9,10 +9,10 @@ description = 'kodex/ktor based server' //mainClassName = "inr.numass.server.ServerRunner" dependencies { - implementation "hep.dataforge:kodex-server" - implementation "hep.dataforge:dataforge-storage" - implementation "hep.dataforge:dataforge-control" - implementation project(":numass-core") + compile "hep.dataforge:kodex-server" + compile "hep.dataforge:dataforge-storage" + compile "hep.dataforge:dataforge-control" + compile project(":numass-core") } compileKotlin {