From 96a22d48f83c9433b40592bf2eee64895134090f Mon Sep 17 00:00:00 2001 From: "nataliya.valtman" Date: Tue, 3 Aug 2021 14:05:47 +0300 Subject: [PATCH] Remove support of Gradle 6.0 or less --- .../internal/KotlinDependenciesManagement.kt | 2 - .../plugin/KotlinGradleBuildServices.kt | 38 ++++++++++++------- .../statistics/KotlinBuildEsStatListener.kt | 2 +- .../tasks/InspectClassesForMultiModuleIC.kt | 6 +-- .../gradle/testing/internal/conventions.kt | 8 +--- 5 files changed, 29 insertions(+), 27 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KotlinDependenciesManagement.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KotlinDependenciesManagement.kt index be0acca9990..5aa7a3a1d32 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KotlinDependenciesManagement.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KotlinDependenciesManagement.kt @@ -253,8 +253,6 @@ private fun stdlibModuleForJvmCompilations(compilations: Iterable ) : BuildAdapter() { companion object { @@ -66,29 +70,32 @@ internal class KotlinGradleBuildServices private constructor( @Synchronized fun getInstance(project: Project, listenerRegistryHolder: BuildEventsListenerRegistryHolder): KotlinGradleBuildServices { val log = Logging.getLogger(KotlinGradleBuildServices::class.java) - val kotlinGradleListenerProvider: org.gradle.api.provider.Provider = project.provider { + val kotlinGradleListenerProvider: Provider = project.provider { KotlinGradleBuildListener(KotlinGradleFinishBuildHandler()) } - val kotlinGradleEsListenerProvider = project.provider { -// val listeners = project.objects.listProperty(ReportStatistics::class.java) -// .value(listOf(ReportStatisticsToElasticSearch)) -// project.rootProject.extensions.findByType(BuildScanExtension::class.java)?.also { listeners.add(ReportStatisticsToBuildScan(it)) } -// KotlinBuildEsStatListener(project.rootProject.name, listeners.get()) - val listeners = ArrayList() - val buildScan = project.rootProject.extensions.findByName("buildScan") - buildScan?.also { listeners.add(ReportStatisticsToBuildScan(it as BuildScanExtension)) } - listeners.add(ReportStatisticsToElasticSearch) - KotlinBuildEsStatListener(project.rootProject.name, listeners) + val kotlinGradleEsListenerProvider = project.provider { + val listeners = project.rootProject.objects.listProperty(ReportStatistics::class.java) + .value(listOf(ReportStatisticsToElasticSearch)) + project.rootProject.extensions.findByName("buildScan") + ?.also { listeners.add(ReportStatisticsToBuildScan(it as BuildScanExtension)) } + KotlinBuildEsStatListener(project.rootProject.name, listeners.get()) } + + listenerRegistryHolder.listenerRegistry.onTaskCompletion(kotlinGradleListenerProvider) + listenerRegistryHolder.listenerRegistry.onTaskCompletion(kotlinGradleEsListenerProvider) + if (instance != null) { log.kotlinDebug(ALREADY_INITIALIZED_MESSAGE) +// instance!!.gradleListenerProviders.forEach { listenerRegistryHolder.listenerRegistry.onTaskCompletion(it) } return instance!! } val gradle = project.gradle - val services = KotlinGradleBuildServices(gradle) + val services = KotlinGradleBuildServices(gradle, kotlinGradleListenerProvider, kotlinGradleEsListenerProvider) +// listenerRegistry.onTaskCompletion(kotlinGradleListenerProvider) +// listenerRegistry.onTaskCompletion(kotlinGradleEsListenerProvider) if (isConfigurationCacheAvailable(gradle)) { listenerRegistryHolder.listenerRegistry!!.onTaskCompletion(kotlinGradleListenerProvider) listenerRegistryHolder.listenerRegistry.onTaskCompletion(kotlinGradleEsListenerProvider) @@ -97,6 +104,11 @@ internal class KotlinGradleBuildServices private constructor( gradle.taskGraph.addTaskExecutionListener(kotlinGradleEsListenerProvider.get()) log.kotlinDebug(INIT_MESSAGE) } + + +// listenerRegistryHolder.listenerRegistry.onTaskCompletion(kotlinGradleListenerProvider) +// listenerRegistryHolder.listenerRegistry.onTaskCompletion(kotlinGradleEsListenerProvider) + instance = services services.buildStarted() diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/statistics/KotlinBuildEsStatListener.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/statistics/KotlinBuildEsStatListener.kt index 4f25296f750..5525f196b25 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/statistics/KotlinBuildEsStatListener.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/statistics/KotlinBuildEsStatListener.kt @@ -73,7 +73,7 @@ class KotlinBuildEsStatListener(val projectName: String, val reportStatistics : } private fun availableForStat(taskPath: String): Boolean { - return taskPath.contains("compileKotlin") + return taskPath.contains("Kotlin") } override fun afterExecute(task: Task, taskState: TaskState) { diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/InspectClassesForMultiModuleIC.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/InspectClassesForMultiModuleIC.kt index 778709d33d7..50b4b589016 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/InspectClassesForMultiModuleIC.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/InspectClassesForMultiModuleIC.kt @@ -41,11 +41,7 @@ internal open class InspectClassesForMultiModuleIC : DefaultTask() { @get:Internal internal val fileTrees get() = sourceSetOutputClassesDir?.map { - if (isGradleVersionAtLeast(6, 0)) { - objects.fileTree().from(it).include("**/*.class") - } else { - project.fileTree(it).include("**/*.class") - } + objects.fileTree().from(it).include("**/*.class") } @get:Internal diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/internal/conventions.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/internal/conventions.kt index 1a6a5c88ce1..3731c459724 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/internal/conventions.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/internal/conventions.kt @@ -26,13 +26,9 @@ internal fun KotlinTest.configureConventions() { reports.configureConventions(project, name) fun binaryResultsDirDefault(): File = project.testResultsDir.resolve("$name/binary") + @Suppress("UnstableApiUsage") + binaryResultsDirectory.convention(project.layout.buildDirectory.dir(binaryResultsDirDefault().toRelativeString(project.buildDir))) - if (isGradleVersionAtLeast(5, 5)) { - @Suppress("UnstableApiUsage") - binaryResultsDirectory.convention(project.layout.buildDirectory.dir(binaryResultsDirDefault().toRelativeString(project.buildDir))) - } else { - conventionMapping.map("binResultsDir", ::binaryResultsDirDefault) - } } internal fun TestTaskReports.configureConventions(project: Project, name: String) {