From 34ec8e86c6414a6b071ccd65fc0dad0d56d0f368 Mon Sep 17 00:00:00 2001
From: Kristóf Marussy <kristof@marussy.com>
Date: Wed, 17 Nov 2021 03:09:48 +0100
Subject: build: merge java and junit conventions

All Java code should have tests, anyways.
---
 .../groovy/tools.refinery.java-conventions.gradle  | 30 ++++++++++++++++++++
 .../groovy/tools.refinery.junit-conventions.gradle | 33 ----------------------
 language-to-store/build.gradle                     |  1 -
 language-web/build.gradle                          |  1 -
 language/build.gradle                              |  1 -
 store/build.gradle                                 |  1 -
 6 files changed, 30 insertions(+), 37 deletions(-)
 delete mode 100644 buildSrc/src/main/groovy/tools.refinery.junit-conventions.gradle

diff --git a/buildSrc/src/main/groovy/tools.refinery.java-conventions.gradle b/buildSrc/src/main/groovy/tools.refinery.java-conventions.gradle
index 6bea6e46..2712d391 100644
--- a/buildSrc/src/main/groovy/tools.refinery.java-conventions.gradle
+++ b/buildSrc/src/main/groovy/tools.refinery.java-conventions.gradle
@@ -1,5 +1,6 @@
 plugins {
 	id 'eclipse'
+	id 'jacoco'
 }
 
 repositories {
@@ -9,9 +10,38 @@ repositories {
 	}
 }
 
+dependencies {
+	testImplementation libs.hamcrest
+	testImplementation libs.junit.api
+	testRuntimeOnly libs.junit.engine
+	testImplementation libs.junit.params
+	testImplementation libs.mockito.core
+	testImplementation libs.mockito.junit
+}
+
 sourceCompatibility = '17'
 targetCompatibility = '17'
 
+def jacocoTestReport = tasks.named('jacocoTestReport')
+jacocoTestReport.configure {
+	dependsOn test
+	reports {
+		xml.required = true
+	}
+}
+
+tasks.named('test') {
+	useJUnitPlatform {
+		excludeTags 'slow'
+	}
+	finalizedBy jacocoTestReport
+}
+
+tasks.register('slowTest', Test) {
+	useJUnitPlatform()
+	finalizedBy jacocoTestReport
+}
+
 tasks.named('jar') {
 	manifest {
 		attributes 'Bundle-SymbolicName': project.name
diff --git a/buildSrc/src/main/groovy/tools.refinery.junit-conventions.gradle b/buildSrc/src/main/groovy/tools.refinery.junit-conventions.gradle
deleted file mode 100644
index d62207b7..00000000
--- a/buildSrc/src/main/groovy/tools.refinery.junit-conventions.gradle
+++ /dev/null
@@ -1,33 +0,0 @@
-plugins {
-	id 'jacoco'
-	id 'tools.refinery.java-conventions'
-}
-
-dependencies {
-	testImplementation libs.hamcrest
-	testImplementation libs.junit.api
-	testRuntimeOnly libs.junit.engine
-	testImplementation libs.junit.params
-	testImplementation libs.mockito.core
-	testImplementation libs.mockito.junit
-}
-
-def jacocoTestReport = tasks.named('jacocoTestReport')
-jacocoTestReport.configure {
-	dependsOn test
-	reports {
-		xml.required = true
-	}
-}
-
-tasks.named('test') {
-	useJUnitPlatform {
-		excludeTags 'slow'
-	}
-	finalizedBy jacocoTestReport
-}
-
-tasks.register('slowTest', Test) {
-	useJUnitPlatform()
-	finalizedBy jacocoTestReport
-}
diff --git a/language-to-store/build.gradle b/language-to-store/build.gradle
index ea7969b1..92de9458 100644
--- a/language-to-store/build.gradle
+++ b/language-to-store/build.gradle
@@ -1,7 +1,6 @@
 plugins {
 	id 'java-library'
 	id 'tools.refinery.java-conventions'
-	id 'tools.refinery.junit-conventions'
 	id 'tools.refinery.xtend-conventions'
 }
 
diff --git a/language-web/build.gradle b/language-web/build.gradle
index 1bacd35c..9f092e5e 100644
--- a/language-web/build.gradle
+++ b/language-web/build.gradle
@@ -4,7 +4,6 @@ plugins {
 	alias libs.plugins.frontend
 	alias libs.plugins.shadow
 	id 'tools.refinery.xtext-conventions'
-	id 'tools.refinery.junit-conventions'
 }
 
 import org.siouan.frontendgradleplugin.infrastructure.gradle.RunNpmYarn
diff --git a/language/build.gradle b/language/build.gradle
index 5eb5484d..4208979f 100644
--- a/language/build.gradle
+++ b/language/build.gradle
@@ -2,7 +2,6 @@ plugins {
 	id 'java-library'
 	id 'java-test-fixtures'
 	id 'tools.refinery.xtext-conventions'
-	id 'tools.refinery.junit-conventions'
 	id 'tools.refinery.mwe2-conventions'
 	id 'tools.refinery.xtend-conventions'
 }
diff --git a/store/build.gradle b/store/build.gradle
index 555c57be..43a496ba 100644
--- a/store/build.gradle
+++ b/store/build.gradle
@@ -1,7 +1,6 @@
 plugins {
 	id 'java-library'
 	id 'tools.refinery.java-conventions'
-	id 'tools.refinery.junit-conventions'
 	id 'tools.refinery.jmh-conventions'
 }
 
-- 
cgit v1.2.3-54-g00ecf