Skip to content

Commit

Permalink
Upgrade Scala to 2.11.6, scalajs to 0.6.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Ludovic Claude committed Mar 25, 2015
1 parent 09d7254 commit 5d2c956
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
12 changes: 7 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
lazy val commonSettings = Seq(
organization := "biz.enef",
version := "0.2-SNAPSHOT",
scalaVersion := "2.11.5",
scalacOptions ++= Seq("-deprecation","-feature","-Xlint"),
scalaVersion := "2.11.6",
scalacOptions ++= Seq("-deprecation","-unchecked","-feature","-language:implicitConversions","-Xlint"),
autoCompilerPlugins := true,
addCompilerPlugin("com.lihaoyi" %% "acyclic" % "0.1.2"),
libraryDependencies += "com.lihaoyi" %% "acyclic" % "0.1.2" % "provided",
Expand All @@ -26,7 +26,7 @@ lazy val root = project.in(file(".")).
libraryDependencies ++= Seq(
"org.scala-lang" % "scala-reflect" % scalaVersion.value,
"org.scala-js" %%% "scalajs-dom" % "0.8.0",
"be.doeraene" %%% "scalajs-jquery" % "0.8.0"
"be.doeraene" %%% "scalajs-jquery" % "0.8.0" % "provided"
),
resolvers += Resolver.sonatypeRepo("releases")
)
Expand All @@ -42,10 +42,11 @@ lazy val tests = project.
scalaJSStage in Test := FastOptStage,
testFrameworks += new TestFramework("utest.runner.Framework"),
requiresDOM := true,
libraryDependencies += "com.lihaoyi" %%% "utest" % "0.3.0" % "test",
libraryDependencies ++= Seq("com.lihaoyi" %%% "utest" % "0.3.0" % "test",
"be.doeraene" %%% "scalajs-jquery" % "0.8.0"),
jsDependencies += RuntimeDOM,
jsDependencies += "org.webjars" % "angularjs" % "1.3.8" / "angular.min.js" % "test",
jsDependencies += "org.webjars" % "angularjs" % "1.3.8" / "angular-mocks.js" % "test"
jsDependencies += ("org.webjars" % "angularjs" % "1.3.8" / "angular-mocks.js" dependsOn "angular.min.js") % "test"
)


Expand Down Expand Up @@ -79,6 +80,7 @@ lazy val publishingSettings = Seq(
<developer>
<id>ludovicc</id>
<name>Ludovic Claude</name>
<email>ludovic.claude@laposte.net</email>
</developer>
</developers>
)
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.1")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.2")

0 comments on commit 5d2c956

Please sign in to comment.