Minor, rework groovyTraitsWithFields integration test
Declaring Groovy and Kotlin classes in the same project is not necessary for this test, split them to two projects instead to avoid the hack with modifying task dependencies manually
This commit is contained in:
+1
-9
@@ -9,7 +9,6 @@ buildscript {
|
||||
}
|
||||
|
||||
apply plugin: "kotlin"
|
||||
apply plugin: "groovy"
|
||||
apply plugin: "java"
|
||||
|
||||
repositories {
|
||||
@@ -19,14 +18,7 @@ repositories {
|
||||
|
||||
dependencies {
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||
compile 'org.codehaus.groovy:groovy-all:2.5.3'
|
||||
}
|
||||
|
||||
compileGroovy.dependsOn = compileGroovy.taskDependencies.values - 'compileJava'
|
||||
|
||||
compileKotlin {
|
||||
dependsOn compileGroovy
|
||||
classpath += files(compileGroovy.destinationDir)
|
||||
compile project(":lib")
|
||||
}
|
||||
|
||||
compileKotlin {
|
||||
|
||||
+9
@@ -0,0 +1,9 @@
|
||||
apply plugin: "groovy"
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile 'org.codehaus.groovy:groovy-all:2.5.3'
|
||||
}
|
||||
Reference in New Issue
Block a user