Unverified Commit 1f999113 authored by KingRainbow44's avatar KingRainbow44
Browse files

Add the `lombok` Gradle plugin & run `delombok`

`delombok` is ran only when generating JavaDocs due to how `@__` was introduced into the project
parent 8a5a6ab8
...@@ -34,6 +34,9 @@ plugins { ...@@ -34,6 +34,9 @@ plugins {
// Maven // Maven
id 'maven-publish' id 'maven-publish'
id 'signing' id 'signing'
// Lombok for delombok'ification
id "io.freefair.lombok" version "6.6.1"
} }
compileJava.options.encoding = "UTF-8" compileJava.options.encoding = "UTF-8"
...@@ -43,7 +46,7 @@ sourceCompatibility = JavaVersion.VERSION_17 ...@@ -43,7 +46,7 @@ sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17
group = 'xyz.grasscutters' group = 'xyz.grasscutters'
version = '1.4.5-dev' version = '1.4.5'
sourceCompatibility = 17 sourceCompatibility = 17
targetCompatibility = 17 targetCompatibility = 17
...@@ -96,7 +99,7 @@ dependencies { ...@@ -96,7 +99,7 @@ dependencies {
implementation group: 'io.javalin', name: 'javalin', version: '4.6.4' implementation group: 'io.javalin', name: 'javalin', version: '4.6.4'
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.13.3' implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.13.3'
protobuf files('proto/') protobuf files('proto/')
compileOnly 'org.projectlombok:lombok:1.18.24' compileOnly 'org.projectlombok:lombok:1.18.24'
annotationProcessor 'org.projectlombok:lombok:1.18.24' annotationProcessor 'org.projectlombok:lombok:1.18.24'
...@@ -113,7 +116,6 @@ application { ...@@ -113,7 +116,6 @@ application {
getMainClass().set('emu.grasscutter.Grasscutter') getMainClass().set('emu.grasscutter.Grasscutter')
} }
jar { jar {
exclude '*.proto' exclude '*.proto'
...@@ -205,11 +207,17 @@ clean { ...@@ -205,11 +207,17 @@ clean {
} }
protobuf { protobuf {
generateProtoTasks {
all().each { task ->
task.enabled = false
}
}
protoc { protoc {
// The artifact spec for the Protobuf Compiler // The artifact spec for the Protobuf Compiler
artifact = 'com.google.protobuf:protoc:3.18.1' artifact = 'com.google.protobuf:protoc:3.18.1'
} }
// generatedFilesBaseDir = "$projectDir/src/main/java/emu/grasscutter/net/proto/"
generatedFilesBaseDir = "$projectDir/src/generated/" generatedFilesBaseDir = "$projectDir/src/generated/"
} }
...@@ -253,6 +261,8 @@ javadoc { ...@@ -253,6 +261,8 @@ javadoc {
if(JavaVersion.current().isJava9Compatible()) { if(JavaVersion.current().isJava9Compatible()) {
options.addBooleanOption('html5', true) options.addBooleanOption('html5', true)
} }
source = delombok
} }
task injectGitHash { task injectGitHash {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment