commit e18fa6e165ff963153a884cf78dc496511133bcd
author Søren Gjesse <sgjesse@google.com> Fri Jun 24 15:14:53 2022 +0200
committer Søren Gjesse <sgjesse@google.com> Mon Jun 27 08:43:45 2022 +0000
tree 51d357db1a06a58270278872a451953662f69912
parent bd19c1bdcbb3537b634a9d6754510692919c6963

Cleanup building the desugared library configurations

* Build both JDK-8 and JDK-11 legacy configurations
* Fix the filtering of the legacy conversions


Make the version check depend on variant

Test: tools/archive.py --dry-run --dry-run-output /tmp/dry

Change-Id: Idf261a5e9516c557c68b5261feda0d88fc28adde

tools/create_maven_release.py

diff --git a/tools/create_maven_release.py b/tools/create_maven_release.py
index 6250c75..de9f0ac 100755
--- a/tools/create_maven_release.py
+++ b/tools/create_maven_release.py
@@ -383,7 +383,8 @@
     move(destination + '.zip', destination)
 
 # Generate the maven zip for the configuration to desugar desugar_jdk_libs.
-def generate_desugar_configuration_maven_zip(out, configuration, implementation):
+def generate_desugar_configuration_maven_zip(
+    out, configuration, implementation, conversions):
   with utils.TempDir() as tmp_dir:
     version = utils.desugar_configuration_version(configuration)
     # Generate the pom file.
@@ -394,7 +395,7 @@
     generate_jar_with_desugar_configuration(
         configuration,
         implementation,
-        utils.LIBRARY_DESUGAR_CONVERSIONS_ZIP,
+        conversions,
         jar_file)
     # Write the maven zip file.
     generate_maven_zip(