From 81ac43fb40e360e405c9e29ef578f1712fc45230 Mon Sep 17 00:00:00 2001 From: ExE Boss Date: Sat, 17 Mar 2018 15:39:36 +0100 Subject: [PATCH] Migrate dependencies to the Java Library Gradle plugin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This migrates the NOVA shared Gradle scripts to use the Java Library Plugin⁽¹⁾, which allows for easier declarations of non-transitive dependencies (see NOVA-Team/NOVA-Core#313). # External links: ¹ https://docs.gradle.org/current/userguide/java_library_plugin.html --- shared-scripts/java.gradle | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/shared-scripts/java.gradle b/shared-scripts/java.gradle index cd88729..bc97fa7 100644 --- a/shared-scripts/java.gradle +++ b/shared-scripts/java.gradle @@ -1,6 +1,7 @@ apply from: "https://raw.githubusercontent.com/NOVA-Team/NOVA-Gradle/master/shared-scripts/common.gradle" apply plugin: 'java' +apply plugin: 'java-library' apply plugin: 'jacoco' tasks.withType(JavaCompile) { @@ -12,9 +13,9 @@ tasks.withType(JavaCompile) { } dependencies { - testCompile "junit:junit:4.12" - testCompile "org.assertj:assertj-core:3.0.0" - testCompile "org.mockito:mockito-core:1.+" + testImplementation "junit:junit:4.+" + testImplementation "org.assertj:assertj-core:3.+" + testImplementation "org.mockito:mockito-core:1.+" } task sourcesJar(type: Jar, dependsOn: classes) {