From b666e66e19f215e012d5090c207d1b677e13b550 Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <yahor.berdnikau@jetbrains.com>
Date: Tue, 28 Nov 2023 10:15:05 +0100
Subject: [PATCH] [Gradle] Fix 3-rd party lombok plugin is non-compatible with
 Gradle 8.2

^KT-58064 In Progress
---
 .../org/jetbrains/kotlin/gradle/SubpluginsIT.kt    | 14 ++++++++++++++
 .../testProject/lombokProject/nokapt/build.gradle  |  2 +-
 .../lombokProject/withconfig/build.gradle          |  2 +-
 .../testProject/lombokProject/yeskapt/build.gradle |  2 +-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SubpluginsIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SubpluginsIT.kt
index e98a1d1bcc9..e985bb5058d 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SubpluginsIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SubpluginsIT.kt
@@ -200,6 +200,20 @@ class SubpuginsIT : KGPBaseTest() {
     @GradleTest
     fun testLombokPlugin(gradleVersion: GradleVersion) {
         project("lombokProject", gradleVersion) {
+            listOf(
+                subProject("yeskapt").buildGradle,
+                subProject("nokapt").buildGradle,
+                subProject("withconfig").buildGradle
+            ).forEach { buildGradle ->
+                buildGradle.modify {
+                    val freefairLombokVersion = if (gradleVersion < GradleVersion.version(TestVersions.Gradle.G_8_0)) {
+                        "5.3.0"
+                    } else {
+                        "8.4"
+                    }
+                    it.replace("<freefair_lombok_version>", freefairLombokVersion)
+                }
+            }
             build("build")
         }
     }
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/lombokProject/nokapt/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/lombokProject/nokapt/build.gradle
index 6b72f5513aa..24da6e95078 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/lombokProject/nokapt/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/lombokProject/nokapt/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id "java"
     id "org.jetbrains.kotlin.jvm"
     id "org.jetbrains.kotlin.plugin.lombok"
-    id "io.freefair.lombok" version "5.3.0"
+    id "io.freefair.lombok" version "<freefair_lombok_version>"
 }
 
 dependencies {
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/lombokProject/withconfig/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/lombokProject/withconfig/build.gradle
index b703d6b0e73..3bfef45eee7 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/lombokProject/withconfig/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/lombokProject/withconfig/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id "org.jetbrains.kotlin.jvm"
     id "org.jetbrains.kotlin.kapt"
     id "org.jetbrains.kotlin.plugin.lombok"
-    id "io.freefair.lombok" version "5.3.0"
+    id "io.freefair.lombok" version "<freefair_lombok_version>"
 }
 
 dependencies {
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/lombokProject/yeskapt/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/lombokProject/yeskapt/build.gradle
index 33c2a0e93dc..6fccfbfe5b5 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/lombokProject/yeskapt/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/lombokProject/yeskapt/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id "org.jetbrains.kotlin.jvm"
     id "org.jetbrains.kotlin.kapt"
     id "org.jetbrains.kotlin.plugin.lombok"
-    id "io.freefair.lombok" version "5.3.0"
+    id "io.freefair.lombok" version "<freefair_lombok_version>"
 }
 
 dependencies {