From c69035732ef073257cb56f7c9edfdbe25a47aa44 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Fri, 18 Mar 2022 13:36:32 +0100 Subject: feat(web/ui): Add extension for serving OpenDC web UI This change adds a new Quarkus extension that is able to serve the OpenDC web interface via the Quarkus deployment of OpenDC. --- opendc-web/opendc-web-api/build.gradle.kts | 1 + 1 file changed, 1 insertion(+) (limited to 'opendc-web/opendc-web-api/build.gradle.kts') diff --git a/opendc-web/opendc-web-api/build.gradle.kts b/opendc-web/opendc-web-api/build.gradle.kts index 853632a7..497ac52a 100644 --- a/opendc-web/opendc-web-api/build.gradle.kts +++ b/opendc-web/opendc-web-api/build.gradle.kts @@ -36,6 +36,7 @@ dependencies { implementation(enforcedPlatform(libs.quarkus.bom)) implementation(projects.opendcWeb.opendcWebProto) + implementation(projects.opendcWeb.opendcWebUiQuarkus.runtime) implementation(libs.quarkus.kotlin) implementation(libs.quarkus.resteasy.core) -- cgit v1.2.3 From f2ff40b5170260289e99e0506525f0905f380907 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Tue, 5 Apr 2022 18:41:45 +0200 Subject: fix(web/ui): Add workaround for Quarkus Gradle build issues This chnage add a workaround for the issues that appear when building the Quarkus application due to it accessing the build files of the other local modules. --- opendc-web/opendc-web-api/build.gradle.kts | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'opendc-web/opendc-web-api/build.gradle.kts') diff --git a/opendc-web/opendc-web-api/build.gradle.kts b/opendc-web/opendc-web-api/build.gradle.kts index 497ac52a..ca01e0c8 100644 --- a/opendc-web/opendc-web-api/build.gradle.kts +++ b/opendc-web/opendc-web-api/build.gradle.kts @@ -79,16 +79,30 @@ tasks.quarkusDev { tasks.test { extensions.configure(JacocoTaskExtension::class) { excludeClassLoaders = listOf("*QuarkusClassLoader") - // destinationFile = layout.buildDirectory.file("jacoco-quarkus.exec").get().asFile } } /* Fix for Quarkus/ktlint-gradle incompatibilities */ -tasks.named("runKtlintCheckOverMainSourceSet").configure { +tasks.named("runKtlintCheckOverMainSourceSet") { mustRunAfter(tasks.quarkusGenerateCode) mustRunAfter(tasks.quarkusGenerateCodeDev) } -tasks.named("runKtlintCheckOverTestSourceSet").configure { +tasks.named("runKtlintCheckOverTestSourceSet") { mustRunAfter(tasks.quarkusGenerateCodeTests) } + +/* Fix for Quarkus/Gradle issues */ +tasks.quarkusGenerateCode { + mustRunAfter(projects.opendcWeb.opendcWebUiQuarkus.deployment) + mustRunAfter(projects.opendcWeb.opendcWebUi) + + doFirst { + mkdir("${projects.opendcWeb.opendcWebUi.dependencyProject.buildDir}/classes/java/main") + } +} + +tasks.quarkusGenerateCodeTests { + mustRunAfter(projects.opendcWeb.opendcWebUiQuarkus.deployment) + mustRunAfter(projects.opendcWeb.opendcWebUi) +} -- cgit v1.2.3