52
52
53
53
val bootstrapScalaVersion = " 2.11.5"
54
54
55
+ def withoutScalaLang (moduleId : ModuleID ): ModuleID = moduleId exclude(" org.scala-lang" , " *" )
56
+
55
57
// exclusion of the scala-library transitive dependency avoids eviction warnings during `update`.
56
- val scalaParserCombinatorsDep = " org.scala-lang.modules" %% " scala-parser-combinators" % versionNumber(" scala-parser-combinators" ) exclude( " org.scala-lang " , " scala-library " )
57
- val scalaXmlDep = " org.scala-lang.modules" %% " scala-xml" % versionNumber(" scala-xml" ) exclude( " org.scala-lang " , " scala-library " )
58
- val partestDep = " org.scala-lang.modules" %% " scala-partest" % versionNumber(" partest" ) exclude( " org.scala-lang " , " scala-library " )
59
- val partestInterfaceDep = " org.scala-lang.modules" %% " scala-partest-interface" % " 0.5.0" exclude( " org.scala-lang " , " scala-library " )
58
+ val scalaParserCombinatorsDep = withoutScalaLang( " org.scala-lang.modules" %% " scala-parser-combinators" % versionNumber(" scala-parser-combinators" ))
59
+ val scalaXmlDep = withoutScalaLang( " org.scala-lang.modules" %% " scala-xml" % versionNumber(" scala-xml" ))
60
+ val partestDep = withoutScalaLang( " org.scala-lang.modules" %% " scala-partest" % versionNumber(" partest" ))
61
+ val partestInterfaceDep = withoutScalaLang( " org.scala-lang.modules" %% " scala-partest-interface" % " 0.5.0" )
60
62
val junitDep = " junit" % " junit" % " 4.11"
61
63
val junitIntefaceDep = " com.novocode" % " junit-interface" % " 0.11" % " test"
62
64
val jlineDep = " jline" % " jline" % versionProps(" jline.version" )
63
65
val antDep = " org.apache.ant" % " ant" % " 1.9.4"
64
- val scalacheckDep = " org.scalacheck" %% " scalacheck" % " 1.11.4" exclude( " org.scala-lang " , " scala-library " )
66
+ val scalacheckDep = withoutScalaLang( " org.scalacheck" %% " scalacheck" % " 1.11.4" )
65
67
66
68
lazy val commonSettings = clearSourceAndResourceDirectories ++ Seq [Setting [_]](
67
69
organization := " org.scala-lang" ,
@@ -181,10 +183,6 @@ lazy val compiler = configureAsSubproject(project)
181
183
182
184
lazy val interactive = configureAsSubproject(project)
183
185
.settings(disableDocsAndPublishingTasks : _* )
184
- .settings(
185
- scalaVersion := bootstrapScalaVersion,
186
- ivyScala := ivyScala.value map { _.copy(overrideScalaVersion = true ) }
187
- )
188
186
.dependsOn(compiler)
189
187
190
188
lazy val repl = configureAsSubproject(project)
@@ -217,8 +215,6 @@ lazy val partestExtras = configureAsSubproject(Project("partest-extras", file(".
217
215
.dependsOn(repl)
218
216
.settings(clearSourceAndResourceDirectories : _* )
219
217
.settings(
220
- scalaVersion := bootstrapScalaVersion,
221
- ivyScala := ivyScala.value map { _.copy(overrideScalaVersion = true ) },
222
218
libraryDependencies += partestDep,
223
219
unmanagedSourceDirectories in Compile := List (baseDirectory.value)
224
220
)
@@ -228,8 +224,6 @@ lazy val junit = project.in(file("test") / "junit")
228
224
.settings(clearSourceAndResourceDirectories : _* )
229
225
.settings(commonSettings : _* )
230
226
.settings(
231
- scalaVersion := bootstrapScalaVersion,
232
- ivyScala := ivyScala.value map { _.copy(overrideScalaVersion = true ) },
233
227
fork in Test := true ,
234
228
libraryDependencies ++= Seq (junitDep, junitIntefaceDep),
235
229
testOptions += Tests .Argument (TestFrameworks .JUnit , " -a" , " -v" ),
@@ -243,8 +237,6 @@ lazy val partestJavaAgent = (project in file(".") / "src" / "partest-javaagent")
243
237
doc := file(" !!! NO DOCS !!!" ),
244
238
publishLocal := {},
245
239
publish := {},
246
- scalaVersion := bootstrapScalaVersion,
247
- ivyScala := ivyScala.value map { _.copy(overrideScalaVersion = true ) },
248
240
// Setting name to "scala-partest-javaagent" so that the jar file gets that name, which the Runner relies on
249
241
name := " scala-partest-javaagent" ,
250
242
// writing jar file to $buildDirectory/pack/lib because that's where it's expected to be found
@@ -263,8 +255,6 @@ lazy val test = project.
263
255
settings(commonSettings : _* ).
264
256
settings(Defaults .itSettings: _* ).
265
257
settings(
266
- scalaVersion := bootstrapScalaVersion,
267
- ivyScala := ivyScala.value map { _.copy(overrideScalaVersion = true ) },
268
258
libraryDependencies ++= Seq (partestDep, scalaXmlDep, partestInterfaceDep, scalacheckDep),
269
259
unmanagedBase in Test := baseDirectory.value / " files" / " lib" ,
270
260
unmanagedJars in Test <+= (unmanagedBase) (j => Attributed .blank(j)) map(identity),
@@ -291,8 +281,6 @@ lazy val test = project.
291
281
lazy val root = (project in file(" ." )).
292
282
aggregate(library, forkjoin, reflect, compiler, asm, interactive, repl,
293
283
scaladoc, scalap, actors, partestExtras, junit).settings(
294
- scalaVersion := bootstrapScalaVersion,
295
- ivyScala := ivyScala.value map { _.copy(overrideScalaVersion = true ) },
296
284
sources in Compile := Seq .empty,
297
285
onLoadMessage := """ |*** Welcome to the sbt build definition for Scala! ***
298
286
|This build definition has an EXPERIMENTAL status. If you are not
0 commit comments