Remove unnecessary mapping when registering the VersionValueSource

Author: JavierSegoviaCordoba

CHANGELOG.md

@@ -12,6 +12,8 @@
 
 ### Removed
 
+- unnecessary mapping when registering the `VersionValueSource`
+
 ### Updated
 
 - `com.javiersc.hubdle:com.javiersc.hubdle.gradle.plugin -> 0.7.5`

semver-project-gradle-plugin/main/kotlin/com/javiersc/semver/project/gradle/plugin/SemverProjectPlugin.kt

@@ -1,6 +1,5 @@
 package com.javiersc.semver.project.gradle.plugin
 
-import com.javiersc.gradle.version.GradleVersion
 import com.javiersc.semver.project.gradle.plugin.internal.checkScopeCorrectness
 import com.javiersc.semver.project.gradle.plugin.internal.git.hasGit
 import com.javiersc.semver.project.gradle.plugin.services.GitBuildService
@@ -44,16 +43,14 @@ public class SemverProjectPlugin : Plugin<Project> {
     }
 
     private fun Project.configureVersion() {
-        val gradleVersionProvider: Provider<GradleVersion> =
-            VersionValueSource.register(this).map(GradleVersion::invoke)
-        version = VersionProperty(gradleVersionProvider.map(GradleVersion::toString))
+        val gradleVersionProvider: Provider<String> = VersionValueSource.register(this)
+        version = VersionProperty(gradleVersionProvider)
 
         // It is possible third party plugin breaks lazy configuration by calling `project.version`
         // too early, applying the calculated version in `afterEvaluate` fix it sometimes.
         afterEvaluate { proj ->
-            val gradleVersionProviderProj: Provider<GradleVersion> =
-                VersionValueSource.register(proj).map(GradleVersion::invoke)
-            proj.version = VersionProperty(gradleVersionProviderProj.map(GradleVersion::toString))
+            val gradleVersionProviderProj: Provider<String> = VersionValueSource.register(proj)
+            proj.version = VersionProperty(gradleVersionProviderProj)
         }
     }
 }

semver-project-gradle-plugin/main/kotlin/com/javiersc/semver/project/gradle/plugin/valuesources/VersionValueSource.kt

@@ -100,20 +100,24 @@ internal abstract class VersionValueSource : ValueSource<String, VersionValueSou
 
         fun register(project: Project): Provider<String> =
             project.providers.of(VersionValueSource::class) { valueSourceSpec ->
-                val gitDir = project.provider { project.semverExtension.gitDir.get().asFile }
-                valueSourceSpec.parameters.versionMapper.set(project.semverExtension.versionMapper)
-                valueSourceSpec.parameters.versionAndGitMapper.set(
-                    project.semverExtension.versionAndGitMapper)
-                valueSourceSpec.parameters.gitDir.set(gitDir)
+                val parameters: Params = valueSourceSpec.parameters
+                val semverExtension: SemverExtension = project.semverExtension
+
+                val gitDir: Provider<File> =
+                    project.provider { semverExtension.gitDir.get().asFile }
+
+                parameters.versionMapper.set(semverExtension.versionMapper)
+                parameters.versionAndGitMapper.set(semverExtension.versionAndGitMapper)
+                parameters.gitDir.set(gitDir)
                 val commitsMaxCount: Int =
-                    project.commitsMaxCount.orNull ?: project.semverExtension.commitsMaxCount.get()
-                valueSourceSpec.parameters.commitsMaxCount.set(commitsMaxCount)
-                valueSourceSpec.parameters.projectTagPrefix.set(project.projectTagPrefix.get())
-                valueSourceSpec.parameters.tagPrefixProperty.set(project.tagPrefixProperty.get())
-                valueSourceSpec.parameters.stageProperty.set(project.stageProperty.orNull)
-                valueSourceSpec.parameters.scopeProperty.set(project.scopeProperty.orNull)
-                valueSourceSpec.parameters.creatingSemverTag.set(project.isCreatingSemverTag)
-                valueSourceSpec.parameters.checkClean.set(project.checkCleanProperty.get())
+                    project.commitsMaxCount.orNull ?: semverExtension.commitsMaxCount.get()
+                parameters.commitsMaxCount.set(commitsMaxCount)
+                parameters.projectTagPrefix.set(project.projectTagPrefix.get())
+                parameters.tagPrefixProperty.set(project.tagPrefixProperty.get())
+                parameters.stageProperty.set(project.stageProperty.orNull)
+                parameters.scopeProperty.set(project.scopeProperty.orNull)
+                parameters.creatingSemverTag.set(project.isCreatingSemverTag)
+                parameters.checkClean.set(project.checkCleanProperty.get())
             }
     }
 }