From d915335f32f89a18cec097159f39334fe2bcde0d Mon Sep 17 00:00:00 2001 From: Christopher Vogt Date: Thu, 7 Apr 2016 01:50:26 -0400 Subject: 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. --- stage2/PackageBuild.scala | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'stage2/PackageBuild.scala') 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 -- cgit v1.2.3