Remove version from context, we can now use dynamic overrides

13 files changed, 14 insertions, 17 deletions

diff --git a/build/build.scala b/build/build.scala
index 50f5164..70fc268 100644
--- a/build/build.scala
+++ b/build/build.scala
@@ -16,7 +16,7 @@ class Build(val context: Context) extends Publish{
 
   def groupId: String = "org.cvogt"
 
-  def defaultVersion: String = "0.1"
+  def version: String = "0.1"
   def name: String = "cbt"
 
   // Members declared in cbt.Publish
diff --git a/compatibility/Context.java b/compatibility/Context.java
index 0e2fff5..5e03a7b 100644
--- a/compatibility/Context.java
+++ b/compatibility/Context.java
@@ -10,7 +10,6 @@ public abstract class Context{
   public abstract String[] enabledLoggersArray();
   public abstract Long startCompat();
   public abstract Boolean cbtHasChangedCompat();
-  public abstract String versionOrNull();
   public abstract String scalaVersionOrNull(); // needed to propagate scalaVersion to dependendee builds
   public abstract ConcurrentHashMap<String,Object> permanentKeys();
   public abstract ConcurrentHashMap<Object,ClassLoader> permanentClassLoaders();
diff --git a/examples/build-info-example/build/build.scala b/examples/build-info-example/build/build.scala
index f6fc7a4..4d28598 100644
--- a/examples/build-info-example/build/build.scala
+++ b/examples/build-info-example/build/build.scala
@@ -4,8 +4,8 @@ import java.nio.file.Files._
 class Build(val context: Context) extends PackageJars{
   def name = "build-info-example"
   def groupId = "cbt.examples"
-  def defaultVersion = "0.1"
   override def defaultScalaVersion = "2.11.8"
+  def version = "0.1"
   override def compile = {
     val file = (projectDirectory ++ "/BuildInfo.scala").toPath
     val contents = s"""// generated file
diff --git a/examples/sonatype-release-example/build/build.scala b/examples/sonatype-release-example/build/build.scala
index 6af452d..a3d19b9 100644
--- a/examples/sonatype-release-example/build/build.scala
+++ b/examples/sonatype-release-example/build/build.scala
@@ -4,7 +4,7 @@ import cbt._
 
 class Build(val context: Context) extends SonatypeRelease {
   def groupId: String = "com.github.rockjam"
-  def defaultVersion: String = "0.0.15"
+  def version: String = "0.0.15"
   def name: String = "cbt-sonatype"
 
   def description: String = "Plugin for CBT to release artifacts to sonatype OSS"
diff --git a/plugins/essentials/PublishDynamic.scala b/plugins/essentials/PublishDynamic.scala
new file mode 100644
index 0000000..83cdeb1
--- /dev/null
+++ b/plugins/essentials/PublishDynamic.scala
@@ -0,0 +1,8 @@
+package cbt
+
+trait PublishDynamic extends Publish with DynamicOverrides{
+  def publishSnapshotLocal: Unit =
+    newBuild[PublishDynamic]{"""
+      override def version = super.version ++ "-SNAPSHOT"
+    """}.publishLocal
+}
diff --git a/stage1/ContextImplementation.scala b/stage1/ContextImplementation.scala
index c3f25fd..152e606 100644
--- a/stage1/ContextImplementation.scala
+++ b/stage1/ContextImplementation.scala
@@ -10,7 +10,6 @@ case class ContextImplementation(
   enabledLoggersArray: Array[String],
   startCompat: Long,
   cbtHasChangedCompat: Boolean,
-  versionOrNull: String,
   scalaVersionOrNull: String,
   permanentKeys: ConcurrentHashMap[String,AnyRef],
   permanentClassLoaders: ConcurrentHashMap[AnyRef,ClassLoader],
diff --git a/stage1/cbt.scala b/stage1/cbt.scala
index 08394f0..c08a5f3 100644
--- a/stage1/cbt.scala
+++ b/stage1/cbt.scala
@@ -62,7 +62,6 @@ object `package`{
     def args: Seq[String] = argsArray.to
     def enabledLoggers: Set[String] = enabledLoggersArray.to
     def scalaVersion = Option(scalaVersionOrNull)
-    def version = Option(versionOrNull)
     def parentBuild = Option(parentBuildOrNull)
     def start: scala.Long = startCompat
     def cbtHasChanged: scala.Boolean = cbtHasChangedCompat
@@ -72,7 +71,6 @@ object `package`{
       args: Seq[String] = args,
       enabledLoggers: Set[String] = enabledLoggers,
       cbtHasChanged: Boolean = cbtHasChanged,
-      version: Option[String] = version,
       scalaVersion: Option[String] = scalaVersion,
       cache: File = cache,
       cbtHome: File = cbtHome,
@@ -84,7 +82,6 @@ object `package`{
       enabledLoggers.to,
       startCompat,
       cbtHasChangedCompat,
-      version.getOrElse(null),
       scalaVersion.getOrElse(null),
       permanentKeys,
       permanentClassLoaders,
diff --git a/stage2/PackageJars.scala b/stage2/PackageJars.scala
index a101993..ff89284 100644
--- a/stage2/PackageJars.scala
+++ b/stage2/PackageJars.scala
@@ -5,8 +5,7 @@ import java.io.File
 trait PackageJars extends BaseBuild with ArtifactInfo{
   def name: String
   def artifactId = name
-  def defaultVersion: String
-  final def version = context.version getOrElse defaultVersion
+  def version: String
   def `package`: Seq[File] = lib.concurrently( enableConcurrency )(
     Seq(() => jar, () => docJar, () => srcJar)
   )( _() ).flatten
diff --git a/stage2/Publish.scala b/stage2/Publish.scala
index 7e00620..c4c6a48 100644
--- a/stage2/Publish.scala
+++ b/stage2/Publish.scala
@@ -40,9 +40,6 @@ trait Publish extends PackageJars{
   def publishLocal: Unit =
     lib.publishLocal( sourceFiles, `package` :+ pom, context.paths.mavenCache, releaseFolder )
 
-  def publishSnapshotLocal: Unit =
-    copy( context.copy(version = Some(version+"-SNAPSHOT")) ).publishLocal
-
   def isSnapshot: Boolean = version.endsWith("-SNAPSHOT")
 
   override def copy(context: Context) = super.copy(context).asInstanceOf[Publish]
diff --git a/stage2/Stage2.scala b/stage2/Stage2.scala
index d585cd0..34128ac 100644
--- a/stage2/Stage2.scala
+++ b/stage2/Stage2.scala
@@ -36,7 +36,6 @@ object Stage2 extends Stage2Base{
       logger.start,
       args.cbtHasChanged,
       null,
-      null,
       args.permanentKeys,
       args.permanentClassLoaders,
       new java.util.concurrent.ConcurrentHashMap,
diff --git a/test/library-test/build/build.scala b/test/library-test/build/build.scala
index 625f357..4f0fcbd 100644
--- a/test/library-test/build/build.scala
+++ b/test/library-test/build/build.scala
@@ -3,7 +3,7 @@ import cbt._
 // cbt:https://github.com/cvogt/cbt.git#0fcdda6062c4e2720f602d976d85961970f44fa0
 class Build(val context: Context) extends BaseBuild with PackageJars{
   def groupId = "cbt.test"
-  def defaultVersion = "0.1"
+  def version = "0.1"
   def name = "library-test"
 
   override def dependencies =
diff --git a/test/simple-fixed-cbt/build/build.scala b/test/simple-fixed-cbt/build/build.scala
index 632ddb4..5fd38b1 100644
--- a/test/simple-fixed-cbt/build/build.scala
+++ b/test/simple-fixed-cbt/build/build.scala
@@ -9,6 +9,6 @@ class Build(val context: cbt.Context) extends PackageJars{
     MavenDependency("com.spotify", "missinglink-core", "0.1.1")
   )
   def groupId: String = "cbt.test"
-  def defaultVersion: String = "0.1"
+  def version: String = "0.1"
   def name: String = "simple-fixed-cbt"
 }
\ No newline at end of file
diff --git a/test/test.scala b/test/test.scala
index 60f3c90..5c8ec8f 100644
--- a/test/test.scala
+++ b/test/test.scala
@@ -115,7 +115,6 @@ object Main{
         start,
         cbtHasChanged,
         null,
-        null,
         new ConcurrentHashMap[String,AnyRef],
         new ConcurrentHashMap[AnyRef,ClassLoader],
         new java.util.concurrent.ConcurrentHashMap[AnyRef,AnyRef],