expose Gradle Providers for calculated version & tagName for other ex…

…tensions to use (#7)
nefilim · Dec 29, 2021 · adccf7b · adccf7b
1 parent 8e773e4
commit adccf7b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/main/kotlin/io/github/nefilim/gradle/semver/SemVerExtension.kt b/src/main/kotlin/io/github/nefilim/gradle/semver/SemVerExtension.kt
@@ -10,13 +10,17 @@ import org.gradle.api.Action
 import org.gradle.api.Project
 import org.gradle.api.model.ObjectFactory
 import org.gradle.api.provider.Property
+import org.gradle.api.provider.Provider
 import javax.inject.Inject
 
 open class SemVerExtension @Inject constructor(objects: ObjectFactory) {
     private val verbose: Property<Boolean> = objects.property(Boolean::class.java)
     private val tagPrefix: Property<String> = objects.property(String::class.java)
     private val initialVersion: Property<Version> = objects.property(Version::class.java)
     private val overrideVersion: Property<Version> = objects.property(Version::class.java)
+    private val calculatedVersionInternal: Property<Version> = objects.property(Version::class.java)
+    val calculatedVersion: Provider<Version> = calculatedVersionInternal
+    val calculatedTagName: Provider<String> = calculatedVersionInternal.flatMap { v -> tagPrefix.map { "$it$v"} }
 
     private val main: BranchHandler = objects.newInstance(BranchHandler::class.java, objects, GitRef.MainBranch.DefaultScope, GitRef.MainBranch.DefaultStage)
     private val develop: BranchHandler = objects.newInstance(BranchHandler::class.java, objects, GitRef.DevelopBranch.DefaultScope, GitRef.DevelopBranch.DefaultStage)
@@ -65,6 +69,11 @@ open class SemVerExtension @Inject constructor(objects: ObjectFactory) {
         action.execute(hotfix)
     }
 
+    fun setVersion(version: Version) {
+        calculatedVersionInternal.set(version)
+        calculatedVersionInternal.disallowChanges()
+    }
+
     fun buildPluginConfig(): PluginConfig {
         return PluginConfig(
             verbose.get(),

diff --git a/src/main/kotlin/io/github/nefilim/gradle/semver/SemVerPlugin.kt b/src/main/kotlin/io/github/nefilim/gradle/semver/SemVerPlugin.kt
@@ -23,12 +23,15 @@ public class SemVerPlugin: Plugin<Project> {
                 val context = SemVerPluginContext(target.git, config, target)
                 context.verbose("semver configuration: $config")
 
-                target.version = config.overrideVersion.getOrElse {
+                val calculatedVersion = config.overrideVersion.getOrElse {
                     context.calculateVersionFlow().getOrHandle {
                         context.error("failed to calculate version: $it".red())
                         throw Exception("$it")
                     }
                 }
+                target.version = calculatedVersion.toString()
+                println("setting calculated version property to ${calculatedVersion}")
+                semVerExtension.setVersion(calculatedVersion)
                 context.generateVersionFile()
 
                 if (target == target.rootProject)