commit f508827cda69780cb94db427a08370cdd45dcc3f
author Rico Wind <ricow@google.com> Wed Oct 11 10:14:05 2023 +0200
committer Rico Wind <ricow@google.com> Wed Oct 11 08:48:26 2023 +0000
tree 647185b200dda5f37ae9cbc371a5d620dace13fb
parent 65675a38bfbebd533327612ffc69020de4195c21

Don't use old gradle in create_maven_release

Bug: b/270105162
Change-Id: I49fbd429b7ede6dec564f8899009c66dc30362a6

tools/create_maven_release.py

diff --git a/tools/create_maven_release.py b/tools/create_maven_release.py
index 8079c61..255926f 100755
--- a/tools/create_maven_release.py
+++ b/tools/create_maven_release.py
@@ -251,12 +251,8 @@
 def generate_r8_maven_zip(out, version_file=None, skip_gradle_build=False,
                           new_gradle=False):
   if not skip_gradle_build:
-    if (new_gradle):
-      gradle.RunGradle([utils.GRADLE_TASK_R8LIB,
-                        '-Pno_internal'], new_gradle=True)
-    else:
-      gradle.RunGradle([utils.R8LIB, '-Pno_internal'])
-
+    gradle.RunGradle([utils.GRADLE_TASK_R8LIB,
+                      '-Pno_internal'], new_gradle=True)
   version = determine_version()
   with utils.TempDir() as tmp_dir:
     file_copy = join(tmp_dir, 'copy_of_jar.jar')