diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..6c0fa41 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverConfig.kt b/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverConfig.kt index 75511e5..076a78b 100644 --- a/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverConfig.kt +++ b/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverConfig.kt @@ -96,29 +96,15 @@ open class SemverConfig @Inject constructor( val separator: String get() = semVersion.separator - override fun toString(): String { - return mapOf( - Pair("properties", properties), - Pair("semverKey", semverKey), - Pair("majorKey", majorKey), - Pair("minorKey", minorKey), - Pair("patchKey", patchKey), - Pair("preReleaseKey", preReleaseKey), - Pair("preReleasePrefixKey", preReleasePrefixKey), - Pair("buildMetaKey", buildMetaKey), - Pair("buildMetaPrefixKey", buildMetaPrefixKey), - Pair("separator", separatorKey), - Pair("keysPrefix", keysPrefix), - Pair("semver", semver), - Pair("major", major), - Pair("minor", minor), - Pair("patch", patch), - Pair("preRelease", preRelease), - Pair("buildMeta", buildMeta), - Pair("preReleasePrefix", preReleasePrefix), - Pair("buildMetaPrefix", buildMetaPrefix), - Pair("separator", separator) - ).toString() + return "SemverConfig(semVersion=$semVersion, properties='$properties', semverKey='$semverKey'," + + " majorKey='$majorKey', minorKey='$minorKey', patchKey='$patchKey', preReleaseKey='$preReleaseKey'," + + " preReleasePrefixKey='$preReleasePrefixKey', buildMetaKey='$buildMetaKey'," + + " buildMetaPrefixKey='$buildMetaPrefixKey', separatorKey='$separatorKey', keysPrefix='$keysPrefix'," + + " semver='$semver', version='$version', major=$major, minor=$minor, patch=$patch," + + " preRelease='$preRelease', buildMeta='$buildMeta', preReleasePrefix='$preReleasePrefix'," + + " buildMetaPrefix='$buildMetaPrefix', separator='$separator')" } + + } diff --git a/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverIncrementBuildMetaTask.kt b/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverIncrementBuildMetaTask.kt index f16824d..9b2d2a3 100644 --- a/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverIncrementBuildMetaTask.kt +++ b/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverIncrementBuildMetaTask.kt @@ -58,7 +58,7 @@ open class SemverIncrementBuildMetaTask @Inject constructor( if (version.buildMeta != buildMeta) { version.buildMeta = buildMeta project.version = version.semver - logger.lifecycle("Version: ${project.version}") + if (logger.isLifecycleEnabled) logger.lifecycle("Version: ${project.version}") Utils.saveProperties(project.projectDir, config, version) } } diff --git a/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverIncrementTask.kt b/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverIncrementTask.kt index 32bbc39..15043f6 100644 --- a/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverIncrementTask.kt +++ b/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverIncrementTask.kt @@ -57,7 +57,7 @@ open class SemverIncrementTask @Inject constructor( isPatch = type == SemverConfig.DEFAULT_PATCH_KEY ) project.version = version.semver - logger.lifecycle("Version: ${project.version}") + if (logger.isLifecycleEnabled) logger.lifecycle("Version: ${project.version}") Utils.saveProperties(project.projectDir, config, version) } } diff --git a/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverPlugin.kt b/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverPlugin.kt index 0168a90..f60fc78 100644 --- a/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverPlugin.kt +++ b/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverPlugin.kt @@ -37,6 +37,7 @@ import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.util.GradleVersion +@Suppress("unused") class SemverPlugin : Plugin { private val simpleName = SemverPlugin::class.simpleName private var version = Version() @@ -60,7 +61,7 @@ class SemverPlugin : Plugin { private fun afterEvaluate(project: Project) { val propsFile = Utils.getPropertiesFile(project.projectDir, config.properties) - if (project.version != "unspecified") { + if (project.version != "unspecified" && project.logger.isWarnEnabled) { project.logger.warn( "Please specify the version in ${propsFile.name} and remove it from ${project.buildFile.name}" ) @@ -69,10 +70,12 @@ class SemverPlugin : Plugin { propsFile.apply { val isNew = !exists() - project.logger.info( - "[$simpleName] Attempting to read properties from: `$absoluteFile`. " + - "[exists: $isNew, isFile: $isFile, canRead: ${canRead()}]" - ) + if (project.logger.isInfoEnabled) { + project.logger.info( + "[$simpleName] Attempting to read properties from: `$absoluteFile`. " + + "[exists: $isNew, isFile: $isFile, canRead: ${canRead()}]" + ) + } val props = Utils.loadProperties(this) val requiredProps = setOf( @@ -89,10 +92,14 @@ class SemverPlugin : Plugin { } project.version = version.semver - project.logger.info("[$simpleName] Project version set to: ${project.version}") + if (project.logger.isInfoEnabled) { + project.logger.info("[$simpleName] Project version set to: ${project.version}") + } if (!hasReqProps || !isFile) { - project.logger.info("[$simpleName] Saving version properties to `$absoluteFile`.") + if (project.logger.isInfoEnabled) { + project.logger.info("[$simpleName] Saving version properties to `$absoluteFile`.") + } Utils.saveProperties(project.projectDir, config, version) } } diff --git a/src/main/kotlin/net/thauvin/erik/gradle/semver/SortedProperties.kt b/src/main/kotlin/net/thauvin/erik/gradle/semver/SortedProperties.kt index 8cce350..3de2dd0 100644 --- a/src/main/kotlin/net/thauvin/erik/gradle/semver/SortedProperties.kt +++ b/src/main/kotlin/net/thauvin/erik/gradle/semver/SortedProperties.kt @@ -38,11 +38,11 @@ import java.util.Properties internal class SortedProperties : Properties() { override val entries: MutableSet> - get() = super.entries.sortedWith(Comparator { a, b -> a.toString().compareTo(b.toString()) }).toMutableSet() + get() = super.entries.sortedWith { a, b -> a.toString().compareTo(b.toString()) }.toMutableSet() override fun keys(): Enumeration { val keys = Collections.list(super.keys()) - keys.sortWith(Comparator { a, b -> a.toString().compareTo(b.toString()) }) + keys.sortWith { a, b -> a.toString().compareTo(b.toString()) } return Collections.enumeration(keys) } } diff --git a/src/main/kotlin/net/thauvin/erik/gradle/semver/Utils.kt b/src/main/kotlin/net/thauvin/erik/gradle/semver/Utils.kt index edc213a..e5c9a78 100644 --- a/src/main/kotlin/net/thauvin/erik/gradle/semver/Utils.kt +++ b/src/main/kotlin/net/thauvin/erik/gradle/semver/Utils.kt @@ -148,12 +148,12 @@ object Utils { version.buildMeta = "" if (parts.size > min) { - when { - parts.size == max -> { + when (parts.size) { + max -> { version.preRelease = parts[3] version.buildMeta = parts[4] } - parts.size == 4 -> { + 4 -> { if (input.endsWith(version.buildMetaPrefix + parts[3])) { version.buildMeta = parts[3] } else { diff --git a/src/test/kotlin/net/thauvin/erik/gradle/semver/SemverConfigTest.kt b/src/test/kotlin/net/thauvin/erik/gradle/semver/SemverConfigTest.kt index 402b4ef..42e2db3 100644 --- a/src/test/kotlin/net/thauvin/erik/gradle/semver/SemverConfigTest.kt +++ b/src/test/kotlin/net/thauvin/erik/gradle/semver/SemverConfigTest.kt @@ -71,7 +71,7 @@ class SemverConfigTest { assertEquals(config.properties, "version.properties", "config.properties should be version.properties") assertTrue( - config.toString().contains("properties=${SemverConfig.DEFAULT_PROPERTIES}"), + config.toString().contains("properties='${SemverConfig.DEFAULT_PROPERTIES}'"), "toString contains default properties" ) }