diff --git a/.editorconfig b/.editorconfig index eeb2d36..3ed1c83 100644 --- a/.editorconfig +++ b/.editorconfig @@ -21,12 +21,14 @@ tab_width = 2 # noinspection EditorConfigKeyCorrectness [*.{kt,kts}] -ij_kotlin_packages_to_use_import_on_demand = unset -ij_kotlin_allow_trailing_comma_on_call_site = true ij_kotlin_allow_trailing_comma = true -ktlint_standard_import-ordering = disabled -ktlint_standard_no-empty-first-line-in-class-body = disabled +ij_kotlin_allow_trailing_comma_on_call_site = true +ij_kotlin_packages_to_use_import_on_demand = unset +ktlint_standard_chain-method-continuation = disabled +ktlint_standard_class-signature = disabled ktlint_standard_function-signature = disabled -ktlint_standard_parameter-list-wrapping = disabled +ktlint_standard_import-ordering = disabled ktlint_standard_multiline-expression-wrapping = disabled +ktlint_standard_no-empty-first-line-in-class-body = disabled +ktlint_standard_parameter-list-wrapping = disabled ktlint_standard_string-template-indent = disabled diff --git a/build.gradle.kts b/build.gradle.kts index 6508475..08933c2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,9 +8,9 @@ import java.time.format.DateTimeFormatter.ofPattern import org.jlleitschuh.gradle.ktlint.reporter.ReporterType.SARIF plugins { - alias(hlaeja.plugins.io.gitlab.arturbosch.detekt) + alias(hlaeja.plugins.gradle.detekt) + alias(hlaeja.plugins.gradle.ktlint) alias(hlaeja.plugins.kotlin.jvm) - alias(hlaeja.plugins.org.jlleitschuh.gradle.ktlint) `kotlin-dsl` `maven-publish` @@ -84,9 +84,10 @@ tasks { register("buildInfo") { group = "hlaeja" description = "Prints the project name and version" - + val projectName = project.name + val projectVersion = project.version doLast { - println("Project Name: ${project.name} Version: ${project.version}") + println("Project Name: $projectName Version: $projectVersion") } } withType { diff --git a/gradle.properties b/gradle.properties index 8477f94..c621654 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ kotlin.code.style=official version=0.3.0-SNAPSHOT -catalog=0.6.0 +catalog=0.11.0-SNAPSHOT diff --git a/src/main/kotlin/ltd/hlaeja/plugin/extension/GitExtension.kt b/src/main/kotlin/ltd/hlaeja/plugin/extension/GitExtension.kt index 4ca6ea6..63f053d 100644 --- a/src/main/kotlin/ltd/hlaeja/plugin/extension/GitExtension.kt +++ b/src/main/kotlin/ltd/hlaeja/plugin/extension/GitExtension.kt @@ -12,7 +12,7 @@ abstract class GitExtension(private val project: Project) { private const val HASH_LENGTH = 8 private const val SNAPSHOT = "-SNAPSHOT" private const val UNAVAILABLE = "n/a" - private val PRIMARY_BRANCHES = setOf("master") + private val PRIMARY_BRANCHES = setOf("master", "develop") } fun version(): String = when {