diff options
author | Jan Christopher Vogt <oss.nsp@cvogt.org> | 2017-04-02 03:21:42 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-02 03:21:42 -0400 |
commit | 2476e2ec1100813ae4e05cf2183feff8bf5ec8ea (patch) | |
tree | a334625acfe91c0233abf57a5fb7b52f040e0846 /ports | |
parent | e7112d59b811ca4a0bda448a18e0c45cb4841abb (diff) | |
parent | c220ef8d12e77ce6af6fafde3b388fc3e334b380 (diff) | |
download | cbt-2476e2ec1100813ae4e05cf2183feff8bf5ec8ea.tar.gz cbt-2476e2ec1100813ae4e05cf2183feff8bf5ec8ea.tar.bz2 cbt-2476e2ec1100813ae4e05cf2183feff8bf5ec8ea.zip |
Merge pull request #471 from cvogt/2.12-ready
2.12 ready
Diffstat (limited to 'ports')
-rw-r--r-- | ports/migration-manager/build/build.scala | 2 | ||||
-rw-r--r-- | ports/scalariform/build/build.scala | 26 |
2 files changed, 27 insertions, 1 deletions
diff --git a/ports/migration-manager/build/build.scala b/ports/migration-manager/build/build.scala index 43b24f5..edae75f 100644 --- a/ports/migration-manager/build/build.scala +++ b/ports/migration-manager/build/build.scala @@ -3,7 +3,7 @@ import cbt._ class Build(val context: Context) extends BaseBuild{ override def dependencies = Resolver( mavenCentral ).bind( - MavenDependency( "org.scala-lang", "scala-compiler", "2.11.8" ) + MavenDependency( "org.scala-lang", "scala-compiler", scalaVersion ) ) def mima = GitDependency.checkout( "git@github.com:typesafehub/migration-manager.git", "92cbce52b4bf04ca1c338f34818ebfb9f0ebc285" diff --git a/ports/scalariform/build/build.scala b/ports/scalariform/build/build.scala new file mode 100644 index 0000000..c2ade6b --- /dev/null +++ b/ports/scalariform/build/build.scala @@ -0,0 +1,26 @@ +package migration_manager_build +import cbt._ +class Build(val context: Context) extends AdvancedScala{ outer => + override def dependencies = Seq( libraries.scala.xml, libraries.scala.parserCombinators ) + + val scalariform = GitDependency.checkout( + "https://github.com/scala-ide/scalariform.git", "f53978c60579fa834ac9e56986a6133c0a621bfd" + ) + + override def sources = Seq( + scalariform / "scalariform" / "src" / "main" / "scala" / "scalariform" + ) + + override def scalacOptions = super.scalacOptions ++ Seq( + "-language:implicitConversions", "-language:reflectiveCalls" + ) + + override def test = new BasicBuild( context ) with ScalaTest{ + override def target = outer.target / "test" + override def dependencies = super.dependencies :+ outer + override def scalacOptions = outer.scalacOptions + override def sources = Seq( + scalariform / "scalariform" / "src" / "test" / "scala" / "scalariform" + ) + } +} |