commit | 69017875e2dad19bfd0097566090534890799fda | [log] [tgz] |
---|---|---|
author | Søren Gjesse <sgjesse@google.com> | Tue Jan 11 14:18:45 2022 +0100 |
committer | Søren Gjesse <sgjesse@google.com> | Tue Jan 11 14:18:45 2022 +0100 |
tree | 35359ab03c778c43dc48875611324f6af26b4910 | |
parent | 155e1c980904ca90975d2b787c7bd985eb8031aa [diff] |
Version 3.1.57 Fix merge issue in 3.1.56. Change-Id: Ibf1aa2a0e6ed188d63a4c874de6b664667adbe9b
diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java index 346d9fb..5cd5ea4 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 = "3.1.56"; + public static final String LABEL = "3.1.57"; private Version() { }
diff --git a/src/test/java/com/android/tools/r8/desugar/constantdynamic/ConstantDynamicGetDeclaredMethodsTest.java b/src/test/java/com/android/tools/r8/desugar/constantdynamic/ConstantDynamicGetDeclaredMethodsTest.java index de9685e..31c1595 100644 --- a/src/test/java/com/android/tools/r8/desugar/constantdynamic/ConstantDynamicGetDeclaredMethodsTest.java +++ b/src/test/java/com/android/tools/r8/desugar/constantdynamic/ConstantDynamicGetDeclaredMethodsTest.java
@@ -79,7 +79,12 @@ c -> DesugarTestConfiguration.isDesugared(c) && parameters.isDexRuntime() - && parameters.asDexRuntime().getVersion().isOlderThan(Version.V8_1_0), + && parameters + .getRuntime() + .asDex() + .getVm() + .getVersion() + .isOlderThan(Version.V8_1_0), r -> r.assertFailureWithErrorThatThrows(ClassNotFoundException.class), r -> r.assertSuccessWithOutput(EXPECTED_OUTPUT)); }