0

Merge branch 'dev/logger' into rc/1.13

# Conflicts:
#	build.gradle
This commit is contained in:
2021-10-08 14:44:27 +03:00
11 changed files with 690 additions and 2 deletions

View File

@@ -1,5 +1,6 @@
plugins {
id 'java'
id 'jacoco'
}
project.group = 'ghast'
@@ -20,12 +21,13 @@ repositories {
def lombokVersion = '1.18.20'
def junitVersion = '5.8.1'
def bukkitVersion = '1.12.2-R0.1-SNAPSHOT'
dependencies {
annotationProcessor("org.projectlombok:lombok:$lombokVersion")
compileOnly("org.projectlombok:lombok:$lombokVersion")
compileOnly('org.bukkit:bukkit:1.12.2-R0.1-SNAPSHOT') {
compileOnly("org.bukkit:bukkit:$bukkitVersion") {
exclude(module: 'gson')
exclude(module: 'json-simple')
exclude(module: 'commons-lang')
@@ -37,7 +39,7 @@ dependencies {
testImplementation("org.junit.jupiter:junit-jupiter-api:$junitVersion")
testImplementation("org.junit.jupiter:junit-jupiter-engine:$junitVersion")
testImplementation('org.mockito:mockito-core:3.12.4')
testImplementation('org.bukkit:bukkit:1.12.2-R0.1-SNAPSHOT') {
testImplementation("org.bukkit:bukkit:$bukkitVersion") {
exclude(module: 'gson')
exclude(module: 'json-simple')
exclude(module: 'commons-lang')
@@ -49,3 +51,11 @@ dependencies {
test {
useJUnitPlatform()
}
jacoco {
toolVersion = '0.8.5'
}
jacocoTestReport {
dependsOn test
}