From 094490acbd86b20ab9ca75317d7275fc0e86661c Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <yahor.berdnikau@jetbrains.com>
Date: Fri, 27 Oct 2023 21:00:47 +0200
Subject: [PATCH] [Gradle] Compile against Gradle 8.4 api

^KT-62964 Fixed
---
 gradle/verification-metadata.xml              | 20 +++++++++++++++----
 .../gradle/targets/jvm/tasks/KotlinJvmTest.kt |  2 +-
 .../src/main/kotlin/GradleCommon.kt           |  2 +-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index fb7cd4fdcf4..f2eeebde706 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -1600,10 +1600,10 @@
             <sha256 value="a90fb12246e49dc1f5f165d36fefbdacb5417f878fc6a0c6e5a65916aa2dc605" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="dev.gradleplugins" name="gradle-api" version="8.2">
-         <artifact name="gradle-api-8.2.jar">
-            <md5 value="3558e34f0e04095688b4462cb66ee7e2" origin="Generated by Gradle"/>
-            <sha256 value="ecc9aad0e1280afed3b22965292642ff640229bfd3e28f965251ba97f7bedc11" origin="Generated by Gradle"/>
+      <component group="dev.gradleplugins" name="gradle-api" version="8.4">
+         <artifact name="gradle-api-8.4.jar">
+            <md5 value="a30d0712ecc5bdb2771e2e4021102636" origin="Generated by Gradle"/>
+            <sha256 value="a4475365ae61377af0f14e8c227a4a18a9b8d3eec5ae29fdfd02390e2291addb" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="google" name="android_m2repository" version="r44">
@@ -3864,6 +3864,12 @@
             <sha256 value="4395647b1961d9fb730a34e8dbe56c293157bc0759004cca63d9b5ee6653e5c7" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="1.9.10">
+         <artifact name="kotlin-stdlib-1.9.10.jar">
+            <md5 value="da8348128b101f854fafa9a31e3806bd" origin="Generated by Gradle"/>
+            <sha256 value="55e989c512b80907799f854309f3bc7782c5b3d13932442d0379d5c472711504" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.6.0">
          <artifact name="kotlin-stdlib-common-1.6.0.jar">
             <md5 value="05517b4cdeff2fc7c359a6148ac5dc38" origin="Generated by Gradle"/>
@@ -3888,6 +3894,12 @@
             <sha256 value="fa20188abaa8ecf1d0035e93a969b071f10e45a1c8378c314521eade73f75fd5" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.9.10">
+         <artifact name="kotlin-stdlib-common-1.9.10.jar">
+            <md5 value="de4024a53c843e959f2d50ecd1f0e951" origin="Generated by Gradle"/>
+            <sha256 value="cde3341ba18a2ba262b0b7cf6c55b20c90e8d434e42c9a13e6a3f770db965a88" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.7.10">
          <artifact name="kotlin-stdlib-jdk7-1.7.10.jar">
             <md5 value="16e9288ff1d39c8f983507e3cd72e8a8" origin="Generated by Gradle"/>
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/tasks/KotlinJvmTest.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/tasks/KotlinJvmTest.kt
index 9b504b7a446..d34ad4ee3fb 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/tasks/KotlinJvmTest.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/tasks/KotlinJvmTest.kt
@@ -15,7 +15,7 @@ import org.jetbrains.kotlin.gradle.plugin.internal.MppTestReportHelper
 import org.jetbrains.kotlin.gradle.plugin.variantImplementationFactoryProvider
 
 @CacheableTask
-open class KotlinJvmTest : Test(), UsesVariantImplementationFactories {
+abstract class KotlinJvmTest : Test(), UsesVariantImplementationFactories {
     @Input
     @Optional
     var targetName: String? = null
diff --git a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/GradleCommon.kt b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/GradleCommon.kt
index a81c6a48132..0e466ae3f1c 100644
--- a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/GradleCommon.kt
+++ b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/GradleCommon.kt
@@ -154,7 +154,7 @@ fun Project.createGradleCommonSourceSet(): SourceSet {
 
         dependencies {
             compileOnlyConfigurationName(kotlinStdlib())
-            "commonGradleApiCompileOnly"("dev.gradleplugins:gradle-api:8.2")
+            "commonGradleApiCompileOnly"("dev.gradleplugins:gradle-api:8.4")
             if (this@createGradleCommonSourceSet.name !in testPlugins) {
                 compileOnlyConfigurationName(project(":kotlin-gradle-plugin-api")) {
                     capabilities {