Update desugared library machine specification version to 201
The format has been updated and is no longer compatible
with version 200.
Bug: b/319604744
Change-Id: Ica462a5ffb55a75f31b5077bc26cd3bfd8322d95
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/DesugaredLibrarySpecificationParser.java b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/DesugaredLibrarySpecificationParser.java
index 8b46407..e62fade 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/DesugaredLibrarySpecificationParser.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/DesugaredLibrarySpecificationParser.java
@@ -21,7 +21,7 @@
public static final String CONFIGURATION_FORMAT_VERSION_KEY = "configuration_format_version";
private static final int MIN_HUMAN_CONFIGURATION_FORMAT_VERSION = 100;
- private static final int MIN_MACHINE_CONFIGURATION_FORMAT_VERSION = 200;
+ public static final int MIN_MACHINE_CONFIGURATION_FORMAT_VERSION = 200;
public static DesugaredLibrarySpecification parseDesugaredLibrarySpecification(
StringResource stringResource,
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/machinespecification/MachineDesugaredLibrarySpecificationParser.java b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/machinespecification/MachineDesugaredLibrarySpecificationParser.java
index 0d03018..67aadce 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/machinespecification/MachineDesugaredLibrarySpecificationParser.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/machinespecification/MachineDesugaredLibrarySpecificationParser.java
@@ -39,6 +39,7 @@
import com.android.tools.r8.graph.DexItemFactory;
import com.android.tools.r8.graph.DexMethod;
import com.android.tools.r8.graph.DexType;
+import com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecificationParser;
import com.android.tools.r8.ir.desugar.desugaredlibrary.memberparser.MachineFieldParser;
import com.android.tools.r8.ir.desugar.desugaredlibrary.memberparser.MachineMethodParser;
import com.android.tools.r8.origin.Origin;
@@ -61,8 +62,10 @@
public class MachineDesugaredLibrarySpecificationParser {
- private static final int MIN_SUPPORTED_VERSION = 200;
- private static final int MAX_SUPPORTED_VERSION = 200;
+ private static final int MIN_SUPPORTED_VERSION =
+ DesugaredLibrarySpecificationParser.MIN_MACHINE_CONFIGURATION_FORMAT_VERSION;
+ private static final int MAX_SUPPORTED_VERSION =
+ MultiAPILevelMachineDesugaredLibrarySpecificationJsonExporter.MACHINE_VERSION_NUMBER;
private static final String ERROR_MESSAGE_PREFIX = "Invalid desugared library specification: ";
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/machinespecification/MultiAPILevelMachineDesugaredLibrarySpecificationJsonExporter.java b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/machinespecification/MultiAPILevelMachineDesugaredLibrarySpecificationJsonExporter.java
index c232dff..46ec6ba 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/machinespecification/MultiAPILevelMachineDesugaredLibrarySpecificationJsonExporter.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/machinespecification/MultiAPILevelMachineDesugaredLibrarySpecificationJsonExporter.java
@@ -56,7 +56,7 @@
public class MultiAPILevelMachineDesugaredLibrarySpecificationJsonExporter {
- private static final int MACHINE_VERSION_NUMBER = 200;
+ static final int MACHINE_VERSION_NUMBER = 201;
private final DexItemFactory factory;
private final Map<String, String> packageMap = new TreeMap<>();
