Skip to content

Commit f9a9328

Browse files
committed
Use dotty sbt plugin
1 parent 40df7b4 commit f9a9328

File tree

2 files changed

+13
-25
lines changed

2 files changed

+13
-25
lines changed

project/Build.scala

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25,30 +25,17 @@ object ScalariformBuild extends Build {
2525
organization := "org.scalariform",
2626
profileName := "org.scalariform",
2727
version := "0.2.0-SNAPSHOT",
28-
scalaVersion := "2.11.7",
28+
scalaVersion := "0.1-SNAPSHOT",
29+
scalaBinaryVersion := "2.11",
30+
autoScalaLibrary := false,
31+
scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-bridge" % "0.1-SNAPSHOT" % "component").sources(),
2932
crossScalaVersions := Seq(
3033
"2.11.7",
3134
"2.10.6",
3235
"2.9.3", "2.9.2" //"2.9.1-1", "2.9.1", "2.9.0-1", "2.9.0"
3336
),
3437
exportJars := true, // Needed for cli oneJar
35-
scalacOptions ++= (scalaBinaryVersion.value match {
36-
case "2.11" => Seq(
37-
"-deprecation:false",
38-
"-encoding", "UTF-8",
39-
"-feature",
40-
"-language:_",
41-
"-unchecked",
42-
"-Xlint",
43-
"-Xfuture",
44-
"-Xfatal-warnings",
45-
"-Yno-adapted-args",
46-
"-Ywarn-dead-code",
47-
"-Ywarn-unused-import",
48-
"-Ywarn-unused"
49-
)
50-
case _ => Seq()
51-
})
38+
scalacOptions ++= Seq("-language:Scala2")
5239
)
5340

5441
lazy val subprojectSettings = commonSettings ++ Seq(
@@ -64,17 +51,18 @@ object ScalariformBuild extends Build {
6451
}
6552

6653
def getScalaTestDependency(scalaVersion: String) = scalaVersion match {
67-
case r"2.11.\d+[-\w]*" | r"2.10.\d+[-\w]*" => "org.scalatest" %% "scalatest" % "2.2.4" % "test"
68-
case "2.9.3" => "org.scalatest" %% "scalatest" % "1.9.1" % "test"
69-
case _ => "org.scalatest" %% "scalatest" % "1.7.2" % "test"
54+
case _ => "org.scalatest" %% "scalatest" % "2.2.4" % "test"
55+
//case "2.9.3" => "org.scalatest" %% "scalatest" % "1.9.1" % "test"
56+
//case _ => "org.scalatest" %% "scalatest" % "1.7.2" % "test"
7057
}
7158

7259
def get2_11Dependencies(scalaVersion: String): List[ModuleID] = scalaVersion match {
73-
case r"2.11.\d+[-\w]*" => List(
60+
case _ => List(
7461
"org.scala-lang.modules" %% "scala-xml" % "1.0.1",
75-
"org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.1"
62+
"org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.1",
63+
"org.scala-lang" % "scala-library" % "2.11.5"
7664
)
77-
case _ => Nil
65+
// case _ => Nil
7866
}
7967

8068
def publishSettings(projectName: String) = Seq(

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.9
1+
sbt.version=0.13.10-RC1

0 commit comments

Comments
 (0)