diff options
Diffstat (limited to 'examples')
-rw-r--r-- | examples/build-info-example/build/build.scala | 2 | ||||
-rw-r--r-- | examples/scalajs-plain-example/js/build/build.scala | 4 | ||||
-rw-r--r-- | examples/scalajs-react-example/js/build/build.scala | 4 | ||||
-rw-r--r-- | examples/scalatest-example/build/build.scala | 11 | ||||
-rw-r--r-- | examples/uber-jar-example/README.md | 2 | ||||
-rw-r--r-- | examples/uber-jar-example/build/build.scala | 4 |
6 files changed, 16 insertions, 11 deletions
diff --git a/examples/build-info-example/build/build.scala b/examples/build-info-example/build/build.scala index 4d28598..b5ea86b 100644 --- a/examples/build-info-example/build/build.scala +++ b/examples/build-info-example/build/build.scala @@ -2,7 +2,7 @@ import cbt._ import java.nio.file.Files._ class Build(val context: Context) extends PackageJars{ - def name = "build-info-example" + override def name = "build-info-example" def groupId = "cbt.examples" override def defaultScalaVersion = "2.11.8" def version = "0.1" diff --git a/examples/scalajs-plain-example/js/build/build.scala b/examples/scalajs-plain-example/js/build/build.scala index 06e4876..4c251cd 100644 --- a/examples/scalajs-plain-example/js/build/build.scala +++ b/examples/scalajs-plain-example/js/build/build.scala @@ -1,6 +1,6 @@ import cbt._ class Build(val context: Context) extends ScalaJsBuild{ - override def projectName = "my-project" + override def name = "my-project" override def sources = super.sources ++ Seq( projectDirectory.getParentFile ++ "/shared" @@ -14,5 +14,5 @@ class Build(val context: Context) extends ScalaJsBuild{ ) override def scalaJsTargetFile = - projectDirectory.getParentFile ++ ("/server/public/generated/" ++ projectName ++ ".js") + projectDirectory.getParentFile ++ ("/server/public/generated/" ++ name ++ ".js") } diff --git a/examples/scalajs-react-example/js/build/build.scala b/examples/scalajs-react-example/js/build/build.scala index 6db866b..d8e8c16 100644 --- a/examples/scalajs-react-example/js/build/build.scala +++ b/examples/scalajs-react-example/js/build/build.scala @@ -1,6 +1,6 @@ import cbt._ class Build(val context: Context) extends ScalaJsBuild{ - override def projectName = "my-project" + override def name = "my-project" override def sources = super.sources ++ Seq( projectDirectory.getParentFile ++ "/shared" @@ -17,5 +17,5 @@ class Build(val context: Context) extends ScalaJsBuild{ ) override def scalaJsTargetFile = - projectDirectory.getParentFile ++ ("/server/public/generated/" ++ projectName ++ ".js") + projectDirectory.getParentFile ++ ("/server/public/generated/" ++ name ++ ".js") } diff --git a/examples/scalatest-example/build/build.scala b/examples/scalatest-example/build/build.scala index 48248fd..2c0ec21 100644 --- a/examples/scalatest-example/build/build.scala +++ b/examples/scalatest-example/build/build.scala @@ -1,9 +1,14 @@ import cbt._ class Build(val context: Context) extends SbtLayoutMain { outer => - override def test: Option[ExitCode] = Some{ + /* FIXME: calling `cbt rt` for `examples/scalatest-example` leads to +java.lang.Exception: This should never happend. Could not find (org.scala-lang,scala-reflect) in +(org.scala-lang,scala-library) -> BoundMavenDependency(1488121318000,cbt/cache/maven,MavenDependency(org.scala-lang,scala-library,2.11.8,Classifier(None)),Vector(https://repo1.maven.org/maven2)) + at cbt.Stage1Lib$$anonfun$actual$1.apply(Stage1Lib.scala:425) + */ + override def test: Dependency = { new BasicBuild(context) with ScalaTest with SbtLayoutTest{ override def dependencies = outer +: super.dependencies - }.run - } + } + } } diff --git a/examples/uber-jar-example/README.md b/examples/uber-jar-example/README.md index 2460084..e4f8da0 100644 --- a/examples/uber-jar-example/README.md +++ b/examples/uber-jar-example/README.md @@ -4,7 +4,7 @@ This example shows how to build uber jar(aka fat jar) with `UberJar` plugin. In order to create uber jar: execute `cbt uberJar`. Produced jar will be in target folder. -By default, jar name is your `cbt projectName`, you can provide other name via overriding `uberJarName` task. +By default, jar name is your `cbt name`, you can provide other name via overriding `uberJarName` task. By default, main class is `Main`. You can provide custom main class via overriding `uberJarMainClass` task. diff --git a/examples/uber-jar-example/build/build.scala b/examples/uber-jar-example/build/build.scala index fec58ae..181098f 100644 --- a/examples/uber-jar-example/build/build.scala +++ b/examples/uber-jar-example/build/build.scala @@ -2,7 +2,7 @@ import cbt._ class Build(val context: Context) extends BaseBuild with UberJar { - override def projectName: String = "uber-jar-example" + override def name: String = "uber-jar-example" override def dependencies = super.dependencies ++ Resolver( mavenCentral ).bind( @@ -11,6 +11,6 @@ class Build(val context: Context) extends BaseBuild with UberJar { ScalaDependency("org.typelevel", "cats", "0.6.0") ) - override def uberJarName = projectName + "-0.0.1" + ".jar" + override def uberJarName = name + "-0.0.1" + ".jar" } |