commit 3012039f373865b4d8392f0587fd10f6e3953277
author Clément Béra <clementbera@google.com> Mon Jun 10 13:47:00 2024 +0200
committer Clément Béra <clementbera@google.com> Tue Jun 11 07:01:59 2024 +0000
tree 1a5fc9b2f29f149989fc4102cd17186c1fa0fd60
parent 8ab88e7d76db149e0f18810be882a822e2f6582d

Remove deprecated reference in kotlin metadata

Bug: b/333518767
Change-Id: I12620dd0eb2798f06dd37e9dd4e79335d772b92d

src/main/java/com/android/tools/r8/kotlin/KotlinMetadataUtils.java

diff --git a/src/main/java/com/android/tools/r8/kotlin/KotlinMetadataUtils.java b/src/main/java/com/android/tools/r8/kotlin/KotlinMetadataUtils.java
index d47e663..c2f31ef 100644
--- a/src/main/java/com/android/tools/r8/kotlin/KotlinMetadataUtils.java
+++ b/src/main/java/com/android/tools/r8/kotlin/KotlinMetadataUtils.java
@@ -27,8 +27,8 @@
 import kotlin.metadata.KmProperty;
 import kotlin.metadata.jvm.JvmExtensionsKt;
 import kotlin.metadata.jvm.JvmFieldSignature;
+import kotlin.metadata.jvm.JvmMetadataVersion;
 import kotlin.metadata.jvm.JvmMethodSignature;
-import kotlin.metadata.jvm.KotlinClassMetadata;
 
 public class KotlinMetadataUtils {
 
@@ -221,7 +221,12 @@
   }
 
   static int[] getCompatibleKotlinInfo() {
-    return KotlinClassMetadata.COMPATIBLE_METADATA_VERSION;
+    // The kotlin metadata changelog recommends:
+    // "Main migration path here is to replace KotlinClassMetadata.COMPATIBLE_METADATA_VERSION
+    // with new value with the same meaning: JvmMetadataVersion.LATEST_STABLE_SUPPORTED."
+    // The inspection error "Usage of Kotlin internal declaration from different module" does not
+    // prevent the code to work correctly.
+    return JvmMetadataVersion.LATEST_STABLE_SUPPORTED.toIntArray();
   }
 
   static <TKm> TKm consume(TKm tKm, Consumer<TKm> consumer) {