Update kotlinx-metadata-jvm to 0.7 from 0.6. Fixed deprecations.

autonomousapps · Nov 8, 2023 · 7d5e5f4 · 7d5e5f4
1 parent 5049d1e
commit 7d5e5f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -30,7 +30,7 @@ kotlin-dokka = { module = "org.jetbrains.dokka:kotlin-as-java-plugin", version.r
 kotlin-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
 kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
-kotlinx-metadata-jvm = "org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.6.0"
+kotlinx-metadata-jvm = "org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.7.0"
 
 moshi-core = { module = "com.squareup.moshi:moshi", version.ref = "moshi" }
 moshi-kotlin = { module = "com.squareup.moshi:moshi-kotlin", version.ref = "moshi" }

diff --git a/src/main/kotlin/com/autonomousapps/tasks/FindInlineMembersTask.kt b/src/main/kotlin/com/autonomousapps/tasks/FindInlineMembersTask.kt
@@ -139,9 +139,9 @@ internal class InlineMembersFinder(
 
         val inlineMembers = metadataVisitor.builder?.let { header ->
           when (val metadata = KotlinClassMetadata.read(header.build())) {
-            is KotlinClassMetadata.Class -> inlineMembers(metadata.toKmClass())
-            is KotlinClassMetadata.FileFacade -> inlineMembers(metadata.toKmPackage())
-            is KotlinClassMetadata.MultiFileClassPart -> inlineMembers(metadata.toKmPackage())
+            is KotlinClassMetadata.Class -> inlineMembers(metadata.kmClass)
+            is KotlinClassMetadata.FileFacade -> inlineMembers(metadata.kmPackage)
+            is KotlinClassMetadata.MultiFileClassPart -> inlineMembers(metadata.kmPackage)
             is KotlinClassMetadata.SyntheticClass -> {
               logger.debug("Ignoring SyntheticClass $entry")
               emptySet()
@@ -156,11 +156,6 @@ internal class InlineMembersFinder(
               logger.debug("Ignoring Unknown $entry")
               emptySet()
             }
-
-            null -> {
-              logger.debug("Ignoring null $entry")
-              emptySet()
-            }
           }
         } ?: emptySet()