Trivial build cleanup

home-climate-control · Jan 24, 2024 · d642239 · d642239
1 parent 32a068f
commit d642239
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 22 deletions.
diff --git a/app/hcc-quarkus/build.gradle.kts b/app/hcc-quarkus/build.gradle.kts
@@ -7,15 +7,15 @@ plugins {
     alias(libs.plugins.quarkus.plugin)
 }
 
-val quarkusPlatformGroupId = "io.quarkus.platform"
-val quarkusPlatformArtifactId = "quarkus-bom"
-
 dependencies {
 
     implementation(project(":modules:hcc-bootstrap"))
     implementation(project(":modules:hcc-director"))
     implementation(libs.jackson.databind)
 
+    // Enable MQTT
+    implementation(project(":modules:hcc-mqtt"))
+
     // Enable the Swing console
     runtimeOnly(project(":modules:hcc-swing"))
 
@@ -28,9 +28,6 @@ dependencies {
     // Enable XBee
     runtimeOnly(project(":modules:hcc-xbee"))
 
-    // Enable MQTT
-    implementation(project(":modules:hcc-mqtt"))
-
     // Enable remote control over HTTP
     runtimeOnly(project(":modules:hcc-http"))
     runtimeOnly(project(":modules:hcc-http-gae"))
@@ -44,17 +41,23 @@ dependencies {
     // Enable Raspberry Pi specific hardware integration
     runtimeOnly(project(":modules:hcc-raspberry-pi"))
 
-    // Quarkus additions
+    testImplementation(libs.rest.assured)
+    testImplementation(libs.assertj.core)
+}
+
+// Quarkus additions
+dependencies {
+
     implementation(enforcedPlatform(libs.quarkus.bom))
     implementation(libs.quarkus.arc)
     implementation(libs.quarkus.config.yaml)
     implementation(libs.quarkus.resteasy.reactive)
     testImplementation(libs.quarkus.junit5)
-    testImplementation(libs.rest.assured)
+}
+
+// Mapstruct
+dependencies {
 
-    // Mapstruct
     implementation(libs.mapstruct)
     annotationProcessor(libs.mapstruct.processor)
-
-    testImplementation(libs.assertj.core)
 }
diff --git a/app/hcc-springboot/build.gradle.kts b/app/hcc-springboot/build.gradle.kts
@@ -1,3 +1,5 @@
+import com.google.cloud.tools.jib.gradle.extension.layerfilter.Configuration
+
 buildscript {
     dependencies {
         classpath(libs.jib.layer.filter)
@@ -19,17 +21,22 @@ plugins {
 dependencies {
 
     implementation(project(":modules:hcc-bootstrap"))
+    testImplementation(libs.reactor.test)
+}
 
-    // SpringBoot additions
-    annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
-    implementation("org.springframework.boot:spring-boot-starter-actuator")
-    implementation("org.springframework.boot:spring-boot-starter-webflux")
-    implementation("org.springframework.boot:spring-boot-starter-log4j2")
-    runtimeOnly("io.micrometer:micrometer-registry-influx")
-    runtimeOnly("io.micrometer:micrometer-registry-jmx")
+// SpringBoot additions
+dependencies {
 
-    testImplementation("org.springframework.boot:spring-boot-starter-test")
-    testImplementation(libs.reactor.test)
+    annotationProcessor(libs.springboot.configuration.processor)
+
+    implementation(libs.springboot.starter.actuator)
+    implementation(libs.springboot.starter.log4j2)
+    implementation(libs.springboot.starter.webflux)
+
+    testImplementation(libs.springboot.starter.test)
+
+    runtimeOnly(libs.micrometer.registry.influx)
+    runtimeOnly(libs.micrometer.registry.jmx)
 }
 
 configurations {
@@ -53,7 +60,8 @@ jib {
     pluginExtensions {
         pluginExtension {
             implementation = "com.google.cloud.tools.jib.gradle.extension.layerfilter.JibLayerFilterExtension"
-            configuration(Action<com.google.cloud.tools.jib.gradle.extension.layerfilter.Configuration> {
+
+            configuration(Action<Configuration> {
                 filters {
                     filter {
                         // Filter out all custom configurations that may be present in the source tree protected by .gitignore

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -28,7 +28,7 @@ subprojects {
     apply(plugin = "java-library")
     apply(plugin = "maven-publish")
     apply(plugin = "jacoco")
-    apply(plugin = "net.ltgt.errorprone")
+    apply(plugin = rootProject.libs.plugins.errorprone.get().pluginId)
 
     group = "net.sf.dz3"
     version = "4.3.0-SNAPSHOT"

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -78,6 +78,18 @@ rest-assured = { module = "io.rest-assured:rest-assured" }
 spring-standalone-context = { module = "org.springframework:spring-context", version.ref = "spring-standalone" }
 spring-standalone-webflux = { module = "org.springframework:spring-webflux", version.ref = "spring-standalone" }
 
+# SpringBoot
+# Versions are missing here because they are implied by spring-dependency-management plugin
+
+springboot-configuration-processor = { module = "org.springframework.boot:spring-boot-configuration-processor" }
+springboot-starter-actuator = { module = "org.springframework.boot:spring-boot-starter-actuator" }
+springboot-starter-log4j2 = { module = "org.springframework.boot:spring-boot-starter-log4j2" }
+springboot-starter-webflux = { module = "org.springframework.boot:spring-boot-starter-webflux" }
+springboot-starter-test = { module = "org.springframework.boot:spring-boot-starter-test" }
+
+micrometer-registry-influx = { module = "io.micrometer:micrometer-registry-influx" }
+micrometer-registry-jmx = { module = "io.micrometer:micrometer-registry-jmx" }
+
 [plugins]
 
 errorprone = { id = "net.ltgt.errorprone", version = "3.1.0" }