diff options
| -rw-r--r-- | gradle/libs.versions.toml | 6 | ||||
| -rw-r--r-- | opendc-web/opendc-web-api/build.gradle.kts | 16 | ||||
| -rw-r--r-- | opendc-web/opendc-web-ui/build.gradle.kts | 2 |
3 files changed, 4 insertions, 20 deletions
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ffcf7edb..8e0807ef 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] classgraph = "4.8.143" -clikt = "3.4.0" +clikt = "3.4.1" config = "1.4.2" commons-math3 = "3.6.1" dokka = "1.6.10" @@ -24,9 +24,9 @@ opentelemetry-metrics = "1.12.0-alpha" opentelemetry-semconv = "1.12.0-alpha" parquet = "1.12.2" progressbar = "0.9.2" -quarkus = "2.7.5.Final" +quarkus = "2.8.1.Final" quarkus-junit5-mockk = "0.3.0" -sentry = "5.7.1" +sentry = "5.7.2" shadow = "7.1.2" slf4j = "1.7.36" diff --git a/opendc-web/opendc-web-api/build.gradle.kts b/opendc-web/opendc-web-api/build.gradle.kts index ca01e0c8..f6ae730d 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) + compileOnly(projects.opendcWeb.opendcWebUiQuarkus.deployment) /* Temporary fix for Quarkus/Gradle issues */ implementation(projects.opendcWeb.opendcWebUiQuarkus.runtime) implementation(libs.quarkus.kotlin) @@ -91,18 +92,3 @@ tasks.named("runKtlintCheckOverMainSourceSet") { 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) -} diff --git a/opendc-web/opendc-web-ui/build.gradle.kts b/opendc-web/opendc-web-ui/build.gradle.kts index 469de2fa..c0e3fcf6 100644 --- a/opendc-web/opendc-web-ui/build.gradle.kts +++ b/opendc-web/opendc-web-ui/build.gradle.kts @@ -118,6 +118,4 @@ tasks.processResources { from(project.fileTree("public")) { into("META-INF/resources/${project.name}/static") } - - mkdir("${project.buildDir}/classes/java/main") } |
