Skip to content

Commit f7f40dd

Browse files
Chang-EricDagger Team
authored andcommitted
Revert Kotlin Metadata dependency back to 0.9.0 from 2.0.0-Beta5
RELNOTES=n/a PiperOrigin-RevId: 645498660
1 parent fff8c7b commit f7f40dd

File tree

5 files changed

+24
-24
lines changed

5 files changed

+24
-24
lines changed

java/dagger/hilt/processor/internal/kotlin/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ java_library(
3333
"//third_party/java/javapoet",
3434
"//third_party/java/jsr305_annotations",
3535
"//third_party/java/jsr330_inject",
36-
"//third_party/kotlin/kotlin_metadata_jvm",
3736
"@maven//:org_jetbrains_kotlin_kotlin_stdlib",
37+
"@maven//:org_jetbrains_kotlinx_kotlinx_metadata_jvm",
3838
],
3939
)

java/dagger/hilt/processor/internal/kotlin/KotlinMetadata.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package dagger.hilt.processor.internal.kotlin;
1818

1919
import static dagger.internal.codegen.extension.DaggerStreams.toImmutableMap;
20-
import static kotlin.metadata.Flag.ValueParameter.DECLARES_DEFAULT_VALUE;
20+
import static kotlinx.metadata.Flag.ValueParameter.DECLARES_DEFAULT_VALUE;
2121

2222
import androidx.room.compiler.processing.XAnnotation;
2323
import androidx.room.compiler.processing.XFieldElement;
@@ -38,16 +38,16 @@
3838
import java.util.function.Function;
3939
import javax.annotation.Nullable;
4040
import kotlin.Metadata;
41-
import kotlin.metadata.Flag;
42-
import kotlin.metadata.KmClass;
43-
import kotlin.metadata.KmConstructor;
44-
import kotlin.metadata.KmFunction;
45-
import kotlin.metadata.KmProperty;
46-
import kotlin.metadata.jvm.JvmExtensionsKt;
47-
import kotlin.metadata.jvm.JvmFieldSignature;
48-
import kotlin.metadata.jvm.JvmMetadataUtil;
49-
import kotlin.metadata.jvm.JvmMethodSignature;
50-
import kotlin.metadata.jvm.KotlinClassMetadata;
41+
import kotlinx.metadata.Flag;
42+
import kotlinx.metadata.KmClass;
43+
import kotlinx.metadata.KmConstructor;
44+
import kotlinx.metadata.KmFunction;
45+
import kotlinx.metadata.KmProperty;
46+
import kotlinx.metadata.jvm.JvmExtensionsKt;
47+
import kotlinx.metadata.jvm.JvmFieldSignature;
48+
import kotlinx.metadata.jvm.JvmMetadataUtil;
49+
import kotlinx.metadata.jvm.JvmMethodSignature;
50+
import kotlinx.metadata.jvm.KotlinClassMetadata;
5151

5252
/** Data class of a TypeElement and its Kotlin metadata. */
5353
@AutoValue

java/dagger/internal/codegen/kotlin/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ java_library(
3636
"//third_party/java/javapoet",
3737
"//third_party/java/jsr305_annotations",
3838
"//third_party/java/jsr330_inject",
39-
"//third_party/kotlin/kotlin_metadata_jvm",
4039
"@maven//:org_jetbrains_kotlin_kotlin_stdlib",
40+
"@maven//:org_jetbrains_kotlinx_kotlinx_metadata_jvm",
4141
],
4242
)

java/dagger/internal/codegen/kotlin/KotlinMetadata.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,16 @@
3838
import java.util.function.Function;
3939
import javax.annotation.Nullable;
4040
import kotlin.Metadata;
41-
import kotlin.metadata.Flag;
42-
import kotlin.metadata.KmClass;
43-
import kotlin.metadata.KmConstructor;
44-
import kotlin.metadata.KmFunction;
45-
import kotlin.metadata.KmProperty;
46-
import kotlin.metadata.jvm.JvmExtensionsKt;
47-
import kotlin.metadata.jvm.JvmFieldSignature;
48-
import kotlin.metadata.jvm.JvmMetadataUtil;
49-
import kotlin.metadata.jvm.JvmMethodSignature;
50-
import kotlin.metadata.jvm.KotlinClassMetadata;
41+
import kotlinx.metadata.Flag;
42+
import kotlinx.metadata.KmClass;
43+
import kotlinx.metadata.KmConstructor;
44+
import kotlinx.metadata.KmFunction;
45+
import kotlinx.metadata.KmProperty;
46+
import kotlinx.metadata.jvm.JvmExtensionsKt;
47+
import kotlinx.metadata.jvm.JvmFieldSignature;
48+
import kotlinx.metadata.jvm.JvmMetadataUtil;
49+
import kotlinx.metadata.jvm.JvmMethodSignature;
50+
import kotlinx.metadata.jvm.KotlinClassMetadata;
5151

5252
/** Data class of a TypeElement and its Kotlin metadata. */
5353
@AutoValue

java/dagger/spi/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ gen_maven_artifact(
8080
# util/deploy-dagger.sh
8181
shaded_deps = [
8282
"//third_party/java/auto:common",
83-
"//third_party/kotlin/kotlin_metadata_jvm",
83+
"@maven//:org_jetbrains_kotlinx_kotlinx_metadata_jvm",
8484
"//java/dagger/internal/codegen/xprocessing:xprocessing-jar",
8585
],
8686
)

0 commit comments

Comments
 (0)