diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 8774983..6a56573 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -20,4 +20,4 @@ updates: registries: - creek-github-packages schedule: - interval: weekly \ No newline at end of file + interval: monthly \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/creek-common-convention.gradle.kts b/buildSrc/src/main/kotlin/creek-common-convention.gradle.kts index b78dcf7..9a8786e 100644 --- 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 index ae6ede1..928bbf3 100644 --- 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("mavenJava") { from(components["java"]) + val prependRootName = rootProject.name != project.name if (prependRootName) { artifactId = "${rootProject.name}-${project.name}" }