From c244d7e42a88105fbec5356030ed266f1af0811e Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Wed, 5 May 2021 22:32:28 +0200 Subject: build: Prevent publishing application modules This change updates the Gradle build configuration so that the application modules (as opposed the libraries) are not published onto Maven Central. --- buildSrc/src/main/kotlin/experiment-conventions.gradle.kts | 2 +- opendc-experiments/opendc-experiments-capelin/build.gradle.kts | 1 - opendc-experiments/opendc-experiments-energy21/build.gradle.kts | 1 - opendc-experiments/opendc-experiments-serverless20/build.gradle.kts | 1 - opendc-harness/opendc-harness-cli/build.gradle.kts | 2 +- opendc-web/opendc-web-runner/build.gradle.kts | 2 +- 6 files changed, 3 insertions(+), 6 deletions(-) diff --git a/buildSrc/src/main/kotlin/experiment-conventions.gradle.kts b/buildSrc/src/main/kotlin/experiment-conventions.gradle.kts index 580f67cb..26780205 100644 --- a/buildSrc/src/main/kotlin/experiment-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/experiment-conventions.gradle.kts @@ -23,8 +23,8 @@ import gradle.kotlin.dsl.accessors._9bf86420fccbde1948375f641de89b70.sourceSets */ plugins { - `java-library` distribution + id("kotlin-conventions") id("com.github.johnrengelman.shadow") } diff --git a/opendc-experiments/opendc-experiments-capelin/build.gradle.kts b/opendc-experiments/opendc-experiments-capelin/build.gradle.kts index 7f5f5a74..ca4aa35f 100644 --- a/opendc-experiments/opendc-experiments-capelin/build.gradle.kts +++ b/opendc-experiments/opendc-experiments-capelin/build.gradle.kts @@ -24,7 +24,6 @@ description = "Experiments for the Capelin work" /* Build configuration */ plugins { - `kotlin-library-conventions` `experiment-conventions` `testing-conventions` } diff --git a/opendc-experiments/opendc-experiments-energy21/build.gradle.kts b/opendc-experiments/opendc-experiments-energy21/build.gradle.kts index 1bebcea2..64e52f88 100644 --- a/opendc-experiments/opendc-experiments-energy21/build.gradle.kts +++ b/opendc-experiments/opendc-experiments-energy21/build.gradle.kts @@ -24,7 +24,6 @@ description = "Experiments for the OpenDC Energy work" /* Build configuration */ plugins { - `kotlin-library-conventions` `experiment-conventions` `testing-conventions` } diff --git a/opendc-experiments/opendc-experiments-serverless20/build.gradle.kts b/opendc-experiments/opendc-experiments-serverless20/build.gradle.kts index f58c0add..c35070fe 100644 --- a/opendc-experiments/opendc-experiments-serverless20/build.gradle.kts +++ b/opendc-experiments/opendc-experiments-serverless20/build.gradle.kts @@ -24,7 +24,6 @@ description = "Experiments for OpenDC Serverless" /* Build configuration */ plugins { - `kotlin-library-conventions` `experiment-conventions` `testing-conventions` } diff --git a/opendc-harness/opendc-harness-cli/build.gradle.kts b/opendc-harness/opendc-harness-cli/build.gradle.kts index 699cc367..b1f049de 100644 --- a/opendc-harness/opendc-harness-cli/build.gradle.kts +++ b/opendc-harness/opendc-harness-cli/build.gradle.kts @@ -24,7 +24,7 @@ description = "Command line interface of OpenDC Harness" /* Build configuration */ plugins { - `kotlin-library-conventions` + `kotlin-conventions` application } diff --git a/opendc-web/opendc-web-runner/build.gradle.kts b/opendc-web/opendc-web-runner/build.gradle.kts index 2981ddc7..60a24b92 100644 --- a/opendc-web/opendc-web-runner/build.gradle.kts +++ b/opendc-web/opendc-web-runner/build.gradle.kts @@ -24,7 +24,7 @@ description = "Experiment runner for OpenDC" /* Build configuration */ plugins { - `kotlin-library-conventions` + `kotlin-conventions` application } -- cgit v1.2.3