diff --git a/buildSrc/src/main/groovy/ssg.common.gradle b/buildSrc/src/main/groovy/ssg.common.gradle index 901fd91..ce03827 100644 --- a/buildSrc/src/main/groovy/ssg.common.gradle +++ b/buildSrc/src/main/groovy/ssg.common.gradle @@ -1,6 +1,8 @@ plugins { id 'com.jessebrault.jbarchiva' id 'groovy' + id 'java-library' + id 'java-test-fixtures' } group 'com.jessebrault.ssg' @@ -12,16 +14,43 @@ repositories { dependencies { // https://mvnrepository.com/artifact/org.apache.groovy/groovy - implementation 'org.apache.groovy:groovy:4.0.9' + api 'org.apache.groovy:groovy:4.0.9' + + // https://mvnrepository.com/artifact/org.jetbrains/annotations + api 'org.jetbrains:annotations:24.0.0' + + /** + * Logging + */ + // https://mvnrepository.com/artifact/org.slf4j/slf4j-api + implementation 'org.slf4j:slf4j-api:1.7.36' /** * TESTING */ // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2' + testFixturesApi 'org.junit.jupiter:junit-jupiter-api:5.9.2' // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.2' + + /** + * Mockito + */ + // https://mvnrepository.com/artifact/org.mockito/mockito-core + testFixturesApi 'org.mockito:mockito-core:4.11.0' + + // https://mvnrepository.com/artifact/org.mockito/mockito-junit-jupiter + testFixturesApi 'org.mockito:mockito-junit-jupiter:4.11.0' + + /** + * Test Logging + */ + // https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-slf4j-impl + testRuntimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl:2.19.0' + + // https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core + testRuntimeOnly 'org.apache.logging.log4j:log4j-core:2.19.0' } test { diff --git a/buildSrc/src/main/groovy/ssg.lib.gradle b/buildSrc/src/main/groovy/ssg.lib.gradle deleted file mode 100644 index 78f61fa..0000000 --- a/buildSrc/src/main/groovy/ssg.lib.gradle +++ /dev/null @@ -1,36 +0,0 @@ -plugins { - id 'java-library' -} - -repositories { - mavenCentral() -} - -dependencies { - // https://mvnrepository.com/artifact/org.jetbrains/annotations - api 'org.jetbrains:annotations:24.0.0' - - /** - * Logging - */ - // https://mvnrepository.com/artifact/org.slf4j/slf4j-api - implementation 'org.slf4j:slf4j-api:1.7.36' - - /** - * Test Logging - */ - // https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-slf4j-impl - testRuntimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl:2.19.0' - - // https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core - testRuntimeOnly 'org.apache.logging.log4j:log4j-core:2.19.0' - - /** - * Mockito - */ - // https://mvnrepository.com/artifact/org.mockito/mockito-core - testImplementation 'org.mockito:mockito-core:4.11.0' - - // https://mvnrepository.com/artifact/org.mockito/mockito-junit-jupiter - testImplementation 'org.mockito:mockito-junit-jupiter:4.11.0' -} \ No newline at end of file diff --git a/lib/build.gradle b/lib/build.gradle index 21b511d..53cb59f 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -1,6 +1,5 @@ plugins { id 'ssg.common' - id 'ssg.lib' } repositories {