diff --git a/buildSrc/src/main/kotlin/artifacts.kt b/buildSrc/src/main/kotlin/artifacts.kt index 18ce080a60d..a0958393796 100644 --- a/buildSrc/src/main/kotlin/artifacts.kt +++ b/buildSrc/src/main/kotlin/artifacts.kt @@ -11,10 +11,10 @@ import org.gradle.api.tasks.javadoc.Javadoc import org.gradle.jvm.tasks.Jar -fun Project.testsJar(body: Jar.() -> Unit): Jar { +fun Project.testsJar(body: Jar.() -> Unit = {}): Jar { val testsJarCfg = configurations.getOrCreate("tests-jar").extendsFrom(configurations["testCompile"]) - return task("testJar") { + return task("testsJar") { dependsOn("testClasses") pluginManager.withPlugin("java") { from(project.the().sourceSets.getByName("test").output) diff --git a/generators/build.gradle.kts b/generators/build.gradle.kts index f02f79f5e2b..38a6db59245 100644 --- a/generators/build.gradle.kts +++ b/generators/build.gradle.kts @@ -11,6 +11,7 @@ dependencies { val testRuntime by configurations compile(project(":core")) compile(project(":idea")) + compile(project(":j2k")) compile(project(":compiler:util")) compile(project(":compiler:cli")) compile(project(":compiler:backend")) @@ -26,6 +27,7 @@ dependencies { compile(projectTests(":compiler:tests-java8")) compile(projectTests(":compiler:container")) compile(projectTests(":idea")) + compile(projectTests(":j2k")) compile(projectTests(":idea:idea-android")) compile(projectTests(":jps-plugin")) compile(projectTests(":plugins:plugins-tests")) diff --git a/j2k/build.gradle.kts b/j2k/build.gradle.kts index 0d1dc2972c4..7031b30516a 100644 --- a/j2k/build.gradle.kts +++ b/j2k/build.gradle.kts @@ -54,3 +54,5 @@ tasks.withType { environment("NO_FS_ROOTS_ACCESS_CHECK", "true") ignoreFailures = true } + +testsJar()