From 6cf097b60366ecb2116f742be4374fcec841a950 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Fri, 18 Mar 2022 13:34:09 +0100 Subject: build(web/ui): Support building WebJar for OpenDC web UI This change updates the build process to build a static WebJar out of the OpenDC web UI module. This allows us to embed the UI inside the development distribution of OpenDC for other users to readily deploy it. --- .../kotlin/java-library-conventions.gradle.kts | 35 ++++++++++++++++++++++ .../src/main/kotlin/kotlin-conventions.gradle.kts | 11 +------ 2 files changed, 36 insertions(+), 10 deletions(-) create mode 100644 buildSrc/src/main/kotlin/java-library-conventions.gradle.kts (limited to 'buildSrc/src/main') diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts new file mode 100644 index 00000000..d4cc667a --- /dev/null +++ b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2022 AtLarge Research + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +plugins { + `java-library` +} + +/* Project configuration */ +repositories { + mavenCentral() +} + +java { + sourceCompatibility = Libs.jvmTarget + targetCompatibility = Libs.jvmTarget +} diff --git a/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts b/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts index 20c379a2..5d9ae56e 100644 --- a/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts @@ -23,21 +23,12 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - `java-library` + id("java-library-conventions") kotlin("jvm") id("org.jlleitschuh.gradle.ktlint") } /* Project configuration */ -repositories { - mavenCentral() -} - -java { - sourceCompatibility = Libs.jvmTarget - targetCompatibility = Libs.jvmTarget -} - tasks.withType().configureEach { kotlinOptions.jvmTarget = Libs.jvmTarget.toString() kotlinOptions.freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn" -- cgit v1.2.3