From 53a2d0d19662f664731be4e72abe633ab54c9a78 Mon Sep 17 00:00:00 2001
From: Eyal Roth <eyalroth1@gmail.com>
Date: Sun, 1 Dec 2019 14:58:56 +0200
Subject: [PATCH] Fix the cross (scala) version test by making sure to run the
 test before all other functional tests

---
 build.gradle | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 5502a69..bafe5e9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -64,17 +64,29 @@ sourceSets {
     }
 }
 
-task functionalTest(type: Test) {
-    description = 'Runs the functional tests.'
+task crossScalaVersionFunctionalTest(type: Test) {
+    description = 'Runs the cross scala version functional test.'
     group = 'verification'
     testClassesDirs = sourceSets.functionalTest.output.classesDirs
     classpath = sourceSets.functionalTest.runtimeClasspath
+    include "**/ScalaMultiModuleCrossVersionTest.*"
 
     testLogging.showStandardStreams = true
 
     mustRunAfter test
 }
 
+task functionalTest(type: Test) {
+    description = 'Runs the functional tests.'
+    group = 'verification'
+    testClassesDirs = sourceSets.functionalTest.output.classesDirs
+    classpath = sourceSets.functionalTest.runtimeClasspath
+    exclude "**/ScalaMultiModuleCrossVersionTest.*"
+
+    testLogging.showStandardStreams = true
+
+    dependsOn crossScalaVersionFunctionalTest
+}
 check.dependsOn functionalTest
 
 gradlePlugin {