diff options
| author | Christopher Vogt <oss.nsp@cvogt.org> | 2016-11-09 21:55:24 -0500 |
|---|---|---|
| committer | Christopher Vogt <oss.nsp@cvogt.org> | 2016-11-09 21:55:24 -0500 |
| commit | bf4e2c5971adadf4506cacb22094225ceae5a8c1 (patch) | |
| tree | 8bde570d7d2810a65a74d934ed4b9422ec4e4370 /stage2 | |
| parent | f2909954253e3976d8f3e8eaaa0e5259f426f727 (diff) | |
| download | cbt-bf4e2c5971adadf4506cacb22094225ceae5a8c1.tar.gz cbt-bf4e2c5971adadf4506cacb22094225ceae5a8c1.tar.bz2 cbt-bf4e2c5971adadf4506cacb22094225ceae5a8c1.zip | |
Remove version from context, we can now use dynamic overrides
Diffstat (limited to 'stage2')
| -rw-r--r-- | stage2/PackageJars.scala | 3 | ||||
| -rw-r--r-- | stage2/Publish.scala | 3 | ||||
| -rw-r--r-- | stage2/Stage2.scala | 1 |
3 files changed, 1 insertions, 6 deletions
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, |