From b07f78cc8bd984287580b8a2e04e2c8eca0dbd3a Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Mon, 4 Oct 2021 18:25:51 +0700 Subject: [PATCH] [K/N][perf] Workaround broken buildSrc compilation benchmarksAnalyzer/buildSrc includes sources from K/N's 'build-tools' subproject. But now these sources depend on the old Kotlin/Native Gradle plugin (aka tools/kotlin-native-gradle-plugin) causing compilation errors when building benchmarksAnalyzer/buildSrc. This patch works around this problem by ignoring the file that brings this dependency. --- kotlin-native/performance/buildSrc/build.gradle.kts | 4 ++-- .../tools/benchmarksAnalyzer/buildSrc/build.gradle.kts | 2 ++ .../tools/performance-server/buildSrc/build.gradle.kts | 2 ++ .../tools/performance-server/ui/buildSrc/build.gradle.kts | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/kotlin-native/performance/buildSrc/build.gradle.kts b/kotlin-native/performance/buildSrc/build.gradle.kts index bd928e23cc2..7f24d001830 100644 --- a/kotlin-native/performance/buildSrc/build.gradle.kts +++ b/kotlin-native/performance/buildSrc/build.gradle.kts @@ -61,10 +61,10 @@ tasks.validatePlugins.configure { sourceSets["main"].withConvention(org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet::class) { + kotlin.filter.exclude("**/FileCheckTest.kt") + kotlin.srcDir("src/main/kotlin") - //kotlin.srcDir("tools/benchmarks/shared/src/main/kotlin") kotlin.srcDir("../../build-tools/src/main/kotlin") - //kotlin.srcDir("../../build-tools/src/main/kotlin") kotlin.srcDir("../../shared/src/library/kotlin") kotlin.srcDir("../../shared/src/main/kotlin") kotlin.srcDir("../../tools/benchmarks/shared/src/main/kotlin/report") diff --git a/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts b/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts index 85eb4000f5e..9999ca8b9e0 100644 --- a/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts +++ b/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts @@ -63,6 +63,8 @@ tasks.validatePlugins.configure { sourceSets["main"].withConvention(org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet::class) { + kotlin.filter.exclude("**/FileCheckTest.kt") + kotlin.srcDir("../../../build-tools/src/main/kotlin") kotlin.srcDir("../../../performance/buildSrc/src/main/kotlin") kotlin.srcDir("../../../shared/src/library/kotlin") diff --git a/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts b/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts index 8a1e99803bf..ee455be6479 100644 --- a/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts +++ b/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts @@ -61,6 +61,8 @@ tasks.validatePlugins.configure { sourceSets["main"].withConvention(org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet::class) { + kotlin.filter.exclude("**/FileCheckTest.kt") + kotlin.srcDir("../../../build-tools/src/main/kotlin") kotlin.srcDir("../../../performance/buildSrc/src/main/kotlin") kotlin.srcDir("../../../shared/src/library/kotlin") diff --git a/kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts b/kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts index 0eb8cba16f2..a4598670beb 100644 --- a/kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts +++ b/kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts @@ -59,6 +59,8 @@ tasks.validatePlugins.configure { sourceSets["main"].withConvention(org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet::class) { + kotlin.filter.exclude("**/FileCheckTest.kt") + kotlin.srcDir("../../../../build-tools/src/main/kotlin") kotlin.srcDir("../../../../performance/buildSrc/src/main/kotlin") kotlin.srcDir("../../../../shared/src/library/kotlin")