Fix KmModule deprecated access
Bug: b/333518767
Change-Id: Idaac0d6d4845635a2d0c93bce4a9e60236cc8e13
diff --git a/src/main/java/com/android/tools/r8/naming/KotlinModuleSynthesizer.java b/src/main/java/com/android/tools/r8/naming/KotlinModuleSynthesizer.java
index 39d4bd8..cbaf559 100644
--- a/src/main/java/com/android/tools/r8/naming/KotlinModuleSynthesizer.java
+++ b/src/main/java/com/android/tools/r8/naming/KotlinModuleSynthesizer.java
@@ -26,6 +26,7 @@
import java.util.Optional;
import kotlin.metadata.jvm.JvmMetadataVersion;
import kotlin.metadata.jvm.KmModule;
+import kotlin.metadata.jvm.KmPackageParts;
import kotlin.metadata.jvm.KotlinModuleMetadata;
/**
@@ -171,15 +172,14 @@
String rewrittenName = pair.getSecond();
multiClassPartToOriginal
.getOrDefault(originalName, Collections.emptyList())
- .forEach(
- classPart -> {
- newMultiFiles.put(classPart, rewrittenName);
- });
+ .forEach(classPart -> newMultiFiles.put(classPart, rewrittenName));
});
- kmModule.visitPackageParts(
- newPackage,
- newFacades.getOrDefault(newPackage, Collections.emptyList()),
- newMultiFiles);
+ kmModule
+ .getPackageParts()
+ .put(
+ newPackage,
+ new KmPackageParts(
+ newFacades.getOrDefault(newPackage, Collections.emptyList()), newMultiFiles));
}
return Optional.of(
DataEntryResource.fromBytes(