From 7819840d5e0d17a195db2b709a360dc01c965a0c Mon Sep 17 00:00:00 2001
From: Gerd Aschemann <gerd@aschemann.net>
Date: Mon, 15 Jan 2024 18:35:41 +0100
Subject: [PATCH] WIP Move test libraries for CLI to libs

---
 htmlSanityCheck-cli/build.gradle           | 10 +++++-----
 htmlSanityCheck-core/build.gradle          |  4 +++-
 htmlSanityCheck-gradle-plugin/build.gradle |  7 +++----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/htmlSanityCheck-cli/build.gradle b/htmlSanityCheck-cli/build.gradle
index 5d16e1f3..5ee0437a 100644
--- a/htmlSanityCheck-cli/build.gradle
+++ b/htmlSanityCheck-cli/build.gradle
@@ -16,11 +16,11 @@ dependencies {
 
     implementation project(":htmlSanityCheck-core")
 
-    testImplementation 'org.spockframework:spock-core:2.3-groovy-3.0'
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.1'
-    testImplementation 'org.mockito:mockito-junit-jupiter:3.11.2'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.1'
-    testImplementation( "com.athaydes:spock-reports:2.5.0-groovy-3.0" )
+    testImplementation libs.spock.core
+    testImplementation libs.jupiter.api
+    testImplementation libs.mockito
+    testRuntimeOnly libs.jupiter.engine
+    testImplementation libs.spock.reports
 }
 
 compileGroovy {
diff --git a/htmlSanityCheck-core/build.gradle b/htmlSanityCheck-core/build.gradle
index 453a3b63..befea2cc 100644
--- a/htmlSanityCheck-core/build.gradle
+++ b/htmlSanityCheck-core/build.gradle
@@ -1,3 +1,5 @@
+import org.apache.tools.ant.filters.ReplaceTokens
+
 plugins {
     id 'java-library'
 }
@@ -24,7 +26,7 @@ processResources {
 
     exclude '**/*.png'
     inputs.property "version", project.version
-    filter(org.apache.tools.ant.filters.ReplaceTokens, tokens: [version: project.version])
+    filter(ReplaceTokens, tokens: [version: project.version])
     println "after processResources config, version= ${project.version}"
 }
 
diff --git a/htmlSanityCheck-gradle-plugin/build.gradle b/htmlSanityCheck-gradle-plugin/build.gradle
index cf0323b9..67c3f547 100755
--- a/htmlSanityCheck-gradle-plugin/build.gradle
+++ b/htmlSanityCheck-gradle-plugin/build.gradle
@@ -12,13 +12,12 @@ gradlePlugin {
 }
 
 dependencies {
+    implementation gradleApi()
+    implementation project(":htmlSanityCheck-core")
+
     testImplementation(
             gradleTestKit()
     )
-
-    implementation libs.jsoup
-    implementation gradleApi()
-    implementation project(":htmlSanityCheck-core")
 }
 
 /*