Prepare for release of desugared library 2.1.1
Bug: b/362428683
Change-Id: Ic21d30e51bede92d14638f7bf62bc72a5c3f6a2e
diff --git a/src/library_desugar/jdk11/desugar_jdk_libs.json b/src/library_desugar/jdk11/desugar_jdk_libs.json
index f2dfda6..d6185c6 100644
--- a/src/library_desugar/jdk11/desugar_jdk_libs.json
+++ b/src/library_desugar/jdk11/desugar_jdk_libs.json
@@ -1,5 +1,5 @@
{
- "identifier": "com.tools.android:desugar_jdk_libs_configuration:2.1.0",
+ "identifier": "com.tools.android:desugar_jdk_libs_configuration:2.1.1",
"configuration_format_version": 101,
"required_compilation_api_level": 30,
"synthesized_library_classes_package_prefix": "j$.",
diff --git a/src/library_desugar/jdk11/desugar_jdk_libs_minimal.json b/src/library_desugar/jdk11/desugar_jdk_libs_minimal.json
index 7303240..a576966 100644
--- a/src/library_desugar/jdk11/desugar_jdk_libs_minimal.json
+++ b/src/library_desugar/jdk11/desugar_jdk_libs_minimal.json
@@ -1,5 +1,5 @@
{
- "identifier": "com.tools.android:desugar_jdk_libs_configuration_minimal:2.1.0",
+ "identifier": "com.tools.android:desugar_jdk_libs_configuration_minimal:2.1.1",
"configuration_format_version": 101,
"required_compilation_api_level": 24,
"synthesized_library_classes_package_prefix": "j$.",
diff --git a/src/library_desugar/jdk11/desugar_jdk_libs_nio.json b/src/library_desugar/jdk11/desugar_jdk_libs_nio.json
index 1aff889..19db3fa 100644
--- a/src/library_desugar/jdk11/desugar_jdk_libs_nio.json
+++ b/src/library_desugar/jdk11/desugar_jdk_libs_nio.json
@@ -1,5 +1,5 @@
{
- "identifier": "com.tools.android:desugar_jdk_libs_configuration_nio:2.1.0",
+ "identifier": "com.tools.android:desugar_jdk_libs_configuration_nio:2.1.1",
"configuration_format_version": 101,
"required_compilation_api_level": 30,
"synthesized_library_classes_package_prefix": "j$.",
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DateTimeFormatterStandaloneMonthTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DateTimeFormatterStandaloneMonthTest.java
index 0a83c05..60f5174 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DateTimeFormatterStandaloneMonthTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DateTimeFormatterStandaloneMonthTest.java
@@ -5,12 +5,11 @@
package com.android.tools.r8.desugar.desugaredlibrary;
import static com.android.tools.r8.desugar.desugaredlibrary.test.CompilationSpecification.DEFAULT_SPECIFICATIONS;
-import static com.android.tools.r8.desugar.desugaredlibrary.test.LibraryDesugaringSpecification.JDK8_DESCRIPTOR;
+import static com.android.tools.r8.desugar.desugaredlibrary.test.LibraryDesugaringSpecification.JDK11_DESCRIPTOR;
import static com.android.tools.r8.desugar.desugaredlibrary.test.LibraryDesugaringSpecification.getJdk8Jdk11;
import com.android.tools.r8.SingleTestRunResult;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.ToolHelper.DexVm.Version;
import com.android.tools.r8.desugar.desugaredlibrary.test.CompilationSpecification;
import com.android.tools.r8.desugar.desugaredlibrary.test.LibraryDesugaringSpecification;
import com.android.tools.r8.utils.StringUtils;
@@ -30,21 +29,6 @@
StringUtils.lines(
"1 - 1", "2 - 2", "3 - 3", "4 - 4", "5 - 5", "6 - 6", "7 - 7", "8 - 8", "9 - 9",
"10 - 10", "11 - 11", "12 - 12");
- private static final String expectedOutputLibJdk11 =
- StringUtils.lines(
- "Jan - January",
- "Feb - February",
- "Mar - March",
- "Apr - April",
- "May - May",
- "Jun - June",
- "Jul - July",
- "Aug - August",
- "Sep - September",
- "Oct - October",
- "Nov - November",
- // TODO(b/323306225): December is missing.
- " - ");
private static final String expectedOutput =
StringUtils.lines(
"Jan - January",
@@ -90,15 +74,11 @@
.addKeepMainRule(TestClass.class)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccess();
- if (apiLevelWithJavaTime(parameters)) {
- run.assertSuccessWithOutput(expectedOutput);
- } else if (libraryDesugaringSpecification.getDescriptor() == JDK8_DESCRIPTOR) {
- run.assertSuccessWithOutput(expectedOutputDesugaredLibJdk8);
- } else if (parameters.getRuntime().asDex().getVersion().isEqualTo(Version.V4_0_4)) {
- // Not sure why this works for Dalvik 4.0.4, but not really relevant.
+ if (apiLevelWithJavaTime(parameters)
+ || libraryDesugaringSpecification.getDescriptor() == JDK11_DESCRIPTOR) {
run.assertSuccessWithOutput(expectedOutput);
} else {
- run.assertSuccessWithOutput(expectedOutputLibJdk11);
+ run.assertSuccessWithOutput(expectedOutputDesugaredLibJdk8);
}
}
diff --git a/third_party/openjdk/desugar_jdk_libs_11.tar.gz.sha1 b/third_party/openjdk/desugar_jdk_libs_11.tar.gz.sha1
index 8779e19..ac5fd5a 100644
--- a/third_party/openjdk/desugar_jdk_libs_11.tar.gz.sha1
+++ b/third_party/openjdk/desugar_jdk_libs_11.tar.gz.sha1
@@ -1 +1 @@
-5b02bd53b6df482392dbd41b04c137b0b3c99388
\ No newline at end of file
+f4f486f37cf801466634ffbf584adb80dc839f4d
\ No newline at end of file
