From d69eb85d811e02d3a1d0b8ab71272d1ac21cf0e2 Mon Sep 17 00:00:00 2001 From: Siphalor Date: Mon, 16 Mar 2026 12:32:00 +0100 Subject: [PATCH] build: Improve development in subprojects --- .gitignore | 5 +++++ .../kotlin/de.siphalor.tweed5.root-properties.gradle.kts | 9 ++++++--- tweed5-minecraft/gradle.properties | 1 + tweed5-minecraft/lombok.config | 2 ++ tweed5/gradle.properties | 2 ++ tweed5/lombok.config | 2 ++ 6 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 tweed5-minecraft/lombok.config create mode 100644 tweed5/gradle.properties create mode 100644 tweed5/lombok.config diff --git a/.gitignore b/.gitignore index 58d8ad9..d8dce8f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,11 @@ build/ !**/src/test/**/build/ .kotlin/ +### Gradle in Subprojects ### +*/gradlew +*/gradlew.bat +*/gradle/wrapper + ### IntelliJ IDEA ### .idea/ *.iws diff --git a/conventions/src/main/kotlin/de.siphalor.tweed5.root-properties.gradle.kts b/conventions/src/main/kotlin/de.siphalor.tweed5.root-properties.gradle.kts index 2db549d..1d3714d 100644 --- a/conventions/src/main/kotlin/de.siphalor.tweed5.root-properties.gradle.kts +++ b/conventions/src/main/kotlin/de.siphalor.tweed5.root-properties.gradle.kts @@ -1,5 +1,8 @@ import java.util.Properties -val rootProperties = Properties() -project.layout.settingsDirectory.file("../gradle.properties").asFile.inputStream().use { rootProperties.load(it) } -rootProperties.forEach { (key, value) -> project.ext.set(key.toString(), value.toString()) } +val rootPropertiesFile = project.layout.settingsDirectory.file("../gradle.properties").asFile +if (rootPropertiesFile.exists()) { + Properties() + .apply { rootPropertiesFile.inputStream().use { load(it) } } + .forEach { (key, value) -> project.ext.set(key.toString(), value.toString()) } +} diff --git a/tweed5-minecraft/gradle.properties b/tweed5-minecraft/gradle.properties index a23331e..5a0f3ab 100644 --- a/tweed5-minecraft/gradle.properties +++ b/tweed5-minecraft/gradle.properties @@ -1,3 +1,4 @@ org.gradle.jvmargs = -Xmx2G +org.gradle.configuration-cache = true minecraft.version.descriptor = 1.21.10 diff --git a/tweed5-minecraft/lombok.config b/tweed5-minecraft/lombok.config new file mode 100644 index 0000000..f778720 --- /dev/null +++ b/tweed5-minecraft/lombok.config @@ -0,0 +1,2 @@ +lombok.accessors.fluent = true +lombok.addLombokGeneratedAnnotation = true \ No newline at end of file diff --git a/tweed5/gradle.properties b/tweed5/gradle.properties new file mode 100644 index 0000000..5cf5c3d --- /dev/null +++ b/tweed5/gradle.properties @@ -0,0 +1,2 @@ +org.gradle.jvmargs = -Xmx2G +org.gradle.configuration-cache = true diff --git a/tweed5/lombok.config b/tweed5/lombok.config new file mode 100644 index 0000000..f778720 --- /dev/null +++ b/tweed5/lombok.config @@ -0,0 +1,2 @@ +lombok.accessors.fluent = true +lombok.addLombokGeneratedAnnotation = true \ No newline at end of file