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

Replace kotlin-test project dependencies in the project

Browse Source 
Use dependency helper function that chooses whether to take them
from the bootstrap repository or from a configuration of kotlin-test

KT-61969
This commit is contained in:
Ilya Gorbunov
2023-11-08 05:12:24 +01:00
committed by Space Team
parent f07bf70aa7
commit d2aae67e03
44 changed files with 51 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/Interop/StubGenerator/build.gradle.kts
+1 -2
View File
@@ -39,8 +39,7 @@ dependencies {
implementation(project(":compiler:util"))
implementation(project(":compiler:ir.serialization.common"))
testImplementation(kotlin("test-junit"))
testImplementation(project(":kotlin-test:kotlin-test-junit"))
testImplementation(kotlinTest("junit"))
}
tasks {
kotlin-native/endorsedLibraries/kotlinx.cli/build.gradle.kts
+2 -3
View File
@@ -15,8 +15,7 @@ kotlin {
commonTest {
dependencies {
// projectOrFiles is required for the performance project that includes kotlinx.cli compositely
projectOrFiles(project, ":kotlin-test:kotlin-test-common")?.let { implementation(it) }
projectOrFiles(project, ":kotlin-test:kotlin-test-annotations-common")?.let { implementation(it) }
projectOrFiles(project, ":kotlin-test")?.let { implementation(it) }
}
kotlin.srcDir("src/tests")
}
@@ -30,7 +29,7 @@ kotlin {
// JVM-specific tests and their dependencies:
compilations["test"].defaultSourceSet {
dependencies {
implementation(project(":kotlin-test:kotlin-test-junit"))
implementation(kotlinTest("junit"))
}
}
kotlin-native/klib/build.gradle
+1 -1
View File
@@ -24,7 +24,7 @@ dependencies {
implementation project(path: ':kotlin-native:backend.native', configuration: 'cli_bcApiElements')
implementation project(":kotlin-native:utilities:basic-utils")
testImplementation libs.junit4
testImplementation project(":kotlin-test:kotlin-test-junit")
testImplementation RepoDependencies.kotlinTest(project, "junit")
}
test {
kotlin-native/performance/build.gradle
+3 -5
View File
@@ -47,11 +47,9 @@ def platformManager = new PlatformManager(DistributionKt.buildDistribution(Utils
def kotlinDist = null
if (hasProperty("kotlin_dist")) {
kotlinDist = file(findProperty("kotlin_dist"))
ext["notationMapping"] = [':kotlin-stdlib-common' : project.file("${kotlinDist}/kotlinc/lib/kotlin-stdlib.jar").absolutePath,
':kotlin-test:kotlin-test-common' : project.file("${kotlinDist}/kotlinc/lib/kotlin-test.jar").absolutePath,
':kotlin-test:kotlin-test-annotations-common': project.file("${kotlinDist}/kotlinc/lib/kotlin-test.jar").absolutePath,
':kotlin-test:kotlin-test-junit' : project.file("${kotlinDist}/kotlinc/lib/kotlin-test-junit.jar").absolutePath,
':kotlin-stdlib-jdk8' : project.file("${kotlinDist}/kotlinc/lib/kotlin-stdlib-jdk8.jar").absolutePath]
ext["notationMapping"] = [':kotlin-stdlib-common' : project.file("${kotlinDist}/kotlinc/lib/kotlin-stdlib.jar").absolutePath,
':kotlin-test' : project.file("${kotlinDist}/kotlinc/lib/kotlin-test.jar").absolutePath,
':kotlin-stdlib-jdk8' : project.file("${kotlinDist}/kotlinc/lib/kotlin-stdlib-jdk8.jar").absolutePath]
ext.targetList = []
}
kotlin-native/prepare/kotlin-native-compiler-embeddable/build.gradle.kts
+1 -1
View File
@@ -56,7 +56,7 @@ dependencies {
kotlinNativeJavadoc(project(":kotlin-native:backend.native"))
testImplementation(libs.junit4)
testImplementation(project(":kotlin-test:kotlin-test-junit"))
testImplementation(kotlinTest("junit"))
}
val compiler = embeddableCompiler("kotlin-native-compiler-embeddable") {