Merge pull request #58 from creek-service/latest_conventions

Update to latest build conventions
creek-service · Nov 9, 2022 · 837c31c · 837c31c
2 parents 6d11dd7 + 623225c
commit 837c31c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -20,4 +20,4 @@ updates:
     registries:
       - creek-github-packages
     schedule:
-      interval: weekly
+      interval: monthly
diff --git a/buildSrc/src/main/kotlin/creek-common-convention.gradle.kts b/buildSrc/src/main/kotlin/creek-common-convention.gradle.kts
@@ -77,6 +77,7 @@ spotless {
         removeUnusedImports()
         trimTrailingWhitespace()
         endWithNewline()
+        toggleOffOn("formatting:off", "formatting:on")
     }
 }
 
@@ -95,6 +96,12 @@ spotbugs {
     }
 }
 
+if (rootProject.name != project.name) {
+    tasks.jar {
+        archiveBaseName.set("${rootProject.name}-${project.name}")
+    }
+}
+
 tasks.register("format") {
     group = "creek"
     description = "Format the code"

diff --git a/buildSrc/src/main/kotlin/creek-publishing-convention.gradle.kts b/buildSrc/src/main/kotlin/creek-publishing-convention.gradle.kts
@@ -33,14 +33,6 @@ java {
     withJavadocJar()
 }
 
-val prependRootName = rootProject.name != project.name
-
-if (prependRootName) {
-    tasks.jar {
-        archiveBaseName.set("${rootProject.name}-${project.name}")
-    }
-}
-
 tasks.javadoc {
     if (JavaVersion.current().isJava9Compatible) {
         (options as StandardJavadocDocletOptions).apply {
@@ -54,7 +46,7 @@ tasks.javadoc {
 // Dummy/empty publishPlugins task, to allow consistent build.yml workflow
 tasks.register("publishPlugins") {
     doLast {
-        println("No Gradle plugins to publish")
+        logger.info("No Gradle plugins to publish")
     }
 }
 
@@ -74,6 +66,7 @@ publishing {
         create<MavenPublication>("mavenJava") {
             from(components["java"])
 
+            val prependRootName = rootProject.name != project.name
             if (prependRootName) {
                 artifactId = "${rootProject.name}-${project.name}"
             }