From ee9ed5d7b6d85cf4970e2e893c6bd9aeadb62a54 Mon Sep 17 00:00:00 2001
From: mo khan <mo.khan@gmail.com>
Date: Fri, 17 Apr 2020 16:13:46 -0600
Subject: Split java 8/11 files to separate fixture directories

---
 spec/fixtures/java/11/build.gradle   | 13 +++++++++++++
 spec/fixtures/java/8/build.gradle    |  9 +++++++++
 spec/fixtures/java/build-11.gradle   | 13 -------------
 spec/fixtures/java/build-8.gradle    |  9 ---------
 spec/integration/java/gradle_spec.rb |  6 +++---
 5 files changed, 25 insertions(+), 25 deletions(-)
 create mode 100644 spec/fixtures/java/11/build.gradle
 create mode 100644 spec/fixtures/java/8/build.gradle
 delete mode 100644 spec/fixtures/java/build-11.gradle
 delete mode 100644 spec/fixtures/java/build-8.gradle

(limited to 'spec')

diff --git a/spec/fixtures/java/11/build.gradle b/spec/fixtures/java/11/build.gradle
new file mode 100644
index 0000000..fa128ea
--- /dev/null
+++ b/spec/fixtures/java/11/build.gradle
@@ -0,0 +1,13 @@
+plugins {
+  id 'java-library'
+}
+
+repositories {
+  jcenter()
+}
+
+dependencies {
+  runtime "org.postgresql:postgresql:42.1.4"
+  implementation 'com.google.guava:guava:28.2-jre'
+  testImplementation 'junit:junit:4.12'
+}
diff --git a/spec/fixtures/java/8/build.gradle b/spec/fixtures/java/8/build.gradle
new file mode 100644
index 0000000..b7cffcd
--- /dev/null
+++ b/spec/fixtures/java/8/build.gradle
@@ -0,0 +1,9 @@
+apply plugin: 'groovy'
+
+repositories {
+  mavenCentral()
+}
+
+dependencies {
+  compile 'org.postgresql:postgresql:42.1.4'
+}
diff --git a/spec/fixtures/java/build-11.gradle b/spec/fixtures/java/build-11.gradle
deleted file mode 100644
index fa128ea..0000000
--- a/spec/fixtures/java/build-11.gradle
+++ /dev/null
@@ -1,13 +0,0 @@
-plugins {
-  id 'java-library'
-}
-
-repositories {
-  jcenter()
-}
-
-dependencies {
-  runtime "org.postgresql:postgresql:42.1.4"
-  implementation 'com.google.guava:guava:28.2-jre'
-  testImplementation 'junit:junit:4.12'
-}
diff --git a/spec/fixtures/java/build-8.gradle b/spec/fixtures/java/build-8.gradle
deleted file mode 100644
index b7cffcd..0000000
--- a/spec/fixtures/java/build-8.gradle
+++ /dev/null
@@ -1,9 +0,0 @@
-apply plugin: 'groovy'
-
-repositories {
-  mavenCentral()
-}
-
-dependencies {
-  compile 'org.postgresql:postgresql:42.1.4'
-}
diff --git a/spec/integration/java/gradle_spec.rb b/spec/integration/java/gradle_spec.rb
index deef050..9c44144 100644
--- a/spec/integration/java/gradle_spec.rb
+++ b/spec/integration/java/gradle_spec.rb
@@ -53,7 +53,7 @@ plugins {
     let(:report) { runner.scan(env: { 'GRADLE_CLI_OPTS' => '--profile' }) }
 
     before do
-      runner.add_file('build.gradle', fixture_file_content("java/build.gradle"))
+      runner.add_file('build.gradle', fixture_file_content("java/11/build.gradle"))
     end
 
     specify { expect(report).to match_schema(version: '2.0') }
@@ -65,7 +65,7 @@ plugins {
   context 'when using Java 8 with version 1.* of gradle' do
     before do
       runner.add_file('.tool-versions', "gradle 1.9")
-      runner.add_file('build.gradle', fixture_file_content("java/build-8.gradle"))
+      runner.add_file('build.gradle', fixture_file_content("java/8/build.gradle"))
     end
 
     it 'returns an empty report because the plugin we use does not work in this version of the gradle API' do
@@ -103,7 +103,7 @@ plugins {
 
         before do
           runner.add_file('.tool-versions', "gradle #{gradle_version}")
-          runner.add_file('build.gradle', fixture_file_content("java/build-#{item[:java]}.gradle"))
+          runner.add_file('build.gradle', fixture_file_content("java/#{item[:java]}/build.gradle"))
           runner.add_file('settings.gradle', 'rootProject.name = "example"')
         end
 
-- 
cgit v1.2.3