From d686cb1365cc83977c110a58080bb75d6caa4275 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Fri, 23 Jun 2023 19:58:05 +0200 Subject: [PATCH] [repo] Migrate report.gradle.kts into convention plugin Otherwise, it could not find methods from buildsrc-compat. --- build.gradle.kts | 2 +- .../src/main/kotlin/build-time-report.gradle.kts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) rename gradle/report.gradle.kts => repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/build-time-report.gradle.kts (99%) diff --git a/build.gradle.kts b/build.gradle.kts index 297780d0312..0dd30c61337 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -34,6 +34,7 @@ plugins { idea id("jps-compatible") id("org.jetbrains.gradle.plugin.idea-ext") version "1.0.1" // this version should be in sync with repo/buildsrc-compat/build.gradle.kts + id("build-time-report") id("org.gradle.crypto.checksum") version "1.4.0" id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.13.1" apply false signing @@ -87,7 +88,6 @@ extra["isSonatypeRelease"] = false rootProject.apply { from(rootProject.file("gradle/versions.gradle.kts")) - from(rootProject.file("gradle/report.gradle.kts")) from(rootProject.file("gradle/javaInstrumentation.gradle.kts")) from(rootProject.file("gradle/jps.gradle.kts")) from(rootProject.file("gradle/checkArtifacts.gradle.kts")) diff --git a/gradle/report.gradle.kts b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/build-time-report.gradle.kts similarity index 99% rename from gradle/report.gradle.kts rename to repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/build-time-report.gradle.kts index f418a25a2b7..472442a57e7 100644 --- a/gradle/report.gradle.kts +++ b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/build-time-report.gradle.kts @@ -2,6 +2,7 @@ * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ +@file:Suppress("DEPRECATION") import org.gradle.api.Task import org.gradle.api.invocation.Gradle