@@ -25,30 +25,17 @@ object ScalariformBuild extends Build {
25
25
organization := " org.scalariform" ,
26
26
profileName := " org.scalariform" ,
27
27
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(),
29
32
crossScalaVersions := Seq (
30
33
" 2.11.7" ,
31
34
" 2.10.6" ,
32
35
" 2.9.3" , " 2.9.2" // "2.9.1-1", "2.9.1", "2.9.0-1", "2.9.0"
33
36
),
34
37
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" )
52
39
)
53
40
54
41
lazy val subprojectSettings = commonSettings ++ Seq (
@@ -64,17 +51,18 @@ object ScalariformBuild extends Build {
64
51
}
65
52
66
53
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"
70
57
}
71
58
72
59
def get2_11Dependencies (scalaVersion : String ): List [ModuleID ] = scalaVersion match {
73
- case r " 2.11. \d +[- \w ]* " => List (
60
+ case _ => List (
74
61
" 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"
76
64
)
77
- case _ => Nil
65
+ // case _ => Nil
78
66
}
79
67
80
68
def publishSettings (projectName : String ) = Seq (
0 commit comments