Skip to content

Commit bdc2999

Browse files
committed
Update to Play 2.0.2 and js.scala 0.2-SNAPSHOT
1 parent 6962c18 commit bdc2999

File tree

7 files changed

+17
-23
lines changed

7 files changed

+17
-23
lines changed

core/build.sbt

+11-17
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,9 @@ name := "play-js-validation"
22

33
organization := "EPFL"
44

5-
version := "0.1"
6-
7-
//--- Local Scala
8-
9-
scalaHome <<= baseDirectory { f =>
10-
//val scalaVirtualizedHome = SettingKey[File]("scala-virtualized-home","Location of local Scala virtualized checkout")
11-
val props = new java.util.Properties()
12-
IO.load(props, f / "local.properties")
13-
val x = props.getProperty("scala.virtualized.home")
14-
if (x == null)
15-
sys.error("Did you forget to set scala.virtualized.home property in local.properties file?")
16-
else Some(file(x))
17-
}
18-
19-
scalaVersion := "2.10.0-virtualized-SNAPSHOT"
5+
version := "0.2-SNAPSHOT"
206

21-
scalacOptions <+= scalaHome map (_.map(f => "-Xplugin:"+f+"/misc/scala-devel/plugins/continuations.jar").get)
7+
scalaVersion := Option(System.getenv("SCALA_VIRTUALIZED_VERSION")).getOrElse("2.10.0-M1-virtualized")
228

239
//--- Dependencies
2410

@@ -30,7 +16,7 @@ resolvers ++= Seq(
3016

3117
libraryDependencies ++= Seq(
3218
"org.scalatest" % "scalatest_2.10.0-virtualized-SNAPSHOT" % "1.6.1-SNAPSHOT" % "test",
33-
"EPFL" % "lms-sandbox_2.10.0-virtualized-SNAPSHOT" % "0.1")
19+
"EPFL" %% "js-scala" % "0.2-SNAPSHOT")
3420

3521
//--- End of Dependencies
3622

@@ -42,3 +28,11 @@ parallelExecution in Test := false
4228
// disable publishing of main docs
4329
publishArtifact in (Compile, packageDoc) := false
4430

31+
// continuations
32+
autoCompilerPlugins := true
33+
34+
libraryDependencies <<= (scalaVersion, libraryDependencies) { (ver, deps) =>
35+
deps :+ compilerPlugin("org.scala-lang.plugins" % "continuations" % ver)
36+
}
37+
38+
scalacOptions += "-P:continuations:enable"

samples/forms/project/Build.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ object ApplicationBuild extends Build {
88
val appVersion = "1.0"
99

1010
val appDependencies = Seq(
11-
"EPFL" % "play-js-validation_2.10.0-virtualized-SNAPSHOT" % "0.1"
11+
"EPFL" %% "play-js-validation" % "0.2-SNAPSHOT"
1212
)
1313

1414
val main = PlayProject(appName, appVersion, appDependencies, mainLang = SCALA).settings(
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.11.2
1+
sbt.version=0.11.3

samples/mini-forms/project/Build.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ object ApplicationBuild extends Build {
88
val appVersion = "1.0"
99

1010
val appDependencies = Seq(
11-
"EPFL" % "play-js-validation_2.10.0-virtualized-SNAPSHOT" % "0.1"
11+
"EPFL" %% "play-js-validation" % "0.2-SNAPSHOT"
1212
)
1313

1414
val main = PlayProject(appName, appVersion, appDependencies, mainLang = SCALA).settings(
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.11.2
1+
sbt.version=0.11.3

samples/mini/project/Build.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ object ApplicationBuild extends Build {
88
val appVersion = "1.0-SNAPSHOT"
99

1010
val appDependencies = Seq(
11-
"EPFL" % "play-js-validation_2.10.0-virtualized-SNAPSHOT" % "0.1"
11+
"EPFL" %% "play-js-validation" % "0.2-SNAPSHOT"
1212
)
1313

1414
val main = PlayProject(appName, appVersion, appDependencies, mainLang = SCALA).settings(

samples/mini/project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.11.2
1+
sbt.version=0.11.3

0 commit comments

Comments
 (0)