commit 2c35b3a531fc115c044e04fa036855835ad33a9a
author Clément Béra <clementbera@google.com> Fri Sep 23 10:43:47 2022 +0200
committer Clément Béra <clementbera@google.com> Fri Sep 23 08:44:39 2022 +0000
tree c64f74d5d25a0d7216cc80efc47f92a343e737c8
parent c2ed98286230982292563974b2a946940702d01a

Fix Collection#toArray emulated interface api levels

- fix red bots

Change-Id: I5c05481a3f0a596c9181f2ceef4a314b0425ffff

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 97c9ae5..5adf5d1 100644
--- a/src/library_desugar/jdk11/desugar_jdk_libs.json
+++ b/src/library_desugar/jdk11/desugar_jdk_libs.json
@@ -46,7 +46,7 @@
       ]
     },
     {
-      "api_level_below_or_equal": 33,
+      "api_level_below_or_equal": 32,
       "api_level_greater_or_equal": 24,
       "emulate_interface": {
         "java.util.Collection": "j$.util.Collection"

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 c308b06..8d31143 100644
--- a/src/library_desugar/jdk11/desugar_jdk_libs_nio.json
+++ b/src/library_desugar/jdk11/desugar_jdk_libs_nio.json
@@ -60,7 +60,7 @@
       ]
     },
     {
-      "api_level_below_or_equal": 33,
+      "api_level_below_or_equal": 32,
       "api_level_greater_or_equal": 24,
       "emulate_interface": {
         "java.util.Collection": "j$.util.Collection"

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

diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/test/LibraryDesugaringSpecification.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/test/LibraryDesugaringSpecification.java
index 0222cb7..9ccafc8 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/test/LibraryDesugaringSpecification.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/test/LibraryDesugaringSpecification.java
@@ -34,7 +34,7 @@
 public class LibraryDesugaringSpecification {
 
   public static Descriptor JDK8_DESCRIPTOR = new Descriptor(24, 26, -1, 26, 24);
-  public static Descriptor JDK11_DESCRIPTOR = new Descriptor(24, 30, -1, 30, -1);
+  public static Descriptor JDK11_DESCRIPTOR = new Descriptor(24, 30, -1, 32, -1);
   public static Descriptor EMPTY_DESCRIPTOR_24 = new Descriptor(-1, -1, -1, 24, -1);
   public static Descriptor JDK11_PATH_DESCRIPTOR = new Descriptor(24, 30, 26, 32, -1);
   public static Descriptor JDK11_LEGACY_DESCRIPTOR = new Descriptor(24, 10000, -1, 10000, 24);