commit 45352d89c890ca87ec845d82cea94887d013e170
author Søren Gjesse <sgjesse@google.com> Mon Nov 04 10:43:33 2024 +0100
committer Søren Gjesse <sgjesse@google.com> Wed Nov 06 08:58:42 2024 +0000
tree 02abbc8bccea3ed7be260c06442458f2edb299e2
parent c4e4f2183432f8b5ef9bc4386cca419a8b54fc28

Prepare for release of desugared library 2.1.3

Bug: b/300128109
Change-Id: Ia00b964352db964412dc3ed1812a4d0c36f0ae56

src/library_desugar/jdk11/desugar_jdk_libs.json

diff --git a/src/library_desugar/jdk11/desugar_jdk_libs.json b/src/library_desugar/jdk11/desugar_jdk_libs.json
index 5265c49..221f44c 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.2",
+  "identifier": "com.tools.android:desugar_jdk_libs_configuration:2.1.3",
   "configuration_format_version": 101,
   "required_compilation_api_level": 30,
   "synthesized_library_classes_package_prefix": "j$.",

src/library_desugar/jdk11/desugar_jdk_libs_minimal.json

diff --git a/src/library_desugar/jdk11/desugar_jdk_libs_minimal.json b/src/library_desugar/jdk11/desugar_jdk_libs_minimal.json
index a3cd551..f4febc3 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.2",
+  "identifier": "com.tools.android:desugar_jdk_libs_configuration_minimal:2.1.3",
   "configuration_format_version": 101,
   "required_compilation_api_level": 24,
   "synthesized_library_classes_package_prefix": "j$.",

src/library_desugar/jdk11/desugar_jdk_libs_nio.json

diff --git a/src/library_desugar/jdk11/desugar_jdk_libs_nio.json b/src/library_desugar/jdk11/desugar_jdk_libs_nio.json
index 05c530d..2c8bcb4 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.2",
+  "identifier": "com.tools.android:desugar_jdk_libs_configuration_nio:2.1.3",
   "configuration_format_version": 101,
   "required_compilation_api_level": 30,
   "synthesized_library_classes_package_prefix": "j$.",

src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DayTest.java

diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DayTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DayTest.java
index 3b5bfd0..93d7554 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DayTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DayTest.java
@@ -77,12 +77,10 @@
     if (parameters.isCfRuntime() && parameters.getRuntime().asCf().isOlderThan(CfVm.JDK9)) {
       return SIMPLIFIED_CHINESE_EXPECTED_RESULT_JDK8;
     }
-    if (parameters.isDexRuntime() && libraryDesugaringSpecification.hasTimeDesugaring(parameters)) {
-      if (libraryDesugaringSpecification == JDK8) {
-        return MISSING_STANDALONE;
-      } else {
-        return SIMPLIFIED_CHINESE_NARROW_DAY_ISSUE;
-      }
+    if (parameters.isDexRuntime()
+        && libraryDesugaringSpecification.hasTimeDesugaring(parameters)
+        && libraryDesugaringSpecification == JDK8) {
+      return MISSING_STANDALONE;
     }
     return SIMPLIFIED_CHINESE_EXPECTED_RESULT;
   }

third_party/openjdk/desugar_jdk_libs_11.tar.gz.sha1

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 9f5883e..7a144f7 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 @@
-f3213584e94bf6951c3765c6b8d23405c332ca1b
\ No newline at end of file
+5a35d5323fe418db348576d23428cb3346d28535
\ No newline at end of file