diff options
| author | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2022-04-22 16:03:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-22 16:03:33 +0200 |
| commit | f2706efb0cb1b3df9f4f5722591dd4b73188cc5c (patch) | |
| tree | 302913ed479cfb05a9581d4b6eed356aec1fd718 /opendc-web/opendc-web-api | |
| parent | 578394adfb5f1f835b7d8e24f68094968706dfaa (diff) | |
| parent | f5d631b474567c87bcd41f8567ba66fda2a83050 (diff) | |
merge: Update build process (#74)
This pull request brings several updates to the build process as well as new dependency versions. This should resolve several issues that occur during the build process (such as Quarkus or JaCoCo complaining).
## Implementation Notes :hammer_and_pick:
* Remove use of lint-staged
* Migrate from Yarn to NPM
* Update to Kotlin 1.6.21
* Update to Quarkus 2.8.1.Final
* Use JaCoCo 0.8.8
* Test Java 18
## External Dependencies :four_leaf_clover:
* Kotlin, Quarkus, JaCoCo, NPM
## Breaking API Changes :warning:
* N/A
Diffstat (limited to 'opendc-web/opendc-web-api')
| -rw-r--r-- | opendc-web/opendc-web-api/build.gradle.kts | 54 |
1 files changed, 2 insertions, 52 deletions
diff --git a/opendc-web/opendc-web-api/build.gradle.kts b/opendc-web/opendc-web-api/build.gradle.kts index ca01e0c8..5ef6009f 100644 --- a/opendc-web/opendc-web-api/build.gradle.kts +++ b/opendc-web/opendc-web-api/build.gradle.kts @@ -24,18 +24,14 @@ description = "REST API for the OpenDC website" /* Build configuration */ plugins { - `kotlin-conventions` - kotlin("plugin.allopen") - kotlin("plugin.jpa") - `testing-conventions` - `jacoco-conventions` - id("io.quarkus") + `quarkus-conventions` } 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) @@ -60,49 +56,3 @@ dependencies { testImplementation(libs.quarkus.test.security) testImplementation(libs.quarkus.jdbc.h2) } - -allOpen { - annotation("javax.ws.rs.Path") - annotation("javax.enterprise.context.ApplicationScoped") - annotation("io.quarkus.test.junit.QuarkusTest") - annotation("javax.persistence.Entity") -} - -tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> { - kotlinOptions.javaParameters = true -} - -tasks.quarkusDev { - workingDir = rootProject.projectDir.toString() -} - -tasks.test { - extensions.configure(JacocoTaskExtension::class) { - excludeClassLoaders = listOf("*QuarkusClassLoader") - } -} - -/* Fix for Quarkus/ktlint-gradle incompatibilities */ -tasks.named("runKtlintCheckOverMainSourceSet") { - mustRunAfter(tasks.quarkusGenerateCode) - mustRunAfter(tasks.quarkusGenerateCodeDev) -} - -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) -} |
