From c847d427d8b14210ba92ebe7bbe9a20322192b36 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Tue, 28 Nov 2023 09:24:54 +0100 Subject: [PATCH] [Gradle] Fix test data not including test framework dependency ^KT-63368 Fixed --- .../resources/testProject/AndroidProject/Lib/build.gradle | 2 ++ .../resources/testProject/AndroidProject/Test/build.gradle | 1 + .../allOpenFromNestedBuildscript/a/b/build.gradle | 4 ++-- .../resources/testProject/allOpenFromScript/kotlin.gradle | 2 +- .../src/test/resources/testProject/javaUpToDate/build.gradle | 4 ++++ .../src/test/resources/testProject/kt-49877/build.gradle.kts | 5 +++++ 6 files changed, 15 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Lib/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Lib/build.gradle index bae3cf9d4b3..fd085f21907 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Lib/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Lib/build.gradle @@ -9,6 +9,8 @@ dependencies { // unused but needed for IncrementalCompilationMultiProjectIT.testAndroid to check if non-local dependency affects IC implementation 'io.reactivex:rxjava:1.1.9' implementation 'com.loopj.android:android-async-http:1.4.9' + + testImplementation "junit:junit:4.13.2" } java { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Test/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Test/build.gradle index c82f653856e..1c05473eac0 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Test/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Test/build.gradle @@ -7,6 +7,7 @@ plugins { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "junit:junit:4.13.2" } java { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/allOpenFromNestedBuildscript/a/b/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/allOpenFromNestedBuildscript/a/b/build.gradle index 8600c7d7d0f..8a45304beed 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/allOpenFromNestedBuildscript/a/b/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/allOpenFromNestedBuildscript/a/b/build.gradle @@ -11,5 +11,5 @@ allOpen { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" -} \ No newline at end of file + testImplementation("junit:junit:4.13.2") +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/allOpenFromScript/kotlin.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/allOpenFromScript/kotlin.gradle index d2d4e25c898..1bb96ff4ae9 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/allOpenFromScript/kotlin.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/allOpenFromScript/kotlin.gradle @@ -22,5 +22,5 @@ allOpen { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + testImplementation("junit:junit:4.13.2") } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/javaUpToDate/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/javaUpToDate/build.gradle index bf1c6023589..28c65bb561a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/javaUpToDate/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/javaUpToDate/build.gradle @@ -7,3 +7,7 @@ repositories { mavenLocal() mavenCentral() } + +dependencies { + testImplementation "junit:junit:4.13.2" +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-49877/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-49877/build.gradle.kts index 3dd7c90dc08..99d1a371ccc 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-49877/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-49877/build.gradle.kts @@ -28,5 +28,10 @@ kotlin { implementation("com.squareup.okio:okio:3.2.0") } } + getByName("commonTest") { + dependencies { + implementation("org.jetbrains.kotlin:kotlin-test") + } + } } }