From 9f8ea3e2e53cd6555bd80fee012eba794093e250 Mon Sep 17 00:00:00 2001
From: cristiangarcia <Cristian.Garcia-Marin@jetbrains.com>
Date: Tue, 6 Feb 2024 20:16:22 +0000
Subject: [PATCH] Proguard 7.4.2 - ConfigurationCache compatible

Required for KTI-1553
---
 gradle/libs.versions.toml                     |  2 +-
 gradle/verification-metadata.xml              | 24 +++++++++----------
 .../src/main/kotlin/CacheableProguradTask.kt  |  5 ++--
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a91d3b9f644..095a1331edc 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -11,7 +11,7 @@ jdom2 = "2.0.6.1"
 kotlinx-serialization = "1.5.0"
 shadow = "8.1.1" # Should be in sync with version in kotlin-native/
 spdx = "0.1.0-dev-10"
-proguard = "7.4.1"
+proguard = "7.4.2"
 ktor = "2.3.7"
 kotlinx-metadataJvm = "0.7.0"
 # Forcing gson version because of https://github.com/google/gson/pull/1991
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 4529f482fe2..9a9e5e6066d 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -1026,22 +1026,22 @@
             <sha256 value="298f0c2e979532171a05a41603263733b65f89113d4e809ccd0e26990149de18" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.guardsquare" name="proguard-base" version="7.4.1">
-         <artifact name="proguard-base-7.4.1.jar">
-            <md5 value="b0bef7a6eff12806240a95b44f213e3b" origin="Generated by Gradle"/>
-            <sha256 value="a4f71a8dde8be77cb84dc862dabd3322cc8c082a6d21489d96bd7cd9f3b673ff" origin="Generated by Gradle"/>
+      <component group="com.guardsquare" name="proguard-base" version="7.4.2">
+         <artifact name="proguard-base-7.4.2.jar">
+            <md5 value="b351925e7237af49781e8e132d1eb9ac" origin="Generated by Gradle"/>
+            <sha256 value="8a3a9837da14881ccdd189cabe9069fd7ffa9fffc69387fdd4f7f3682781e498" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.guardsquare" name="proguard-core" version="9.1.0">
-         <artifact name="proguard-core-9.1.0.jar">
-            <md5 value="299b3472db72a5e17d68376bae405271" origin="Generated by Gradle"/>
-            <sha256 value="a5f5462a98de7bc4a79408d6240ab18bd78ed0bfc0a559e20e1a9357949986b9" origin="Generated by Gradle"/>
+      <component group="com.guardsquare" name="proguard-core" version="9.1.1">
+         <artifact name="proguard-core-9.1.1.jar">
+            <md5 value="fcfe4754219abcbf8e6f1564b78d2acc" origin="Generated by Gradle"/>
+            <sha256 value="1882b17ceaeff14c89e74903dd2aa47af57f85d574ea98ea008bc1b9db53f5f1" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.guardsquare" name="proguard-gradle" version="7.4.1">
-         <artifact name="proguard-gradle-7.4.1.jar">
-            <md5 value="8fd90abc203308608cb42f2eb45cc6a3" origin="Generated by Gradle"/>
-            <sha256 value="2e1de7210a6be224093c56f8127bf28a763c5b13a2b28d49dddb713ef65d9cec" origin="Generated by Gradle"/>
+      <component group="com.guardsquare" name="proguard-gradle" version="7.4.2">
+         <artifact name="proguard-gradle-7.4.2.jar">
+            <md5 value="296627bda1ba3945f09a979e9f7531fd" origin="Generated by Gradle"/>
+            <sha256 value="2f692fa07c23d70af15f5b4de59c0c53b15bc2a867347f41f5672c98230f7237" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.ibm.icu" name="icu4j" version="53.1">
diff --git a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/CacheableProguradTask.kt b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/CacheableProguradTask.kt
index 1ea8da54f8f..38e35fdd47e 100644
--- a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/CacheableProguradTask.kt
+++ b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/CacheableProguradTask.kt
@@ -13,10 +13,9 @@ import org.gradle.kotlin.dsl.property
 import java.io.File
 
 @CacheableTask
-open class CacheableProguardTask : proguard.gradle.ProGuardTask() {
-
+abstract class CacheableProguardTask : proguard.gradle.ProGuardTask() {
     @get:Internal
-    val javaLauncher: Property<JavaLauncher> = project.objects.property()
+    abstract val javaLauncher: Property<JavaLauncher>
 
     @get:Internal
     val jdkHomePath: Provider<File> = javaLauncher.map { it.metadata.installationPath.asFile }