From 1f9991130595099a86be840e6d091b8402803145 Mon Sep 17 00:00:00 2001
From: KingRainbow44 <kobedo11@gmail.com>
Date: Sun, 15 Jan 2023 03:13:39 -0500
Subject: [PATCH] Add the `lombok` Gradle plugin & run `delombok`
`delombok` is ran only when generating JavaDocs due to how `@__` was introduced into the project
---
build.gradle | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/build.gradle b/build.gradle
index 842a0ba7..60003ec1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -34,6 +34,9 @@ plugins {
// Maven
id 'maven-publish'
id 'signing'
+
+ // Lombok for delombok'ification
+ id "io.freefair.lombok" version "6.6.1"
}
compileJava.options.encoding = "UTF-8"
@@ -43,7 +46,7 @@ sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
group = 'xyz.grasscutters'
-version = '1.4.5-dev'
+version = '1.4.5'
sourceCompatibility = 17
targetCompatibility = 17
@@ -96,7 +99,7 @@ dependencies {
implementation group: 'io.javalin', name: 'javalin', version: '4.6.4'
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'
annotationProcessor 'org.projectlombok:lombok:1.18.24'
@@ -113,7 +116,6 @@ application {
getMainClass().set('emu.grasscutter.Grasscutter')
}
-
jar {
exclude '*.proto'
@@ -205,11 +207,17 @@ clean {
}
protobuf {
+ generateProtoTasks {
+ all().each { task ->
+ task.enabled = false
+ }
+ }
+
protoc {
// The artifact spec for the Protobuf Compiler
artifact = 'com.google.protobuf:protoc:3.18.1'
}
-// generatedFilesBaseDir = "$projectDir/src/main/java/emu/grasscutter/net/proto/"
+
generatedFilesBaseDir = "$projectDir/src/generated/"
}
@@ -253,6 +261,8 @@ javadoc {
if(JavaVersion.current().isJava9Compatible()) {
options.addBooleanOption('html5', true)
}
+
+ source = delombok
}
task injectGitHash {
--
GitLab