Fix test dependencies in jps-plugin

Otherwise tests fail on clean checkout
This commit is contained in:
Alexey Tsvetkov
2018-06-27 23:47:14 +03:00
parent a63aa5b7ca
commit 3a7c674957
4 changed files with 12 additions and 16 deletions
+3 -4
View File
@@ -35,19 +35,18 @@ dependencies {
} }
testRuntime(intellijDep()) testRuntime(intellijDep())
testRuntime(projectDist(":kotlin-reflect")) testRuntime(projectDist(":kotlin-reflect"))
testRuntime(projectDist(":kotlin-compiler"))
testRuntime(projectDist(":kotlin-script-runtime"))
} }
sourceSets { sourceSets {
"main" { projectDefault() } "main" { projectDefault() }
"test" { "test" {
java.srcDirs("jps-tests/test" java.srcDirs("jps-tests/test")
/*, "kannotator-jps-plugin-test/test"*/ // Obsolete
)
} }
} }
projectTest { projectTest {
dependsOn(":kotlin-compiler:dist")
workingDir = rootDir workingDir = rootDir
} }
+3 -4
View File
@@ -35,19 +35,18 @@ dependencies {
} }
testRuntime(intellijDep()) testRuntime(intellijDep())
testRuntime(projectDist(":kotlin-reflect")) testRuntime(projectDist(":kotlin-reflect"))
testRuntime(projectDist(":kotlin-compiler"))
testRuntime(projectDist(":kotlin-script-runtime"))
} }
sourceSets { sourceSets {
"main" { projectDefault() } "main" { projectDefault() }
"test" { "test" {
java.srcDirs("jps-tests/test" java.srcDirs("jps-tests/test")
/*, "kannotator-jps-plugin-test/test"*/ // Obsolete
)
} }
} }
projectTest { projectTest {
dependsOn(":kotlin-compiler:dist")
workingDir = rootDir workingDir = rootDir
} }
+3 -4
View File
@@ -34,19 +34,18 @@ dependencies {
} }
testRuntime(intellijDep()) testRuntime(intellijDep())
testRuntime(projectDist(":kotlin-reflect")) testRuntime(projectDist(":kotlin-reflect"))
testRuntime(projectDist(":kotlin-compiler"))
testRuntime(projectDist(":kotlin-script-runtime"))
} }
sourceSets { sourceSets {
"main" { projectDefault() } "main" { projectDefault() }
"test" { "test" {
/*java.srcDirs("jps-tests/test" java.srcDirs("jps-tests/test")
/*, "kannotator-jps-plugin-test/test"*/ // Obsolete
)*/
} }
} }
projectTest { projectTest {
dependsOn(":kotlin-compiler:dist")
workingDir = rootDir workingDir = rootDir
} }
+3 -4
View File
@@ -34,19 +34,18 @@ dependencies {
} }
testRuntime(intellijDep()) testRuntime(intellijDep())
testRuntime(projectDist(":kotlin-reflect")) testRuntime(projectDist(":kotlin-reflect"))
testRuntime(projectDist(":kotlin-compiler"))
testRuntime(projectDist(":kotlin-script-runtime"))
} }
sourceSets { sourceSets {
"main" { projectDefault() } "main" { projectDefault() }
"test" { "test" {
/*java.srcDirs("jps-tests/test" java.srcDirs("jps-tests/test")
/*, "kannotator-jps-plugin-test/test"*/ // Obsolete
)*/
} }
} }
projectTest { projectTest {
dependsOn(":kotlin-compiler:dist")
workingDir = rootDir workingDir = rootDir
} }