diff --git a/build.gradle.kts b/build.gradle.kts index d8f3e8722..1b04cddb3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,17 +1,17 @@ plugins { java - id("maven-publish") + `maven-publish` jacoco - id("net.ltgt.errorprone") - id("org.sonarqube") - id("com.gorylenko.gradle-git-properties") apply false + alias(libs.plugins.errorprone) + alias(libs.plugins.sonarqube) + alias(libs.plugins.git.properties) apply false - id("org.springframework.boot") apply false - id("io.spring.dependency-management") apply false + alias(libs.plugins.spring.boot) apply false + alias(libs.plugins.spring.dependency.management) apply false - id("io.quarkus") apply false + alias(libs.plugins.quarkus.plugin) apply false - id("com.github.ben-manes.versions") + alias(libs.plugins.gradle.versions) } sonarqube { diff --git a/dz3r-app-minimal/build.gradle.kts b/dz3r-app-minimal/build.gradle.kts index 9a7b45add..9a010ce68 100644 --- a/dz3r-app-minimal/build.gradle.kts +++ b/dz3r-app-minimal/build.gradle.kts @@ -2,7 +2,7 @@ plugins { application // See https://github.com/home-climate-control/dz/issues/230 // Should that bug be fixed, this goes to the parent - id("com.gorylenko.gradle-git-properties") + alias(libs.plugins.git.properties) } application { diff --git a/dz3r-app-quarkus/build.gradle.kts b/dz3r-app-quarkus/build.gradle.kts index c5882e4b7..bee36ccbb 100644 --- a/dz3r-app-quarkus/build.gradle.kts +++ b/dz3r-app-quarkus/build.gradle.kts @@ -1,15 +1,14 @@ plugins { // See https://github.com/home-climate-control/dz/issues/230 // Should that bug be fixed, this goes to the parent - id("com.gorylenko.gradle-git-properties") + alias(libs.plugins.git.properties) java - id("io.quarkus") + alias(libs.plugins.quarkus.plugin) } val quarkusPlatformGroupId = "io.quarkus.platform" val quarkusPlatformArtifactId = "quarkus-bom" -val quarkusPlatformVersion = "3.2.0.Final" dependencies { @@ -46,12 +45,12 @@ dependencies { runtimeOnly(project(":dz3r-raspberry-pi")) // Quarkus additions - implementation(enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")) - implementation("io.quarkus:quarkus-arc") - implementation("io.quarkus:quarkus-config-yaml") - implementation("io.quarkus:quarkus-resteasy-reactive") - testImplementation("io.quarkus:quarkus-junit5") - testImplementation("io.rest-assured:rest-assured") + 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 implementation(libs.mapstruct) diff --git a/dz3r-app-springboot/build.gradle.kts b/dz3r-app-springboot/build.gradle.kts index 9f7fcfe04..8e4f03e99 100644 --- a/dz3r-app-springboot/build.gradle.kts +++ b/dz3r-app-springboot/build.gradle.kts @@ -1,18 +1,18 @@ buildscript { dependencies { - classpath("com.google.cloud.tools:jib-layer-filter-extension-gradle:0.3.0") + classpath(libs.jib.layer.filter) } } plugins { // See https://github.com/home-climate-control/dz/issues/230 // Should that bug be fixed, this goes to the parent - id("com.gorylenko.gradle-git-properties") + alias(libs.plugins.git.properties) - id("org.springframework.boot") - id("io.spring.dependency-management") + alias(libs.plugins.spring.boot) + alias(libs.plugins.spring.dependency.management) - id("com.google.cloud.tools.jib") version "3.3.2" + alias(libs.plugins.jib) } dependencies { @@ -75,5 +75,4 @@ jib { args = listOf("--spring.profiles.active=docker") workingDirectory = "${jib.container.appRoot}/app/" } - } diff --git a/dz3r-bootstrap/build.gradle.kts b/dz3r-bootstrap/build.gradle.kts index 40a161361..fae9ad9a2 100644 --- a/dz3r-bootstrap/build.gradle.kts +++ b/dz3r-bootstrap/build.gradle.kts @@ -1,8 +1,4 @@ plugins { - // See https://github.com/home-climate-control/dz/issues/230 - // Should that bug be fixed, this goes to the parent - id("com.gorylenko.gradle-git-properties") - java } diff --git a/dz3r-ha/build.gradle.kts b/dz3r-ha/build.gradle.kts index 6b98a3a76..229879dcf 100644 --- a/dz3r-ha/build.gradle.kts +++ b/dz3r-ha/build.gradle.kts @@ -1,8 +1,4 @@ plugins { - // See https://github.com/home-climate-control/dz/issues/230 - // Should that bug be fixed, this goes to the parent - id("com.gorylenko.gradle-git-properties") - java } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a0dc76c08..ea6d10b56 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -19,6 +19,10 @@ netty = "1.1.6" reactor = "3.6.0" rxtx = "2.1.7" +# Quarkus + +quarkus-platform = "3.2.0.Final" + # This relates to Spring packages used outside SpringBoot, those are managed by their own plugin # Gradle is smart enough to match this to SpringBoot, but it'll be a good idea to keep an eye on it. @@ -39,6 +43,7 @@ jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", ver jackson-dataformat-yaml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", version.ref = "jackson" } jackson-datatype-jdk8 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jdk8", version.ref = "jackson" } jackson-datatype-jsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", version.ref = "jackson" } +jib-layer-filter = { module = "com.google.cloud.tools:jib-layer-filter-extension-gradle", version = "0.3.0" } jmdns = { module = "org.jmdns:jmdns", version.ref = "jmdns" } junit5-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit5" } junit5-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit5" } @@ -53,7 +58,29 @@ reactor-netty = { module = "io.projectreactor.netty:reactor-netty", version.ref reactor-test = { module = "io.projectreactor:reactor-test", version.ref = "reactor" } reactor-tools = { module = "io.projectreactor:reactor-tools", version.ref = "reactor" } rxtx = { module = "org.rxtx:rxtx", version.ref = "rxtx" } + +# Quarkus + +quarkus-bom = { module = "io.quarkus.platform:quarkus-bom", version.ref = "quarkus-platform" } + +quarkus-arc = { module = "io.quarkus:quarkus-arc" } +quarkus-config-yaml = { module = "io.quarkus:quarkus-config-yaml" } +quarkus-resteasy-reactive = { module = "io.quarkus:quarkus-resteasy-reactive" } +quarkus-junit5 = { module = "io.quarkus:quarkus-junit5" } +rest-assured = { module = "io.rest-assured:rest-assured" } + +# Spring + spring-standalone-context = { module = "org.springframework:spring-context", version.ref = "spring-standalone" } spring-standalone-webflux = { module = "org.springframework:spring-webflux", version.ref = "spring-standalone" } [plugins] + +errorprone = { id = "net.ltgt.errorprone", version = "3.1.0" } +git-properties = { id = "com.gorylenko.gradle-git-properties", version = "2.4.1" } +gradle-versions = { id = "com.github.ben-manes.versions", version = "0.50.0"} +jib = { id = "com.google.cloud.tools.jib", version = "3.3.2" } +quarkus-plugin = { id = "io.quarkus", version.ref = "quarkus-platform" } +sonarqube = { id = "org.sonarqube", version = "4.0.0.2929" } +spring-boot = { id = "org.springframework.boot", version = "3.1.5" } +spring-dependency-management = { id = "io.spring.dependency-management", version = "1.1.4" } diff --git a/settings.gradle.kts b/settings.gradle.kts index bd2881101..275c733ed 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,18 +1,3 @@ -pluginManagement { - plugins { - id("net.ltgt.errorprone") version "3.1.0" - id("org.sonarqube") version "4.0.0.2929" - id("com.gorylenko.gradle-git-properties") version "2.4.1" - - id("org.springframework.boot") version "3.1.5" - id("io.spring.dependency-management") version "1.1.4" - - id("io.quarkus") version "3.2.0.Final" - - id("com.github.ben-manes.versions") version "0.50.0" - } -} - // External dependencies include("automation-hat-driver")