commit | bbc672f362af8c44ef7c4a47907a41e822878068 | [log] [tgz] |
---|---|---|
author | Clément Béra <clementbera@google.com> | Thu Mar 26 14:37:31 2020 +0000 |
committer | Clément Béra <clementbera@google.com> | Thu Mar 26 14:37:31 2020 +0000 |
tree | 4d83d3888501712799ba47727e35e737b449037d | |
parent | d9dd315f8c1aaa94aa754b07738417e121b427ad [diff] |
Version 2.0.59 Cherry-pick: Desugared lib: allow compilation with missing conversion CL: https://r8-review.googlesource.com/c/r8/+/49987 Bug: 152240452
diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java index c5d4ae7..c309cc4 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.0.58"; + public static final String LABEL = "2.0.59"; private Version() { }
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/conversiontests/APIConversionFinalClassTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/conversiontests/APIConversionFinalClassTest.java index 0c13b40..523b961 100644 --- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/conversiontests/APIConversionFinalClassTest.java +++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/conversiontests/APIConversionFinalClassTest.java
@@ -31,7 +31,7 @@ @Parameterized.Parameters(name = "{0}, shrinkDesugaredLibrary: {1}") public static List<Object[]> data() { - return buildParameters(getTestParameters().withDexRuntimesStartingFromIncluding(ToolHelper.DexVm.Version.V7_0_0).withApiLevelsEndingAtIncluding(AndroidApiLevel.M).build(), BooleanUtils.values()); + return buildParameters(getTestParameters().withDexRuntimesStartingFromIncluding(ToolHelper.DexVm.Version.V8_1_0).withApiLevelsEndingAtExcluding(AndroidApiLevel.O).build(), BooleanUtils.values()); } public APIConversionFinalClassTest(TestParameters parameters, boolean shrinkDesugaredLibrary) {