From e536dff1a88fd3fe98e6bf13965e1818d9f3353a Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Thu, 2 Mar 2023 00:37:30 -0500 Subject: [PATCH 1/3] Use a separate bukkit dependency for tests. --- build.gradle | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 5328d394..790907de 100644 --- a/build.gradle +++ b/build.gradle @@ -43,7 +43,7 @@ repositories { } dependencies { - implementation('org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT') { + compileOnly('org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT') { exclude group: 'junit', module: 'junit' } @@ -66,6 +66,9 @@ dependencies { api 'de.themoep.idconverter:mappings:1.2-SNAPSHOT' api 'org.jetbrains:annotations:16.0.2' + testImplementation('org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT') { + exclude group: 'junit', module: 'junit' + } testImplementation 'junit:junit:4.12' testImplementation 'org.mockito:mockito-core:3.11.2' testImplementation 'commons-io:commons-io:2.4' From 85d744d79f672731247903b382dfea376081417a Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Thu, 2 Mar 2023 00:44:32 -0500 Subject: [PATCH 2/3] Run tests against spigot-api 1.19.3. --- build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 790907de..60ebea60 100644 --- a/build.gradle +++ b/build.gradle @@ -66,7 +66,8 @@ dependencies { api 'de.themoep.idconverter:mappings:1.2-SNAPSHOT' api 'org.jetbrains:annotations:16.0.2' - testImplementation('org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT') { + testImplementation 'org.spigotmc:spigot-api:1.19.3-R0.1-SNAPSHOT' + testImplementation('com.googlecode.json-simple:json-simple:1.1.1') { exclude group: 'junit', module: 'junit' } testImplementation 'junit:junit:4.12' From b6574245b8254468488765a105c6c5858fe6ae4e Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Thu, 2 Mar 2023 00:48:54 -0500 Subject: [PATCH 3/3] Remove junit exclusion from compileOnly bukkit. --- build.gradle | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 60ebea60..9e0beda1 100644 --- a/build.gradle +++ b/build.gradle @@ -43,9 +43,7 @@ repositories { } dependencies { - compileOnly('org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT') { - exclude group: 'junit', module: 'junit' - } + compileOnly 'org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT' implementation('com.github.MilkBowl:VaultAPI:1.7') { exclude group: 'org.bukkit', module: 'bukkit'