azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix test dependencies in jps-plugin

Browse Source 
Otherwise tests fail on clean checkout

Original commit: 3a7c674957
This commit is contained in:
Alexey Tsvetkov
2018-06-27 23:47:14 +03:00
parent 94f8210340
commit 3657dba063
4 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/build.gradle.kts
+3 -4
View File
@@ -35,19 +35,18 @@ dependencies {
}
testRuntime(intellijDep())
testRuntime(projectDist(":kotlin-reflect"))
testRuntime(projectDist(":kotlin-compiler"))
testRuntime(projectDist(":kotlin-script-runtime"))
}
sourceSets {
"main" { projectDefault() }
"test" {
java.srcDirs("jps-tests/test"
/*, "kannotator-jps-plugin-test/test"*/ // Obsolete
)
java.srcDirs("jps-tests/test")
}
}
projectTest {
dependsOn(":kotlin-compiler:dist")
workingDir = rootDir
}
jps/jps-plugin/build.gradle.kts.173
+3 -4
View File
@@ -35,19 +35,18 @@ dependencies {
}
testRuntime(intellijDep())
testRuntime(projectDist(":kotlin-reflect"))
testRuntime(projectDist(":kotlin-compiler"))
testRuntime(projectDist(":kotlin-script-runtime"))
}
sourceSets {
"main" { projectDefault() }
"test" {
java.srcDirs("jps-tests/test"
/*, "kannotator-jps-plugin-test/test"*/ // Obsolete
)
java.srcDirs("jps-tests/test")
}
}
projectTest {
dependsOn(":kotlin-compiler:dist")
workingDir = rootDir
}
jps/jps-plugin/build.gradle.kts.as31
+3 -4
View File
@@ -34,19 +34,18 @@ dependencies {
}
testRuntime(intellijDep())
testRuntime(projectDist(":kotlin-reflect"))
testRuntime(projectDist(":kotlin-compiler"))
testRuntime(projectDist(":kotlin-script-runtime"))
}
sourceSets {
"main" { projectDefault() }
"test" {
/*java.srcDirs("jps-tests/test"
/*, "kannotator-jps-plugin-test/test"*/ // Obsolete
)*/
java.srcDirs("jps-tests/test")
}
}
projectTest {
dependsOn(":kotlin-compiler:dist")
workingDir = rootDir
}
jps/jps-plugin/build.gradle.kts.as32
+3 -4
View File
@@ -34,19 +34,18 @@ dependencies {
}
testRuntime(intellijDep())
testRuntime(projectDist(":kotlin-reflect"))
testRuntime(projectDist(":kotlin-compiler"))
testRuntime(projectDist(":kotlin-script-runtime"))
}
sourceSets {
"main" { projectDefault() }
"test" {
/*java.srcDirs("jps-tests/test"
/*, "kannotator-jps-plugin-test/test"*/ // Obsolete
)*/
java.srcDirs("jps-tests/test")
}
}
projectTest {
dependsOn(":kotlin-compiler:dist")
workingDir = rootDir
}