From 44ea1debf435b8f2d2b17d8f644328851450bc5b Mon Sep 17 00:00:00 2001 From: Alexander Shabalin Date: Thu, 22 Dec 2022 12:39:33 +0000 Subject: [PATCH] [K/N] Fix performance build ^KT-53776 Merge-request: KT-MR-8119 Merged-by: Alexander Shabalin --- kotlin-native/performance/buildSrc/build.gradle.kts | 3 ++- .../tools/benchmarksAnalyzer/buildSrc/build.gradle.kts | 3 ++- .../tools/performance-server/buildSrc/build.gradle.kts | 3 ++- .../tools/performance-server/ui/buildSrc/build.gradle.kts | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/kotlin-native/performance/buildSrc/build.gradle.kts b/kotlin-native/performance/buildSrc/build.gradle.kts index fd638f943e1..6d3c3529ef1 100644 --- a/kotlin-native/performance/buildSrc/build.gradle.kts +++ b/kotlin-native/performance/buildSrc/build.gradle.kts @@ -40,9 +40,10 @@ tasks.validatePlugins.configure { sourceSets["main"].withConvention(org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet::class) { kotlin.filter.exclude("**/FileCheckTest.kt") + // TODO: Consider moving required stuff from kotlin-native/build-tools/ to buildSrc/ here. kotlin.filter.exclude("**/bitcode/**") + kotlin.filter.exclude("**/cpp/**") kotlin.filter.exclude("**/testing/**") - kotlin.filter.exclude("**/CompilationDatabase.kt") kotlin.srcDir("src/main/kotlin") kotlin.srcDir("../../build-tools/src/main/kotlin") diff --git a/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts b/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts index a242ab39343..7d66c47d0c3 100644 --- a/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts +++ b/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts @@ -44,9 +44,10 @@ tasks.validatePlugins.configure { sourceSets["main"].withConvention(org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet::class) { kotlin.filter.exclude("**/FileCheckTest.kt") + // TODO: Consider moving required stuff from kotlin-native/build-tools/ to buildSrc/ here. kotlin.filter.exclude("**/bitcode/**") + kotlin.filter.exclude("**/cpp/**") kotlin.filter.exclude("**/testing/**") - kotlin.filter.exclude("**/CompilationDatabase.kt") kotlin.srcDir("../../../build-tools/src/main/kotlin") kotlin.srcDir("../../../performance/buildSrc/src/main/kotlin") diff --git a/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts b/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts index ab0de06e228..b0fb888cacb 100644 --- a/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts +++ b/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts @@ -40,9 +40,10 @@ tasks.validatePlugins.configure { sourceSets["main"].withConvention(org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet::class) { kotlin.filter.exclude("**/FileCheckTest.kt") + // TODO: Consider moving required stuff from kotlin-native/build-tools/ to buildSrc/ here. kotlin.filter.exclude("**/bitcode/**") + kotlin.filter.exclude("**/cpp/**") kotlin.filter.exclude("**/testing/**") - kotlin.filter.exclude("**/CompilationDatabase.kt") kotlin.srcDir("../../../build-tools/src/main/kotlin") kotlin.srcDir("../../../performance/buildSrc/src/main/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 1a67a126408..44f76a73831 100644 --- a/kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts +++ b/kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts @@ -38,9 +38,10 @@ tasks.validatePlugins.configure { sourceSets["main"].withConvention(org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet::class) { kotlin.filter.exclude("**/FileCheckTest.kt") + // TODO: Consider moving required stuff from kotlin-native/build-tools/ to buildSrc/ here. kotlin.filter.exclude("**/bitcode/**") + kotlin.filter.exclude("**/cpp/**") kotlin.filter.exclude("**/testing/**") - kotlin.filter.exclude("**/CompilationDatabase.kt") kotlin.srcDir("../../../../build-tools/src/main/kotlin") kotlin.srcDir("../../../../performance/buildSrc/src/main/kotlin")