diff options
author | Christopher Vogt <oss.nsp@cvogt.org> | 2016-04-07 01:50:26 -0400 |
---|---|---|
committer | Christopher Vogt <oss.nsp@cvogt.org> | 2016-04-07 02:01:03 -0400 |
commit | d915335f32f89a18cec097159f39334fe2bcde0d (patch) | |
tree | 57934fe60308864fd247c24d74ab7bf55e638cc8 /stage2/PackageBuild.scala | |
parent | 0ef27a7d8cabd0dfe4009b09481566d3d02a76c6 (diff) | |
download | cbt-d915335f32f89a18cec097159f39334fe2bcde0d.tar.gz cbt-d915335f32f89a18cec097159f39334fe2bcde0d.tar.bz2 cbt-d915335f32f89a18cec097159f39334fe2bcde0d.zip |
cross building and automatic snaphot ids
Adds support for cross building for multiple scala versions
And for automatically appending -SNAPSHOT to the id, when publishing a snapshot.
Diffstat (limited to 'stage2/PackageBuild.scala')
-rw-r--r-- | stage2/PackageBuild.scala | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/stage2/PackageBuild.scala b/stage2/PackageBuild.scala index 79e54a7..d24bf38 100644 --- a/stage2/PackageBuild.scala +++ b/stage2/PackageBuild.scala @@ -2,23 +2,25 @@ package cbt import java.io.File import scala.collection.immutable.Seq abstract class PackageBuild(context: Context) extends BasicBuild(context) with ArtifactInfo{ + def defaultVersion: String + final def version = context.version getOrElse defaultVersion def `package`: Seq[File] = lib.concurrently( enableConcurrency )( Seq(() => jar, () => docJar, () => srcJar) )( _() ).flatten private object cacheJarBasicBuild extends Cache[Option[File]] def jar: Option[File] = cacheJarBasicBuild{ - compile.flatMap( lib.jar( artifactId, version, _, jarTarget ) ) + compile.flatMap( lib.jar( artifactId, scalaMajorVersion, version, _, jarTarget ) ) } private object cacheSrcJarBasicBuild extends Cache[Option[File]] def srcJar: Option[File] = cacheSrcJarBasicBuild{ - lib.srcJar( sourceFiles, artifactId, version, scalaTarget ) + lib.srcJar( sourceFiles, artifactId, scalaMajorVersion, version, scalaTarget ) } private object cacheDocBasicBuild extends Cache[Option[File]] def docJar: Option[File] = cacheDocBasicBuild{ - lib.docJar( scalaVersion, sourceFiles, dependencyClasspath, apiTarget, jarTarget, artifactId, version, scalacOptions, context.classLoaderCache ) + lib.docJar( scalaVersion, sourceFiles, dependencyClasspath, apiTarget, jarTarget, artifactId, scalaMajorVersion, version, scalacOptions, context.classLoaderCache ) } override def jars = jar.toVector ++ dependencyJars |