From 87ec028511847a45fe273b64f3d1ab130800683a Mon Sep 17 00:00:00 2001 From: Filip Ocelka Date: Thu, 8 Aug 2024 15:43:36 +0200 Subject: [PATCH] BATM-6544 Fix where convention plugins are applied --- annotations/build.gradle | 2 +- batm_ssh_tunnel/build.gradle | 1 - build.gradle | 7 +++++++ buildSrc/src/main/groovy/shared-build-conventions.gradle | 1 - currencies/build.gradle | 2 +- operators_sample_website/build.gradle | 2 +- server_extensions_api/build.gradle | 2 +- server_extensions_examples/build.gradle | 2 +- server_extensions_extra/build.gradle | 2 +- server_extensions_template/build.gradle | 2 +- server_extensions_test/build.gradle | 1 - 11 files changed, 14 insertions(+), 10 deletions(-) create mode 100644 build.gradle diff --git a/annotations/build.gradle b/annotations/build.gradle index e47c2d3bb..848b52127 100644 --- a/annotations/build.gradle +++ b/annotations/build.gradle @@ -1,5 +1,5 @@ plugins { - id("shared-build-conventions") + id("shared-publish-conventions") } group = projectGroup diff --git a/batm_ssh_tunnel/build.gradle b/batm_ssh_tunnel/build.gradle index 646b2f252..eaf0ba50d 100644 --- a/batm_ssh_tunnel/build.gradle +++ b/batm_ssh_tunnel/build.gradle @@ -1,6 +1,5 @@ plugins { id("application") - id("shared-build-conventions") } version = "1.0.0" diff --git a/build.gradle b/build.gradle new file mode 100644 index 000000000..58adfc36e --- /dev/null +++ b/build.gradle @@ -0,0 +1,7 @@ +plugins { + id("shared-build-conventions") +} + +allprojects { + apply plugin: 'shared-build-conventions' +} \ No newline at end of file diff --git a/buildSrc/src/main/groovy/shared-build-conventions.gradle b/buildSrc/src/main/groovy/shared-build-conventions.gradle index 1fb725fef..9b32d6e78 100644 --- a/buildSrc/src/main/groovy/shared-build-conventions.gradle +++ b/buildSrc/src/main/groovy/shared-build-conventions.gradle @@ -1,7 +1,6 @@ plugins { id("java") id("com.generalbytes.gradle.main") - id("shared-publish-conventions") } repositories { diff --git a/currencies/build.gradle b/currencies/build.gradle index d0ffed15d..d525bb2c3 100644 --- a/currencies/build.gradle +++ b/currencies/build.gradle @@ -1,5 +1,5 @@ plugins { - id("shared-build-conventions") + id("shared-publish-conventions") } group = projectGroup diff --git a/operators_sample_website/build.gradle b/operators_sample_website/build.gradle index a6c78c78a..77a8446d4 100644 --- a/operators_sample_website/build.gradle +++ b/operators_sample_website/build.gradle @@ -1,5 +1,5 @@ plugins { - id("shared-build-conventions") + id("shared-publish-conventions") } group = projectGroup diff --git a/server_extensions_api/build.gradle b/server_extensions_api/build.gradle index f804a2172..9686dd886 100644 --- a/server_extensions_api/build.gradle +++ b/server_extensions_api/build.gradle @@ -1,5 +1,5 @@ plugins { - id("shared-build-conventions") + id("shared-publish-conventions") id("distribution") } diff --git a/server_extensions_examples/build.gradle b/server_extensions_examples/build.gradle index 1fade2898..168c4914b 100644 --- a/server_extensions_examples/build.gradle +++ b/server_extensions_examples/build.gradle @@ -1,5 +1,5 @@ plugins { - id("shared-build-conventions") + id("shared-publish-conventions") } group = projectGroup diff --git a/server_extensions_extra/build.gradle b/server_extensions_extra/build.gradle index f29377a07..670330298 100644 --- a/server_extensions_extra/build.gradle +++ b/server_extensions_extra/build.gradle @@ -1,5 +1,5 @@ plugins { - id("shared-build-conventions") + id("shared-publish-conventions") id("shared-repositories-ext-conventions") } diff --git a/server_extensions_template/build.gradle b/server_extensions_template/build.gradle index 78226917c..c7b16fd3f 100644 --- a/server_extensions_template/build.gradle +++ b/server_extensions_template/build.gradle @@ -1,5 +1,5 @@ plugins { - id("shared-build-conventions") + id("shared-publish-conventions") } group = projectGroup diff --git a/server_extensions_test/build.gradle b/server_extensions_test/build.gradle index fd5e7cc19..cd19d52a0 100644 --- a/server_extensions_test/build.gradle +++ b/server_extensions_test/build.gradle @@ -1,6 +1,5 @@ plugins { id("application") - id("shared-build-conventions") id("shared-repositories-ext-conventions") }