From 05f08a9d2ff612a99094a957892af9227de57e6e Mon Sep 17 00:00:00 2001
From: mo khan <mo.khan@gmail.com>
Date: Thu, 10 Sep 2020 11:06:02 -0600
Subject: fix: export ASDF_JAVA_VERSION when invoking gradle

---
 lib/license/finder/ext/gradle.rb | 14 ++++++--------
 lib/license/management/shell.rb  |  1 +
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/lib/license/finder/ext/gradle.rb b/lib/license/finder/ext/gradle.rb
index 4d6b000..a683207 100644
--- a/lib/license/finder/ext/gradle.rb
+++ b/lib/license/finder/ext/gradle.rb
@@ -18,7 +18,7 @@ module LicenseFinder
     end
 
     def package_management_command
-      wrapper? ? './gradlew' : 'gradle'
+      wrapper? ? './gradlew' : :gradle
     end
 
     private
@@ -29,22 +29,18 @@ module LicenseFinder
 
     def download_licenses
       _stdout, _stderr, status = within_project_path do
-        env = {
-          'JAVA_HOME' => ENV.fetch("JAVA_HOME", "/opt/asdf/installs/java/#{java_version}"),
-          'TERM' => 'noop'
-        }
         shell.execute([
           @command,
           ENV.fetch('GRADLE_CLI_OPTS', '--exclude-task=test --no-daemon --debug'),
           'downloadLicenses'
-        ], env: env)
+        ], env: default_env)
       end
 
       status.success?
     end
 
     def wrapper?
-      File.exist?(File.join(project_path, 'gradlew'))
+      project_path.join('gradlew').exist?
     end
 
     def xml_parsing_options
@@ -63,8 +59,10 @@ module LicenseFinder
 
     def default_env
       @default_env = {
+        'ASDF_JAVA_VERSION' => ENV.fetch('ASDF_JAVA_VERSION', java_version),
         'CACHE_DIR' => '/opt/gitlab',
-        'JAVA_HOME' => ENV.fetch("JAVA_HOME", "/opt/asdf/installs/java/#{java_version}")
+        'JAVA_HOME' => ENV.fetch("JAVA_HOME", "/opt/asdf/installs/java/#{java_version}"),
+        'TERM' => 'noop'
       }
     end
   end
diff --git a/lib/license/management/shell.rb b/lib/license/management/shell.rb
index b066bc1..e4fd35a 100644
--- a/lib/license/management/shell.rb
+++ b/lib/license/management/shell.rb
@@ -10,6 +10,7 @@ module License
         cargo: '/opt/asdf/bin/asdf exec cargo',
         cert_sync: '/opt/asdf/installs/mono/6.8.0.123/bin/cert-sync',
         embedded_bundle: '/opt/gitlab/embedded/bin/bundle',
+        gradle: '/opt/asdf/bin/asdf exec gradle',
         gem: '/opt/asdf/bin/asdf exec gem',
         go: '/opt/asdf/bin/asdf exec go',
         keytool: '/opt/asdf/bin/asdf exec keytool',
-- 
cgit v1.2.3