Update Kotlin Metadata dependency from 0.9.0 to 2.0.0-Beta5

java-team-github-bot · Dagger Team · commit 8fd51a45cba7 · 2024-06-19T06:52:36.000-07:00
RELNOTES=Update Kotlin Metadata dependency from 0.9.0 to 2.0.0-Beta5
PiperOrigin-RevId: 644733433
diff --git a/java/dagger/hilt/processor/internal/kotlin/BUILD b/java/dagger/hilt/processor/internal/kotlin/BUILD
@@ -33,7 +33,7 @@ java_library(
         "//third_party/java/javapoet",
         "//third_party/java/jsr305_annotations",
         "//third_party/java/jsr330_inject",
-        "//third_party/kotlin/kotlinx_metadata_jvm",
+        "@maven//:org_jetbrains_kotlin_kotlin_metadata_jvm",
         "@maven//:org_jetbrains_kotlin_kotlin_stdlib",
     ],
 )
diff --git a/java/dagger/hilt/processor/internal/kotlin/KotlinMetadata.java b/java/dagger/hilt/processor/internal/kotlin/KotlinMetadata.java
@@ -17,7 +17,7 @@
 package dagger.hilt.processor.internal.kotlin;
 
 import static dagger.internal.codegen.extension.DaggerStreams.toImmutableMap;
-import static kotlinx.metadata.Flag.ValueParameter.DECLARES_DEFAULT_VALUE;
+import static kotlin.metadata.Flag.ValueParameter.DECLARES_DEFAULT_VALUE;
 
 import androidx.room.compiler.processing.XAnnotation;
 import androidx.room.compiler.processing.XFieldElement;
@@ -38,16 +38,16 @@
 import java.util.function.Function;
 import javax.annotation.Nullable;
 import kotlin.Metadata;
-import kotlinx.metadata.Flag;
-import kotlinx.metadata.KmClass;
-import kotlinx.metadata.KmConstructor;
-import kotlinx.metadata.KmFunction;
-import kotlinx.metadata.KmProperty;
-import kotlinx.metadata.jvm.JvmExtensionsKt;
-import kotlinx.metadata.jvm.JvmFieldSignature;
-import kotlinx.metadata.jvm.JvmMetadataUtil;
-import kotlinx.metadata.jvm.JvmMethodSignature;
-import kotlinx.metadata.jvm.KotlinClassMetadata;
+import kotlin.metadata.Flag;
+import kotlin.metadata.KmClass;
+import kotlin.metadata.KmConstructor;
+import kotlin.metadata.KmFunction;
+import kotlin.metadata.KmProperty;
+import kotlin.metadata.jvm.JvmExtensionsKt;
+import kotlin.metadata.jvm.JvmFieldSignature;
+import kotlin.metadata.jvm.JvmMetadataUtil;
+import kotlin.metadata.jvm.JvmMethodSignature;
+import kotlin.metadata.jvm.KotlinClassMetadata;
 
 /** Data class of a TypeElement and its Kotlin metadata. */
 @AutoValue
diff --git a/java/dagger/internal/codegen/kotlin/BUILD b/java/dagger/internal/codegen/kotlin/BUILD
@@ -36,7 +36,7 @@ java_library(
         "//third_party/java/javapoet",
         "//third_party/java/jsr305_annotations",
         "//third_party/java/jsr330_inject",
-        "//third_party/kotlin/kotlinx_metadata_jvm",
+        "@maven//:org_jetbrains_kotlin_kotlin_metadata_jvm",
         "@maven//:org_jetbrains_kotlin_kotlin_stdlib",
     ],
 )
diff --git a/java/dagger/internal/codegen/kotlin/KotlinMetadata.java b/java/dagger/internal/codegen/kotlin/KotlinMetadata.java
@@ -38,16 +38,16 @@
 import java.util.function.Function;
 import javax.annotation.Nullable;
 import kotlin.Metadata;
-import kotlinx.metadata.Flag;
-import kotlinx.metadata.KmClass;
-import kotlinx.metadata.KmConstructor;
-import kotlinx.metadata.KmFunction;
-import kotlinx.metadata.KmProperty;
-import kotlinx.metadata.jvm.JvmExtensionsKt;
-import kotlinx.metadata.jvm.JvmFieldSignature;
-import kotlinx.metadata.jvm.JvmMetadataUtil;
-import kotlinx.metadata.jvm.JvmMethodSignature;
-import kotlinx.metadata.jvm.KotlinClassMetadata;
+import kotlin.metadata.Flag;
+import kotlin.metadata.KmClass;
+import kotlin.metadata.KmConstructor;
+import kotlin.metadata.KmFunction;
+import kotlin.metadata.KmProperty;
+import kotlin.metadata.jvm.JvmExtensionsKt;
+import kotlin.metadata.jvm.JvmFieldSignature;
+import kotlin.metadata.jvm.JvmMetadataUtil;
+import kotlin.metadata.jvm.JvmMethodSignature;
+import kotlin.metadata.jvm.KotlinClassMetadata;
 
 /** Data class of a TypeElement and its Kotlin metadata. */
 @AutoValue
diff --git a/java/dagger/spi/BUILD b/java/dagger/spi/BUILD
@@ -80,7 +80,7 @@ gen_maven_artifact(
     # util/deploy-dagger.sh
     shaded_deps = [
         "//third_party/java/auto:common",
-        "//third_party/kotlin/kotlinx_metadata_jvm",
+        "@maven//:org_jetbrains_kotlin_kotlin_metadata_jvm",
         "//java/dagger/internal/codegen/xprocessing:xprocessing-jar",
     ],
 )

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ java_library(`
`33`	`33`	`"//third_party/java/javapoet",`
`34`	`34`	`"//third_party/java/jsr305_annotations",`
`35`	`35`	`"//third_party/java/jsr330_inject",`
`36`		`- "//third_party/kotlin/kotlinx_metadata_jvm",`
	`36`	`+ "@maven//:org_jetbrains_kotlin_kotlin_metadata_jvm",`
`37`	`37`	`"@maven//:org_jetbrains_kotlin_kotlin_stdlib",`
`38`	`38`	`],`
`39`	`39`	`)`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ java_library(`
`36`	`36`	`"//third_party/java/javapoet",`
`37`	`37`	`"//third_party/java/jsr305_annotations",`
`38`	`38`	`"//third_party/java/jsr330_inject",`
`39`		`- "//third_party/kotlin/kotlinx_metadata_jvm",`
	`39`	`+ "@maven//:org_jetbrains_kotlin_kotlin_metadata_jvm",`
`40`	`40`	`"@maven//:org_jetbrains_kotlin_kotlin_stdlib",`
`41`	`41`	`],`
`42`	`42`	`)`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ gen_maven_artifact(`
`80`	`80`	`# util/deploy-dagger.sh`
`81`	`81`	`shaded_deps = [`
`82`	`82`	`"//third_party/java/auto:common",`
`83`		`- "//third_party/kotlin/kotlinx_metadata_jvm",`
	`83`	`+ "@maven//:org_jetbrains_kotlin_kotlin_metadata_jvm",`
`84`	`84`	`"//java/dagger/internal/codegen/xprocessing:xprocessing-jar",`
`85`	`85`	`],`
`86`	`86`	`)`