Update Kotlin metadata to 2.0.0
Bug: b/341991457
Change-Id: Ifbbb638b8e363ccb56f177704a8660d64e5f04f1
diff --git a/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt b/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt
index 48186d2..1f748ae 100644
--- a/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt
+++ b/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt
@@ -400,7 +400,7 @@
const val javassist = "3.29.2-GA"
const val junitVersion = "4.13-beta-2"
const val kotlinVersion = "1.9.20"
- const val kotlinMetadataVersion = "2.0.0-Beta5"
+ const val kotlinMetadataVersion = "2.0.0"
const val mockito = "2.10.0"
const val smaliVersion = "3.0.3"
}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInFunctionTest.java b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInFunctionTest.java
index c6fa158..3df45e3 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInFunctionTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInFunctionTest.java
@@ -203,7 +203,7 @@
KmFunctionSubject kmFunction = kmClass.kmFunctionWithUniqueName(foo.getFinalName());
assertThat(kmFunction, isPresent());
assertThat(kmFunction, not(isExtensionFunction()));
- assertEquals(foo.getJvmMethodSignatureAsString(), kmFunction.signature().asString());
+ assertEquals(foo.getJvmMethodSignatureAsString(), kmFunction.signature().toString());
ClassSubject impl = inspector.clazz(bClassName);
assertThat(impl, isPresentAndNotRenamed());
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInPropertyTest.java b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInPropertyTest.java
index aa96b5b..70f3091 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInPropertyTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInPropertyTest.java
@@ -132,17 +132,17 @@
// Property name is not renamed, due to the kept getter.
assertEquals("name", name.name());
assertNotNull(name.fieldSignature());
- assertEquals(backingField.getJvmFieldSignatureAsString(), name.fieldSignature().asString());
+ assertEquals(backingField.getJvmFieldSignatureAsString(), name.fieldSignature().toString());
assertNotNull(name.getterSignature());
- assertEquals(getterForName.getJvmMethodSignatureAsString(), name.getterSignature().asString());
- assertEquals(name.setterSignature().asString(), "setName(Ljava/lang/String;)V");
+ assertEquals(getterForName.getJvmMethodSignatureAsString(), name.getterSignature().toString());
+ assertEquals(name.setterSignature().toString(), "setName(Ljava/lang/String;)V");
KmPropertySubject familyName = kmClass.kmPropertyWithUniqueName("familyName");
assertThat(familyName, isPresent());
assertThat(familyName, not(isExtensionProperty()));
// No backing field for property `familyName`
assertNull(familyName.fieldSignature());
- assertEquals(familyName.getterSignature().asString(), "getFamilyName()Ljava/lang/String;");
+ assertEquals(familyName.getterSignature().toString(), "getFamilyName()Ljava/lang/String;");
assertNull(familyName.setterSignature());
KmPropertySubject age = kmClass.kmPropertyWithUniqueName("age");
@@ -150,9 +150,9 @@
assertThat(age, not(isExtensionProperty()));
assertEquals(
kotlinParameters.isNewerThanOrEqualTo(KOTLINC_1_5_0) ? "b:I" : "a:I",
- age.fieldSignature().asString());
- assertEquals("getAge()I", age.getterSignature().asString());
- assertEquals("setAge(I)V", age.setterSignature().asString());
+ age.fieldSignature().toString());
+ assertEquals("getAge()I", age.getterSignature().toString());
+ assertEquals("setAge(I)V", age.setterSignature().toString());
}
@Test
@@ -244,9 +244,9 @@
// # fieldSignature: name:Ljava/lang/String;,
// # getterSignature: getName()Ljava/lang/String;,
// # setterSignature: setName(Ljava/lang/String;)V,
- assertEquals("name:Ljava/lang/String;", name.fieldSignature().asString());
- assertEquals("getName()Ljava/lang/String;", name.getterSignature().asString());
- assertEquals("setName(Ljava/lang/String;)V", name.setterSignature().asString());
+ assertEquals("name:Ljava/lang/String;", name.fieldSignature().toString());
+ assertEquals("getName()Ljava/lang/String;", name.getterSignature().toString());
+ assertEquals("setName(Ljava/lang/String;)V", name.setterSignature().toString());
KmPropertySubject familyName = kmClass.kmPropertyWithUniqueName("familyName");
assertThat(familyName, not(isPresent()));
@@ -257,8 +257,8 @@
KmPropertySubject age = kmClass.kmPropertyWithUniqueName("age");
assertThat(age, isPresent());
assertThat(age, not(isExtensionProperty()));
- assertEquals("age:I", age.fieldSignature().asString());
- assertEquals("getAge()I", age.getterSignature().asString());
- assertEquals("setAge(I)V", age.setterSignature().asString());
+ assertEquals("age:I", age.fieldSignature().toString());
+ assertEquals("getAge()I", age.getterSignature().toString());
+ assertEquals("setAge(I)V", age.setterSignature().toString());
}
}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteJvmStaticTest.java b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteJvmStaticTest.java
index b36ef5e..c7fef81 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteJvmStaticTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteJvmStaticTest.java
@@ -138,7 +138,7 @@
assertThat(kmClass, isPresent());
KmFunctionSubject staticFun = kmClass.kmFunctionWithUniqueName("staticFun");
assertThat(staticFun, isPresent());
- assertEquals("staticFun(Lkotlin/jvm/functions/Function0;)V", staticFun.signature().asString());
+ assertEquals("staticFun(Lkotlin/jvm/functions/Function0;)V", staticFun.signature().toString());
KmPropertySubject staticProp = kmClass.kmPropertyWithUniqueName("staticProp");
assertThat(staticProp, isPresent());
}
@@ -154,6 +154,6 @@
KmClassSubject kmClass = itfCompanion.getKmClass();
KmFunctionSubject greetKm = kmClass.kmFunctionWithUniqueName("greet");
assertThat(greetKm, isPresent());
- assertEquals("greet(Ljava/lang/String;)V", greetKm.signature().asString());
+ assertEquals("greet(Ljava/lang/String;)V", greetKm.signature().toString());
}
}
diff --git a/third_party/dependencies.tar.gz.sha1 b/third_party/dependencies.tar.gz.sha1
index 362cc92..eacd0fe 100644
--- a/third_party/dependencies.tar.gz.sha1
+++ b/third_party/dependencies.tar.gz.sha1
@@ -1 +1 @@
-fd84e5adc03d7770a211a2fcb7978f0339c6c02a
\ No newline at end of file
+69699e487d7f4e51da88351227dd09a2eb3147f1
\ No newline at end of file
diff --git a/tools/create_local_maven_with_dependencies.py b/tools/create_local_maven_with_dependencies.py
index ca2db6a..0df88f7 100755
--- a/tools/create_local_maven_with_dependencies.py
+++ b/tools/create_local_maven_with_dependencies.py
@@ -24,7 +24,7 @@
ASM_VERSION = '9.7' # When updating update tools/asmifier.py and Toolhelper as well.
ESPRESSO_VERSION = '3.0.0'
FASTUTIL_VERSION = '7.2.1'
-KOTLIN_METADATA_VERSION = '2.0.0-Beta5'
+KOTLIN_METADATA_VERSION = '2.0.0'
KOTLIN_VERSION = '1.9.20'
GUAVA_VERSION = '32.1.2-jre'
GSON_VERSION = '2.10.1'
