From d95f8bba6642a4cd8deeddd493afd2b71ae32ec3 Mon Sep 17 00:00:00 2001 From: Jason Zaugg Date: Mon, 5 Nov 2012 16:50:09 +0100 Subject: Expand build configuration. - Enable continuations plugin - Fill in project metadata - Enable stricter compiler options - satisfy -Xlint with some empty parens. --- build.sbt | 48 +++++++++++++++++++--- src/test/scala/scala/async/neg/SampleNegSpec.scala | 2 +- src/test/scala/scala/async/run/await0/await0.scala | 2 +- .../scala/scala/async/run/block0/AsyncSpec.scala | 4 +- src/test/scala/scala/async/run/block1/block1.scala | 2 +- .../scala/scala/async/run/ifelse0/IfElse0.scala | 2 +- .../scala/scala/async/run/ifelse1/IfElse1.scala | 8 ++-- .../scala/scala/async/run/ifelse2/ifelse2.scala | 2 +- .../scala/scala/async/run/ifelse3/IfElse3.scala | 2 +- 9 files changed, 55 insertions(+), 17 deletions(-) diff --git a/build.sbt b/build.sbt index 5048313..596b42d 100644 --- a/build.sbt +++ b/build.sbt @@ -6,9 +6,10 @@ name := "scala-async" version := "0.1-SNAPSHOT" -libraryDependencies <++= (scalaVersion){ sv => Seq( - "org.scala-lang" % "scala-reflect" % sv, - "org.scala-lang" % "scala-compiler" % sv % "test" +libraryDependencies <++= (scalaVersion) { + sv => Seq( + "org.scala-lang" % "scala-reflect" % sv, + "org.scala-lang" % "scala-compiler" % sv % "test" ) } @@ -16,5 +17,42 @@ libraryDependencies += "junit" % "junit-dep" % "4.10" % "test" libraryDependencies += "com.novocode" % "junit-interface" % "0.10-M2" % "test" -// TODO scalac / javac options -// TODO metadata +autoCompilerPlugins := true + +libraryDependencies <<= (scalaVersion, libraryDependencies) { + (ver, deps) => + deps :+ compilerPlugin("org.scala-lang.plugins" % "continuations" % ver) +} + +scalacOptions += "-P:continuations:enable" + +scalacOptions ++= Seq("-deprecation", "-unchecked", "-Xlint") + +description := "An asynchronous programminig facility for Scala, in the spirit of C# await/async" + +homepage := Some(url("http://github.com/phaller/scala-async")) + +startYear := Some(2012) + +licenses +=("Scala license", url("http://github.com/phaller/scala-async/LICENCE")) + +pomExtra := ( + + + phaller + Phillipe Haller + +1 + http://github.com/phaller + + + retronym + Jason Zaugg + +1 + http://github.com/retronym + + + + git@github.com:phaller/scala-async.git/ + scm:git:git@github.com:phaller/scala-async.git + + ) diff --git a/src/test/scala/scala/async/neg/SampleNegSpec.scala b/src/test/scala/scala/async/neg/SampleNegSpec.scala index 8825f11..c26caa9 100644 --- a/src/test/scala/scala/async/neg/SampleNegSpec.scala +++ b/src/test/scala/scala/async/neg/SampleNegSpec.scala @@ -12,7 +12,7 @@ class SampleNegSpec extends MinimalScalaTest { val f = new File("/Users/jason/code/scala-async/test/files/run/await0") @Test - def `missing symbol` { + def `missing symbol`() { intercept[ToolBoxError] { eval { """ diff --git a/src/test/scala/scala/async/run/await0/await0.scala b/src/test/scala/scala/async/run/await0/await0.scala index 77867aa..9fa8dd6 100644 --- a/src/test/scala/scala/async/run/await0/await0.scala +++ b/src/test/scala/scala/async/run/await0/await0.scala @@ -68,7 +68,7 @@ class Await0Class { class Await0Spec extends MinimalScalaTest { @Test - def `An async method support a simple await` { + def `An async method support a simple await`() { val o = new Await0Class val fut = o.m0(10) val res = Await.result(fut, 10 seconds) diff --git a/src/test/scala/scala/async/run/block0/AsyncSpec.scala b/src/test/scala/scala/async/run/block0/AsyncSpec.scala index de58bb1..230d73a 100644 --- a/src/test/scala/scala/async/run/block0/AsyncSpec.scala +++ b/src/test/scala/scala/async/run/block0/AsyncSpec.scala @@ -44,7 +44,7 @@ class Test1Class { class AsyncSpec extends MinimalScalaTest { @Test - def `simple await` { + def `simple await`() { val o = new Test1Class val fut = o.m2(10) val res = Await.result(fut, 2 seconds) @@ -52,7 +52,7 @@ class AsyncSpec extends MinimalScalaTest { } @Test - def `several awaits in sequence` { + def `several awaits in sequence`() { val o = new Test1Class val fut = o.m3(10) val res = Await.result(fut, 4 seconds) diff --git a/src/test/scala/scala/async/run/block1/block1.scala b/src/test/scala/scala/async/run/block1/block1.scala index 29890bb..caa0f18 100644 --- a/src/test/scala/scala/async/run/block1/block1.scala +++ b/src/test/scala/scala/async/run/block1/block1.scala @@ -37,7 +37,7 @@ class Test1Class { @RunWith(classOf[JUnit4]) class Block1Spec extends MinimalScalaTest { - @Test def `support a simple await` { + @Test def `support a simple await`() { val o = new Test1Class val fut = o.m4(10) val res = Await.result(fut, 2 seconds) diff --git a/src/test/scala/scala/async/run/ifelse0/IfElse0.scala b/src/test/scala/scala/async/run/ifelse0/IfElse0.scala index 2088609..d58f1ec 100644 --- a/src/test/scala/scala/async/run/ifelse0/IfElse0.scala +++ b/src/test/scala/scala/async/run/ifelse0/IfElse0.scala @@ -42,7 +42,7 @@ class TestIfElseClass { @RunWith(classOf[JUnit4]) class IfElseSpec extends MinimalScalaTest { - @Test def `support await in a simple if-else expression` { + @Test def `support await in a simple if-else expression`() { val o = new TestIfElseClass val fut = o.m2(10) val res = Await.result(fut, 2 seconds) diff --git a/src/test/scala/scala/async/run/ifelse1/IfElse1.scala b/src/test/scala/scala/async/run/ifelse1/IfElse1.scala index df528da..66909af 100644 --- a/src/test/scala/scala/async/run/ifelse1/IfElse1.scala +++ b/src/test/scala/scala/async/run/ifelse1/IfElse1.scala @@ -96,7 +96,7 @@ class TestIfElse1Class { class IfElse1Spec extends MinimalScalaTest { @Test - def `await in a nested if-else expression` { + def `await in a nested if-else expression`() { val o = new TestIfElse1Class val fut = o.m1(10) val res = Await.result(fut, 2 seconds) @@ -104,7 +104,7 @@ class IfElse1Spec extends MinimalScalaTest { } @Test - def `await in a nested if-else expression 2` { + def `await in a nested if-else expression 2`() { val o = new TestIfElse1Class val fut = o.m2(10) val res = Await.result(fut, 2 seconds) @@ -113,7 +113,7 @@ class IfElse1Spec extends MinimalScalaTest { @Test - def `await in a nested if-else expression 3` { + def `await in a nested if-else expression 3`() { val o = new TestIfElse1Class val fut = o.m3(10) val res = Await.result(fut, 2 seconds) @@ -122,7 +122,7 @@ class IfElse1Spec extends MinimalScalaTest { @Test - def `await in a nested if-else expression 4` { + def `await in a nested if-else expression 4`() { val o = new TestIfElse1Class val fut = o.m4(10) val res = Await.result(fut, 2 seconds) diff --git a/src/test/scala/scala/async/run/ifelse2/ifelse2.scala b/src/test/scala/scala/async/run/ifelse2/ifelse2.scala index d702d72..39a17f1 100644 --- a/src/test/scala/scala/async/run/ifelse2/ifelse2.scala +++ b/src/test/scala/scala/async/run/ifelse2/ifelse2.scala @@ -42,7 +42,7 @@ class TestIfElse2Class { class IfElse2Spec extends MinimalScalaTest { @Test - def `variables of the same name in different blocks` { + def `variables of the same name in different blocks`() { val o = new TestIfElse2Class val fut = o.m(10) val res = Await.result(fut, 2 seconds) diff --git a/src/test/scala/scala/async/run/ifelse3/IfElse3.scala b/src/test/scala/scala/async/run/ifelse3/IfElse3.scala index cac646a..4b66f4d 100644 --- a/src/test/scala/scala/async/run/ifelse3/IfElse3.scala +++ b/src/test/scala/scala/async/run/ifelse3/IfElse3.scala @@ -45,7 +45,7 @@ class TestIfElse3Class { class IfElse3Spec extends MinimalScalaTest { @Test - def `variables of the same name in different blocks` { + def `variables of the same name in different blocks`() { val o = new TestIfElse3Class val fut = o.m(10) val res = Await.result(fut, 2 seconds) -- cgit v1.2.3