This repository was archived by the owner on Sep 8, 2022. It is now read-only.
File tree Expand file tree Collapse file tree 6 files changed +15
-111
lines changed
src/main/scala/scala/tools/partest/utils Expand file tree Collapse file tree 6 files changed +15
-111
lines changed Original file line number Diff line number Diff line change 1
- import VersionKeys . _
1
+ scalaModuleSettings
2
2
3
- organization := " org.scala-lang.modules"
3
+ // To facilitate scripted build of all modules (while we're working on getting dbuild up and running)
4
+ val scalaXmlVersion = sbt.settingKey[String ](" Version to use for the scala-xml dependency." )
4
5
5
- name := " scala-partest "
6
+ val scalaCheckVersion = sbt.settingKey[ String ]( " Version to use for the scalacheck dependency. " )
6
7
7
- version := " 1.0.0-SNAPSHOT "
8
+ name := " scala-partest "
8
9
9
- scalaVersion := " 2.11 .0-M7 "
10
+ version := " 1.0 .0-SNAPSHOT "
10
11
11
- scalaXmlVersion := " 1.0 .0-RC7 "
12
+ scalaVersion := " 2.11 .0-M8 "
12
13
13
- scalaCheckVersion := " 1.11.1"
14
+ scalaXmlVersion := " 1.0.0-RC7"
15
+
16
+ scalaCheckVersion := " 1.11.3"
14
17
15
18
// used as binary version when compiling against 2.11.0-SNAPSHOT
16
- snapshotScalaBinaryVersion := " 2.11.0-M7 "
19
+ snapshotScalaBinaryVersion := " 2.11.0-M8 "
17
20
18
21
// TODO: enable "-Xfatal-warnings" for nightlies,
19
22
// off by default because we don't want to break scala/scala pr validation due to deprecation
@@ -41,5 +44,3 @@ libraryDependencies += "org.scala-lang" % "scalap" % sca
41
44
libraryDependencies += " org.scala-lang" % " scala-reflect" % scalaVersion.value % " provided" intransitive()
42
45
43
46
libraryDependencies += " org.scala-lang" % " scala-compiler" % scalaVersion.value % " provided" intransitive()
44
-
45
- // the boilerplate is in standard.sbt
Original file line number Diff line number Diff line change 1
- # "0.13.+" breaks plugin resolution
2
- sbt.version =0.13.0
1
+ sbt.version =0.13.1
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 1
- resolvers += Classpaths .typesafeResolver
2
-
3
- // addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.5")
4
-
5
- addSbtPlugin(" com.typesafe.sbteclipse" % " sbteclipse-plugin" % " 2.2.0" )
6
-
7
- addSbtPlugin(" com.typesafe.sbt" % " sbt-pgp" % " 0.8.1" )
1
+ addSbtPlugin(" org.scala-lang.modules" % " scala-module-plugin" % " 1.0.1" )
Original file line number Diff line number Diff line change 10
10
package scala .tools .partest
11
11
package utils
12
12
13
- /** Loads partest.properties from the jar. TODO: standardize on scala-partest.properties */
13
+ /** Loads scala- partest.properties from the jar. */
14
14
object Properties extends scala.util.PropertiesTrait {
15
- protected def propCategory = " partest"
15
+ protected def propCategory = " scala- partest"
16
16
protected def pickJarBasedOn = classOf [nest.Runner ]
17
17
override def isAvian = super .isAvian
18
18
}
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments