From 7a1dc1f89be1109bd680d1084590e5d2aeb9165e Mon Sep 17 00:00:00 2001 From: "Alexander.Likhachev" Date: Wed, 16 Aug 2023 18:14:35 +0200 Subject: [PATCH] [Build] Do not add ij dependencies in `testApiJUnit5` This is not needed since the dependencies are already declared as API dependencies in the relevant projects. #KTI-1349 In Progress --- compiler/tests-common-new/build.gradle.kts | 3 ++- compiler/tests-common/build.gradle.kts | 4 ++-- .../buildsrc-compat/src/main/kotlin/repoDependencies.kt | 6 ------ 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/compiler/tests-common-new/build.gradle.kts b/compiler/tests-common-new/build.gradle.kts index 9a498656586..b9385efe77a 100644 --- a/compiler/tests-common-new/build.gradle.kts +++ b/compiler/tests-common-new/build.gradle.kts @@ -33,7 +33,8 @@ dependencies { testApi(commonDependency("org.jetbrains.intellij.deps.jna:jna")) testApi(jpsModel()) { isTransitive = false } testApi(jpsModelImpl()) { isTransitive = false } - testApi(intellijJavaRt()) + testApi(intellijJavaRt()) // for FileComparisonFailure + testApi(libs.junit4) // for ComparisonFailure testApi(toolsJar()) } diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts index f0d6f02b173..aa47cb94ac1 100644 --- a/compiler/tests-common/build.gradle.kts +++ b/compiler/tests-common/build.gradle.kts @@ -53,7 +53,7 @@ dependencies { testApi(project(":kotlin-test:kotlin-test-jvm")) testApi(project(":kotlin-scripting-compiler-impl")) testApi(projectTests(":compiler:test-infrastructure-utils")) - testApi(libs.junit4) + testApi(libs.junit4) // for ComparisonFailure testApi(commonDependency("com.android.tools:r8")) testApi(project(":analysis:analysis-internal-utils")) testCompileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false } @@ -73,7 +73,7 @@ dependencies { testApi(jpsModel()) { isTransitive = false } testApi(jpsModelImpl()) { isTransitive = false } - testApi(intellijJavaRt()) + testApi(intellijJavaRt()) // for FileComparisonFailure testImplementation(libs.guava) testImplementation(commonDependency("org.jetbrains.intellij.deps:trove4j")) diff --git a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/repoDependencies.kt b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/repoDependencies.kt index 83987e3d055..e4f8fe7bad1 100644 --- a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/repoDependencies.kt +++ b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/repoDependencies.kt @@ -232,12 +232,6 @@ fun Project.testApiJUnit5( libsVersionCatalog.findLibrary("junit-platform-suite-api") .orElseThrow { GradleException("No version for `junit-platform-suite-api`") }) } - - // This dependency is needed only for FileComparisonFailure - testImplementation(intellijJavaRt()) - - // This is needed only for using FileComparisonFailure, which relies on JUnit 3 classes - testRuntimeOnly(libsVersionCatalog.findLibrary("junit4").orElseThrow { GradleException("No version for `junit4`") }) } }