Test out gradle groovy builds

2 files changed, 18 insertions, 10 deletions

diff --git a/spec/fixtures/java/build.gradle.kts b/spec/fixtures/java/build.gradle.kts
index 7680609..c842888 100644
--- a/spec/fixtures/java/build.gradle.kts
+++ b/spec/fixtures/java/build.gradle.kts
@@ -1,11 +1,10 @@
 plugins {
-    `java-library`
+  `java-library`
 }
 repositories {
-    jcenter()
+  jcenter()
 }
 dependencies {
-    runtime("org.postgresql:postgresql:42.1.4")
     api("org.apache.commons:commons-math3:3.6.1")
     implementation("com.google.guava:guava:28.1-jre")
     testImplementation("junit:junit:4.12")
diff --git a/spec/integration/java/gradle_spec.rb b/spec/integration/java/gradle_spec.rb
index a70dc38..842bdf7 100644
--- a/spec/integration/java/gradle_spec.rb
+++ b/spec/integration/java/gradle_spec.rb
@@ -63,7 +63,7 @@ plugins {
   end
 
   [
-    '6.2',
+    '6.3',
     '5.6',
     '4.9',
     '3.5',
@@ -71,15 +71,24 @@ plugins {
     '1.9'
   ].each do |gradle_version|
     %w[8 11].each do |java_version|
-      context "when scanning a gradle (v#{gradle_version}) project that uses a kotlin build script" do
-        let(:build_file_content) { fixture_file_content("java/build.gradle.kts") }
+      context "when scanning a gradle (v#{gradle_version}) project" do
+        before do
+          runner.add_file('.tool-versions', "gradle #{gradle_version}")
+        end
 
-        it 'scans a gradle project' do
-          runner.add_file('build.gradle.kts', build_file_content)
+        it 'scans a kotlin gradle project' do
+          runner.add_file('build.gradle.kts', fixture_file_content("java/build.gradle.kts"))
           runner.add_file('settings.gradle.kts', 'rootProject.name = "example"')
-          runner.add_file('.tool-versions', "gradle #{gradle_version}")
 
-          report = runner.scan(env: { 'LM_JAVA_VERSION' => java_version, 'LOG_LEVEL' => 'debug' })
+          report = runner.scan(env: { 'LM_JAVA_VERSION' => java_version })
+          expect(report).to match_schema(version: '2.0')
+        end
+
+        it 'scans a groovy gradle project' do
+          runner.add_file('build.gradle', fixture_file_content("java/build.gradle"))
+          runner.add_file('settings.gradle', 'rootProject.name = "example"')
+
+          report = runner.scan(env: { 'LM_JAVA_VERSION' => java_version })
           expect(report).to match_schema(version: '2.0')
           expect(report.dependency_names).to match_array(['postgresql'])
           expect(report.licenses_for('postgresql')).to match_array(['BSD-2-Clause'])