Merge pull request #339 from sbt/wip/version2

eed3si9n · web-flow · commit dbe7ff5ad173 · 2024-12-18T23:36:33.000-05:00
Make version available to both ThisBuild and projects
diff --git a/plugin/src/main/scala/com/geirsson/CiReleasePlugin.scala b/plugin/src/main/scala/com/geirsson/CiReleasePlugin.scala
@@ -142,7 +142,8 @@ object CiReleasePlugin extends AutoPlugin {
         case Some(cmd) => cmd
         case None      => backPubVersionToCommand(v)
       }
-    }
+    },
+    version ~= dropBackPubCommand
   )
 
   override lazy val globalSettings: Seq[Def.Setting[_]] = List(
@@ -218,7 +219,7 @@ object CiReleasePlugin extends AutoPlugin {
   )
 
   override lazy val projectSettings: Seq[Def.Setting[_]] = List(
-    version ~= dropBackPubCommand,
+    version := (ThisBuild / version).value,
     publishConfiguration :=
       publishConfiguration.value.withOverwrite(true),
     publishLocalConfiguration :=

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,8 @@ object CiReleasePlugin extends AutoPlugin {`
`142`	`142`	`case Some(cmd) => cmd`
`143`	`143`	`case None => backPubVersionToCommand(v)`
`144`	`144`	`}`
`145`		`- }`
	`145`	`+ },`
	`146`	`+ version ~= dropBackPubCommand`
`146`	`147`	`)`
`147`	`148`
`148`	`149`	`override lazy val globalSettings: Seq[Def.Setting[_]] = List(`
`@@ -218,7 +219,7 @@ object CiReleasePlugin extends AutoPlugin {`
`218`	`219`	`)`
`219`	`220`
`220`	`221`	`override lazy val projectSettings: Seq[Def.Setting[_]] = List(`
`221`		`- version ~= dropBackPubCommand,`
	`222`	`+ version := (ThisBuild / version).value,`
`222`	`223`	`publishConfiguration :=`
`223`	`224`	`publishConfiguration.value.withOverwrite(true),`
`224`	`225`	`publishLocalConfiguration :=`