Skip to content
This repository was archived by the owner on Sep 8, 2022. It is now read-only.

Commit c3f7cfa

Browse files
committed
Switch to scala-module-plugin, sbt 0.13.1
1 parent cfb110c commit c3f7cfa

File tree

6 files changed

+15
-111
lines changed

6 files changed

+15
-111
lines changed

build.sbt

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
1-
import VersionKeys._
1+
scalaModuleSettings
22

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.")
45

5-
name := "scala-partest"
6+
val scalaCheckVersion = sbt.settingKey[String]("Version to use for the scalacheck dependency.")
67

7-
version := "1.0.0-SNAPSHOT"
8+
name := "scala-partest"
89

9-
scalaVersion := "2.11.0-M7"
10+
version := "1.0.0-SNAPSHOT"
1011

11-
scalaXmlVersion := "1.0.0-RC7"
12+
scalaVersion := "2.11.0-M8"
1213

13-
scalaCheckVersion := "1.11.1"
14+
scalaXmlVersion := "1.0.0-RC7"
15+
16+
scalaCheckVersion := "1.11.3"
1417

1518
// used as binary version when compiling against 2.11.0-SNAPSHOT
16-
snapshotScalaBinaryVersion := "2.11.0-M7"
19+
snapshotScalaBinaryVersion := "2.11.0-M8"
1720

1821
// TODO: enable "-Xfatal-warnings" for nightlies,
1922
// 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
4144
libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value % "provided" intransitive()
4245

4346
libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value % "provided" intransitive()
44-
45-
// the boilerplate is in standard.sbt

project/build.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
# "0.13.+" breaks plugin resolution
2-
sbt.version=0.13.0
1+
sbt.version=0.13.1

project/keys.scala

Lines changed: 0 additions & 15 deletions
This file was deleted.

project/plugins.sbt

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1 @@
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")

src/main/scala/scala/tools/partest/utils/Properties.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
package scala.tools.partest
1111
package utils
1212

13-
/** Loads partest.properties from the jar. TODO: standardize on scala-partest.properties */
13+
/** Loads scala-partest.properties from the jar. */
1414
object Properties extends scala.util.PropertiesTrait {
15-
protected def propCategory = "partest"
15+
protected def propCategory = "scala-partest"
1616
protected def pickJarBasedOn = classOf[nest.Runner]
1717
override def isAvian = super.isAvian
1818
}

standard.sbt

Lines changed: 0 additions & 75 deletions
This file was deleted.

0 commit comments

Comments
 (0)