55aa4c40e235cceb458689182e8e13f6cd99ca69

Author
ohmyzsh[bot] <54982679+ohmyzsh[bot]@users.noreply.github.com>
Committer
GitHub <noreply@github.com>
Date

Message

feat(gradle): update to d51199b5 (#13390)

Co-authored-by: ohmyzsh[bot] <54982679+ohmyzsh[bot]@users.noreply.github.com>

Diff

This diff is truncated to protect this page.

  1diff --git a/.github/dependencies.yml b/.github/dependencies.yml
  2index b67a4c7edc9fc43bce8796c2b267bfa964bbd91e..8e01a3548655dba8b32aafa093900addf31c0466 100644
  3--- a/.github/dependencies.yml
  4+++ b/.github/dependencies.yml
  5@@ -12,7 +12,7 @@ dependencies:
  6   plugins/gradle:
  7     repo: gradle/gradle-completion
  8     branch: master
  9-    version: 25da917cf5a88f3e58f05be3868a7b2748c8afe6
 10+    version: d51199b54e5b6d7b5a6e37d8a3badc3df7efd8ee
 11     precopy: |
 12       set -e
 13       find . ! -name _gradle ! -name LICENSE -delete
 14diff --git a/plugins/gradle/_gradle b/plugins/gradle/_gradle
 15index ca13fd0b01ea3192983b7cfb0bd068a906e01afc..369cbc140fe7c32805390a9476900a54f9504286 100644
 16--- a/plugins/gradle/_gradle
 17+++ b/plugins/gradle/_gradle
 18@@ -19,18 +19,18 @@ __gradle-init-cache-dir() {
 19 }
 20 
 21 __gradle-set-settings-file() {
 22-    # In order of precedence: --settings-file=filename, settings.gradle, settings.gradle.kts
 23+    # In order of precedence: settings.gradle, settings.gradle.kts
 24 
 25     local default_gradle_settings_file="$project_root_dir/settings.gradle"
 26     if [[ ! -f $default_gradle_settings_file ]]; then
 27       default_gradle_settings_file="$project_root_dir/settings.gradle.kts"
 28     fi
 29-    gradle_settings_file=${${(v)opt_args[(i)-c|--settings-file]}:-$default_gradle_settings_file}
 30+    gradle_settings_file=$default_gradle_settings_file
 31 }
 32 
 33 __gradle-set-build-file() {
 34     __gradle-set-settings-file
 35-    # In order of precedence: --build-file=filename, rootProject.buildFileName, build.gradle, build.gradle.kts
 36+    # In order of precedence: rootProject.buildFileName, build.gradle, build.gradle.kts
 37 
 38     local default_gradle_build_file_name="build.gradle"
 39     if [[ -r $gradle_settings_file ]]; then
 40@@ -45,8 +45,7 @@ __gradle-set-build-file() {
 41         default_gradle_build_file="$project_root_dir/build.gradle.kts"
 42     fi
 43 
 44-    # If a build file is specified after '-b' or '--build-file', use this file.
 45-    gradle_build_file=${${(v)opt_args[(i)-b|--build-file]}:-$default_gradle_build_file}
 46+    gradle_build_file=$default_gradle_build_file
 47 }
 48 
 49 __gradle-set-cache-name() {
 50@@ -94,10 +93,11 @@ __gradle-generate-tasks-cache() {
 51     # Reuse Gradle Daemon if IDLE but don't start a new one.
 52     local gradle_tasks_output
 53     if [[ ! -z "$($gradle_cmd --status 2>/dev/null | grep IDLE)" ]]; then
 54-        gradle_tasks_output="$($gradle_cmd --daemon --no-scan --build-file $gradle_build_file --console=plain -q tasks --all 2>/dev/null)"
 55+        gradle_tasks_output="$(cd "$project_root_dir" && "$gradle_cmd" --daemon --no-scan --console=plain -q tasks --all 2>/dev/null)"
 56     else
 57-        gradle_tasks_output="$($gradle_cmd --no-daemon --no-scan --build-file $gradle_build_file --console=plain -q tasks --all 2>/dev/null)"
 58+        gradle_tasks_output="$(cd "$project_root_dir" && "$gradle_cmd" --no-daemon --no-scan --console=plain -q tasks --all 2>/dev/null)"
 59     fi
 60+
 61     local gradle_all_tasks="" root_tasks="" subproject_tasks="" output_line
 62     local -a match
 63     for output_line in ${(f)"$(printf "%s\n" "${gradle_tasks_output[@]}")"}; do
 64@@ -235,70 +235,106 @@ __gradle_subcommand() {
 65             ;;
 66         (*)
 67             _arguments -C \
 68-                {-a,--no-rebuild}'[Do not rebuild project dependencies.]' \
 69-                '(--no-build-cache)--build-cache[Enable the Gradle build cache.]' \
 70-                {-b,--build-file}'[Specifies the build file.]:build script:_files -g \*.gradle' \
 71-                {-C,--cache}'[Specifies how compiled build scripts should be cached.]:cache policy:(on rebuild)' \
 72-                {-c,--settings-file}'[Specifies the settings file.]:settings file:_files -g \*.gradle' \
 73-                '(--configuration-cache)--no-configuration-cache[Disables the configuration cache. Gradle will not reuse the build configuration from previous builds.]' \
 74-                '--configuration-cache-problems=[Configures how the configuration cache handles problems]:problem handling:(fail warn)' \
 75-                '(--no-configure-on-demand)--configure-on-demand[Only relevant projects are configured in this build run.]' \
 76-                '(--no-configuration-cache)--configuration-cache[Enables the configuration cache. Gradle will try to reuse the build configuration from previous builds.]' \
 77-                '--console=[Specifies which type of console output to generate.]:console output type:(plain auto rich verbose)' \
 78-                '--continue[Continues task execution after a task failure.]' \
 79-                '-Dorg.gradle.cache.reserved.mb=[Reserve Gradle Daemon memory for operations.]' \
 80-                '-Dorg.gradle.caching=[Set true to enable Gradle build cache.]:enable build cache:(true false)' \
 81-                '-Dorg.gradle.console=[Set type of console output to generate.]:console output type:(plain auto rich verbose)' \
 82-                '-Dorg.gradle.daemon.debug=[Set true to debug Gradle Daemon.]:enable daemon debug:(true false)' \
 83-                '-Dorg.gradle.daemon.idletimeout=[Kill Gradle Daemon after # idle millis.]' \
 84-                '-Dorg.gradle.debug=[Set true to debug Gradle Client.]' \
 85-                '-Dorg.gradle.jvmargs=[Set JVM arguments.]' \
 86-                '-Dorg.gradle.java.home=[Set JDK home dir.]' \
 87-                '-Dorg.gradle.logging.level=[Set default Gradle log level.]:log level:(quiet warn lifecycle info debug)' \
 88-                '-Dorg.gradle.parallel=[Set true to enable parallel project builds.]:enable parallel build:(true false)' \
 89-                '-Dorg.gradle.priority=[Set priority for Gradle worker processes.]:priority:(low normal)' \
 90-                '-Dorg.gradle.unsafe.watch-fs=[Set true to enable Gradle file watcher.]:enable watcher:(true false)' \
 91-                '-Dorg.gradle.warning.mode=[Set types of warnings to log.]:warning level:(all summary none)' \
 92-                '-Dorg.gradle.workers.max=[Set the number of workers Gradle is allowed to use.]' \
 93-                '(-i --info -w --warn -q --quiet)'{-d,--debug}'[Log in debug mode (includes normal stacktrace).]' \
 94-                '(--no-daemon)--daemon[Uses the Gradle daemon to run the build. Starts the daemon if not running.]' \
 95+                '-Dgradle.user.home=[Specifies the Gradle user home directory. Defaults to ~/.gradle]:gradle.user.home:_directories' \
 96+                '-Dorg.gradle.caching.debug=[]' \
 97+                '-Dorg.gradle.caching=[Enables the Gradle build cache. Gradle will try to reuse outputs from previous builds.]:org.gradle.caching:(true false)' \
 98+                '-Dorg.gradle.configuration-cache.entries-per-key=[]' \
 99+                '-Dorg.gradle.configuration-cache.fine-grained-property-tracking=[]' \
100+                '-Dorg.gradle.configuration-cache.heap-dump-dir=[]:org.gradle.configuration cache.heap dump dir:_directories' \
101+                '-Dorg.gradle.configuration-cache.inputs.unsafe.ignore.file-system-checks=[]' \
102+                '-Dorg.gradle.configuration-cache.inputs.unsafe.ignore.in-serialization=[]' \
103+                '-Dorg.gradle.configuration-cache.integrity-check=[]' \
104+                '-Dorg.gradle.configuration-cache.max-problems=[]' \
105+                '-Dorg.gradle.configuration-cache.parallel=[]' \
106+                '-Dorg.gradle.configuration-cache.problems=[Configures how the configuration cache handles problems (fail or warn). Defaults to fail.]:org.gradle.configuration cache.problems:(fail warn)' \
107+                '-Dorg.gradle.configuration-cache.read-only=[]' \
108+                '-Dorg.gradle.configuration-cache.unsafe.ignore.unsupported-build-events-listeners=[]' \
109+                '-Dorg.gradle.configuration-cache=[Enables the configuration cache. Gradle will try to reuse the build configuration from previous builds.]' \
110+                '-Dorg.gradle.configureondemand=[Configure necessary projects only. Gradle will attempt to reduce configuration time for large multi-project builds.]' \
111+                '-Dorg.gradle.console=[Specifies which type of console output to generate. Values are 'plain', 'colored', 'auto' (default), 'rich' or 'verbose'.]:org.gradle.console:(plain auto rich verbose)' \
112+                '-Dorg.gradle.continue=[Continue task execution after a task failure.]' \
113+                '-Dorg.gradle.continuous.quietperiod=[]' \
114+                '-Dorg.gradle.daemon.healthcheckinterval=[]' \
115+                '-Dorg.gradle.daemon.idletimeout=[]' \
116+                '-Dorg.gradle.daemon.registry.base=[]:org.gradle.daemon.registry.base:_directories' \
117+                '-Dorg.gradle.daemon=[Uses the Gradle daemon to run the build. Starts the daemon if not running.]' \