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

[Build] Do not add ij dependencies in testApiJUnit5

Browse Source 
This is not needed since the dependencies are already declared as API dependencies in the relevant projects.
#KTI-1349 In Progress
This commit is contained in:
Alexander.Likhachev
2023-08-16 18:14:35 +02:00
committed by Space Team
parent ef0fb557a5
commit 7a1dc1f89b
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common-new/build.gradle.kts
+2 -1
View File
@@ -33,7 +33,8 @@ dependencies {
testApi(commonDependency("org.jetbrains.intellij.deps.jna:jna")) testApi(commonDependency("org.jetbrains.intellij.deps.jna:jna"))
testApi(jpsModel()) { isTransitive = false } testApi(jpsModel()) { isTransitive = false }
testApi(jpsModelImpl()) { isTransitive = false } testApi(jpsModelImpl()) { isTransitive = false }
testApi(intellijJavaRt()) testApi(intellijJavaRt()) // for FileComparisonFailure
testApi(libs.junit4) // for ComparisonFailure
testApi(toolsJar()) testApi(toolsJar())
} }
compiler/tests-common/build.gradle.kts
+2 -2
View File
@@ -53,7 +53,7 @@ dependencies {
testApi(project(":kotlin-test:kotlin-test-jvm")) testApi(project(":kotlin-test:kotlin-test-jvm"))
testApi(project(":kotlin-scripting-compiler-impl")) testApi(project(":kotlin-scripting-compiler-impl"))
testApi(projectTests(":compiler:test-infrastructure-utils")) testApi(projectTests(":compiler:test-infrastructure-utils"))
testApi(libs.junit4) testApi(libs.junit4) // for ComparisonFailure
testApi(commonDependency("com.android.tools:r8")) testApi(commonDependency("com.android.tools:r8"))
testApi(project(":analysis:analysis-internal-utils")) testApi(project(":analysis:analysis-internal-utils"))
testCompileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false } testCompileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
@@ -73,7 +73,7 @@ dependencies {
testApi(jpsModel()) { isTransitive = false } testApi(jpsModel()) { isTransitive = false }
testApi(jpsModelImpl()) { isTransitive = false } testApi(jpsModelImpl()) { isTransitive = false }
testApi(intellijJavaRt()) testApi(intellijJavaRt()) // for FileComparisonFailure
testImplementation(libs.guava) testImplementation(libs.guava)
testImplementation(commonDependency("org.jetbrains.intellij.deps:trove4j")) testImplementation(commonDependency("org.jetbrains.intellij.deps:trove4j"))
repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/repoDependencies.kt
-6
View File
@@ -232,12 +232,6 @@ fun Project.testApiJUnit5(
libsVersionCatalog.findLibrary("junit-platform-suite-api") libsVersionCatalog.findLibrary("junit-platform-suite-api")
.orElseThrow { GradleException("No version for `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`") })
} }
} }