Reverted gradle to compile
scope
This commit is contained in:
parent
61aef39670
commit
4162f771a8
@ -28,8 +28,8 @@ allprojects {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
|
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
|
||||||
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
|
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
|
||||||
testImplementation group: 'junit', name: 'junit', version: '4.+'
|
testImplementation group: 'junit', name: 'junit', version: '4.+'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -16,12 +16,12 @@ allprojects {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation "hep.dataforge:plots-jfc" // project(':dataforge-plots:plots-jfc')
|
compile "hep.dataforge:plots-jfc" // project(':dataforge-plots:plots-jfc')
|
||||||
implementation "hep.dataforge:dataforge-control" //project(':dataforge-control')
|
compile "hep.dataforge:dataforge-control" //project(':dataforge-control')
|
||||||
implementation "hep.dataforge:dataforge-gui"
|
compile "hep.dataforge:dataforge-gui"
|
||||||
|
|
||||||
// https://mvnrepository.com/artifact/commons-cli/commons-cli
|
// 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'
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -22,8 +22,8 @@ configurations {
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
//DataForge dependencies
|
//DataForge dependencies
|
||||||
implementation project(':numass-control')
|
compile project(':numass-control')
|
||||||
//implementation project(':numass-server')
|
//compile project(':numass-server')
|
||||||
|
|
||||||
// optional device classpath
|
// optional device classpath
|
||||||
devices project(':numass-control:cryotemp')
|
devices project(':numass-control:cryotemp')
|
||||||
|
@ -11,7 +11,7 @@ version = "0.2.0";
|
|||||||
//mainClassName = "inr.numass.readvac.Main"
|
//mainClassName = "inr.numass.readvac.Main"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation project(':numass-control')
|
compile project(':numass-control')
|
||||||
}
|
}
|
||||||
|
|
||||||
task testDevice(dependsOn: classes, type: JavaExec) {
|
task testDevice(dependsOn: classes, type: JavaExec) {
|
||||||
|
@ -17,6 +17,6 @@
|
|||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation project(':numass-control')
|
compile project(':numass-control')
|
||||||
implementation project(':numass-core')
|
compile project(':numass-core')
|
||||||
}
|
}
|
@ -8,7 +8,7 @@ if (!hasProperty('mainClass')) {
|
|||||||
mainClassName = mainClass
|
mainClassName = mainClass
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation project(':numass-control')
|
compile project(':numass-control')
|
||||||
}
|
}
|
||||||
|
|
||||||
task talkToServer(type: JavaExec) {
|
task talkToServer(type: JavaExec) {
|
||||||
|
@ -9,5 +9,5 @@ mainClassName = mainClass
|
|||||||
|
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation project(':numass-control')
|
compile project(':numass-control')
|
||||||
}
|
}
|
@ -8,7 +8,7 @@ if (!hasProperty('mainClass')) {
|
|||||||
mainClassName = mainClass
|
mainClassName = mainClass
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation project(':numass-control')
|
compile project(':numass-control')
|
||||||
}
|
}
|
||||||
|
|
||||||
task testDevice(dependsOn: classes, type: JavaExec) {
|
task testDevice(dependsOn: classes, type: JavaExec) {
|
||||||
|
@ -13,12 +13,12 @@ description = "A bse package with minimal dependencies for numass"
|
|||||||
|
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation "hep.dataforge:dataforge-storage2"
|
compile "hep.dataforge:dataforge-storage2"
|
||||||
implementation "hep.dataforge:dataforge-json"
|
compile "hep.dataforge:dataforge-json"
|
||||||
implementation 'com.google.protobuf:protobuf-java:3.5.0'
|
compile 'com.google.protobuf:protobuf-java:3.5.0'
|
||||||
|
|
||||||
// https://mvnrepository.com/artifact/com.github.robtimus/sftp-fs
|
// 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 {
|
protobuf {
|
||||||
|
@ -27,16 +27,16 @@ compileGroovy.dependsOn(compileKotlin)
|
|||||||
compileGroovy.classpath += files(compileKotlin.destinationDir)
|
compileGroovy.classpath += files(compileKotlin.destinationDir)
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation group: 'commons-cli', name: 'commons-cli', version: '1.+'
|
compile group: 'commons-cli', name: 'commons-cli', version: '1.+'
|
||||||
implementation group: 'commons-io', name: 'commons-io', version: '2.+'
|
compile group: 'commons-io', name: 'commons-io', version: '2.+'
|
||||||
implementation project(':numass-core')
|
compile project(':numass-core')
|
||||||
implementation "hep.dataforge:dataforge-minuit" //project(':dataforge-stat:dataforge-minuit')
|
compile "hep.dataforge:dataforge-minuit" //project(':dataforge-stat:dataforge-minuit')
|
||||||
implementation "hep.dataforge:grind-terminal" //project(':dataforge-grind:grind-terminal')
|
compile "hep.dataforge:grind-terminal" //project(':dataforge-grind:grind-terminal')
|
||||||
implementation "hep.dataforge:dataforge-gui"
|
compile "hep.dataforge:dataforge-gui"
|
||||||
//implementation "hep.dataforge:dataforge-html"
|
//compile "hep.dataforge:dataforge-html"
|
||||||
|
|
||||||
// https://mvnrepository.com/artifact/org.ehcache/ehcache
|
// 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'
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -17,10 +17,10 @@ apply plugin: 'com.github.johnrengelman.shadow'
|
|||||||
mainClassName = "inr.numass.server.ServerRunner"
|
mainClassName = "inr.numass.server.ServerRunner"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation project(':numass-core')
|
compile project(':numass-core')
|
||||||
implementation "hep.dataforge:storage-server" // project(':dataforge-storage:storage-servlet')
|
compile "hep.dataforge:storage-server" // project(':dataforge-storage:storage-servlet')
|
||||||
implementation "hep.dataforge:dataforge-messages"
|
compile "hep.dataforge:dataforge-messages"
|
||||||
implementation 'commons-daemon:commons-daemon:1.+'
|
compile 'commons-daemon:commons-daemon:1.+'
|
||||||
}
|
}
|
||||||
|
|
||||||
//processResources {
|
//processResources {
|
||||||
|
@ -18,8 +18,8 @@ description = "The viewer for numass data"
|
|||||||
|
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation project(':numass-core')
|
compile project(':numass-core')
|
||||||
implementation "hep.dataforge:plots-jfc" //project(':dataforge-plots:plots-jfc')
|
compile "hep.dataforge:plots-jfc" //project(':dataforge-plots:plots-jfc')
|
||||||
implementation "hep.dataforge:dataforge-gui"
|
compile "hep.dataforge:dataforge-gui"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -9,10 +9,10 @@ description = 'kodex/ktor based server'
|
|||||||
//mainClassName = "inr.numass.server.ServerRunner"
|
//mainClassName = "inr.numass.server.ServerRunner"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation "hep.dataforge:kodex-server"
|
compile "hep.dataforge:kodex-server"
|
||||||
implementation "hep.dataforge:dataforge-storage"
|
compile "hep.dataforge:dataforge-storage"
|
||||||
implementation "hep.dataforge:dataforge-control"
|
compile "hep.dataforge:dataforge-control"
|
||||||
implementation project(":numass-core")
|
compile project(":numass-core")
|
||||||
}
|
}
|
||||||
|
|
||||||
compileKotlin {
|
compileKotlin {
|
||||||
|
Loading…
Reference in New Issue
Block a user