From 5639f40153a45c248a5b02b235164b21b9a818f7 Mon Sep 17 00:00:00 2001 From: Christopher Vogt Date: Sat, 17 Jun 2017 12:58:46 -0400 Subject: fix recursive and make cbt package jars --- build/build.scala | 2 +- internal/plugins/library/Library.scala | 5 +++-- libraries/eval/build/build.scala | 4 +++- libraries/interfaces/build/build.scala | 5 +++++ stage2/BasicBuild.scala | 2 +- 5 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 libraries/interfaces/build/build.scala diff --git a/build/build.scala b/build/build.scala index 729e6ed..f920264 100644 --- a/build/build.scala +++ b/build/build.scala @@ -4,7 +4,7 @@ import cbt_internal._ class Build(val context: Context) extends Shared with Scalariform with PublishLocal with CommandLineOverrides{ override def name: String = "cbt" - override def version: String = "0.1" + override def version: String = "0.9-SNAPSHOT" override def description: String = "Fast, intuitive Build Tool for Scala" override def inceptionYear: Int = 2015 diff --git a/internal/plugins/library/Library.scala b/internal/plugins/library/Library.scala index 382d1fb..1a84341 100644 --- a/internal/plugins/library/Library.scala +++ b/internal/plugins/library/Library.scala @@ -3,10 +3,11 @@ import cbt._ import java.io._ import scala.concurrent._ import scala.concurrent.duration._ -trait Library extends Scalariform with GoogleJavaFormat with DynamicOverrides with AdvancedScala { +trait Library extends PackageJars with Scalariform with GoogleJavaFormat with DynamicOverrides with AdvancedScala { + def groupId = "org.cvogt" def inceptionYear: Int def description: String - def version = ??? + def version = "0.9-SNAPSHOT" override def compile = { googleJavaFormat() scalariform() diff --git a/libraries/eval/build/build.scala b/libraries/eval/build/build.scala index 29c6d6f..3d8f808 100644 --- a/libraries/eval/build/build.scala +++ b/libraries/eval/build/build.scala @@ -1,6 +1,8 @@ import cbt._ -class Build(val context: Context) extends BaseBuild{ +class Build(val context: Context) extends PackageJars{ outer => + def groupId = "org.cvogt" + def version = "0.9-SNAPSHOT" override def dependencies = super.dependencies :+ new ScalaCompilerDependency( context.cbtLastModified, context.paths.mavenCache, scalaVersion ) diff --git a/libraries/interfaces/build/build.scala b/libraries/interfaces/build/build.scala new file mode 100644 index 0000000..8c2d0ac --- /dev/null +++ b/libraries/interfaces/build/build.scala @@ -0,0 +1,5 @@ +import cbt._ +class Build(val context: Context) extends PackageJars{ + def groupId = "org.cvogt" + def version = "0.9-SNAPSHOT" +} diff --git a/stage2/BasicBuild.scala b/stage2/BasicBuild.scala index 3a9c958..66167b8 100644 --- a/stage2/BasicBuild.scala +++ b/stage2/BasicBuild.scala @@ -258,7 +258,7 @@ trait BaseBuild extends BuildInterface with DependencyImplementation with SbtDep } def recursive: ExitCode = { - recursiveUnsafe(context.args.lift(1)) + recursiveUnsafe(context.args.lift(0)) } def recursiveUnsafe(code: Option[String]): ExitCode = { -- cgit v1.2.3