Version 2.2.62
Bug: 182463100
Bug: 181533278
Bug: 182137865
Bug: 182249451
Applied following patch to address merge issue:
diff --git a/src/test/java/com/android/tools/r8/ir/desugar/backports/GenerateBackportMethods.java b/src/test/java/com/android/tools/r8/ir/desugar/backports/GenerateBackportMethods.java
index 455c5c2e4..2b2bdc682 100644
--- a/src/test/java/com/android/tools/r8/ir/desugar/backports/GenerateBackportMethods.java
+++ b/src/test/java/com/android/tools/r8/ir/desugar/backports/GenerateBackportMethods.java
@@ -93,7 +93,7 @@ public class GenerateBackportMethods extends MethodGenerationBase {
invoke.getOpcode(),
itemFactory.createMethod(
itemFactory.createType("Ljava/lang/Long;"),
- invoke.getMethod().getProto(),
+ invoke.getMethod().proto,
itemFactory.createString("parseUnsignedLong")),
invoke.isInterface());
} else {
Change-Id: I8863981f5329ec4d08c62c71bf5f68def4b09a1d
diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index b36d5c6..ece55fb 100644
--- a/src/main/java/com/android/tools/r8/Version.java
+++ b/src/main/java/com/android/tools/r8/Version.java
@@ -11,7 +11,7 @@
// This field is accessed from release scripts using simple pattern matching.
// Therefore, changing this field could break our release scripts.
- public static final String LABEL = "2.2.61";
+ public static final String LABEL = "2.2.62";
private Version() {
}
diff --git a/src/test/java/com/android/tools/r8/ir/desugar/backports/GenerateBackportMethods.java b/src/test/java/com/android/tools/r8/ir/desugar/backports/GenerateBackportMethods.java
index 455c5c2..2b2bdc6 100644
--- a/src/test/java/com/android/tools/r8/ir/desugar/backports/GenerateBackportMethods.java
+++ b/src/test/java/com/android/tools/r8/ir/desugar/backports/GenerateBackportMethods.java
@@ -93,7 +93,7 @@
invoke.getOpcode(),
itemFactory.createMethod(
itemFactory.createType("Ljava/lang/Long;"),
- invoke.getMethod().getProto(),
+ invoke.getMethod().proto,
itemFactory.createString("parseUnsignedLong")),
invoke.isInterface());
} else {