Prepare for release of desugared library 2.1.2
Bug: b/363911539
Change-Id: I00299531888e2646cdbde93405258f989605cd0a
diff --git a/src/library_desugar/jdk11/desugar_jdk_libs.json b/src/library_desugar/jdk11/desugar_jdk_libs.json
index d6185c6..5265c49 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.1",
+ "identifier": "com.tools.android:desugar_jdk_libs_configuration:2.1.2",
"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 a576966..a3cd551 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.1",
+ "identifier": "com.tools.android:desugar_jdk_libs_configuration_minimal:2.1.2",
"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 19db3fa..05c530d 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.1",
+ "identifier": "com.tools.android:desugar_jdk_libs_configuration_nio:2.1.2",
"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/DateTimeStandaloneDayTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DateTimeStandaloneDayTest.java
index 1cab68d..629217e 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DateTimeStandaloneDayTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DateTimeStandaloneDayTest.java
@@ -5,6 +5,7 @@
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.JDK11;
import static com.android.tools.r8.desugar.desugaredlibrary.test.LibraryDesugaringSpecification.getJdk8Jdk11;
import com.android.tools.r8.TestParameters;
@@ -24,8 +25,8 @@
@RunWith(Parameterized.class)
public class DateTimeStandaloneDayTest extends DesugaredLibraryTestBase {
- // TODO(b/362277530): Replace expected output when desugared library is updated.
- private static final String EXPECTED_OUTPUT_TO_FIX =
+ // Standalone weekday names is only supported inn JDK-11 desugared library, see b/362277530.
+ private static final String EXPECTED_OUTPUT_TO_JDK8 =
StringUtils.lines("1", "2", "3", "4", "5", "6", "7");
private static final String EXPECTED_OUTPUT =
StringUtils.lines(
@@ -58,10 +59,11 @@
.addInnerClasses(getClass())
.addKeepMainRule(TestClass.class)
.run(parameters.getRuntime(), TestClass.class)
- .assertSuccessWithOutputIf(
- parameters.getApiLevel().isGreaterThanOrEqualTo(AndroidApiLevel.O), EXPECTED_OUTPUT)
- .assertSuccessWithOutputIf(
- parameters.getApiLevel().isLessThan(AndroidApiLevel.O), EXPECTED_OUTPUT_TO_FIX);
+ .applyIf(
+ libraryDesugaringSpecification == JDK11
+ || parameters.getApiLevel().isGreaterThanOrEqualTo(AndroidApiLevel.O),
+ r -> r.assertSuccessWithOutput(EXPECTED_OUTPUT),
+ r -> r.assertSuccessWithOutput(EXPECTED_OUTPUT_TO_JDK8));
}
public static void main(String[] args) {
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 ac5fd5a..9f5883e 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 @@
-f4f486f37cf801466634ffbf584adb80dc839f4d
\ No newline at end of file
+f3213584e94bf6951c3765c6b8d23405c332ca1b
\ No newline at end of file
