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

Switch to scala-module-plugin, sbt 0.13.1 #15

Merged
merged 1 commit into from
Jan 27, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
import VersionKeys._
scalaModuleSettings

organization := "org.scala-lang.modules"
// To facilitate scripted build of all modules (while we're working on getting dbuild up and running)
val scalaXmlVersion = sbt.settingKey[String]("Version to use for the scala-xml dependency.")

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

version := "1.0.0-SNAPSHOT"
name := "scala-partest"

scalaVersion := "2.11.0-M7"
version := "1.0.0-SNAPSHOT"

scalaXmlVersion := "1.0.0-RC7"
scalaVersion := "2.11.0-M8"

scalaCheckVersion := "1.11.1"
scalaXmlVersion := "1.0.0-RC7"

scalaCheckVersion := "1.11.3"

// used as binary version when compiling against 2.11.0-SNAPSHOT
snapshotScalaBinaryVersion := "2.11.0-M7"
snapshotScalaBinaryVersion := "2.11.0-M8"

// TODO: enable "-Xfatal-warnings" for nightlies,
// off by default because we don't want to break scala/scala pr validation due to deprecation
Expand Down Expand Up @@ -41,5 +44,3 @@ libraryDependencies += "org.scala-lang" % "scalap" % sca
libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value % "provided" intransitive()

libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value % "provided" intransitive()

// the boilerplate is in standard.sbt
3 changes: 1 addition & 2 deletions project/build.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
# "0.13.+" breaks plugin resolution
sbt.version=0.13.0
sbt.version=0.13.1
15 changes: 0 additions & 15 deletions project/keys.scala

This file was deleted.

8 changes: 1 addition & 7 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
resolvers += Classpaths.typesafeResolver

// addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.5")

addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.2.0")

addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.1")
addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.1")
4 changes: 2 additions & 2 deletions src/main/scala/scala/tools/partest/utils/Properties.scala
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
package scala.tools.partest
package utils

/** Loads partest.properties from the jar. TODO: standardize on scala-partest.properties */
/** Loads scala-partest.properties from the jar. */
object Properties extends scala.util.PropertiesTrait {
protected def propCategory = "partest"
protected def propCategory = "scala-partest"
protected def pickJarBasedOn = classOf[nest.Runner]
override def isAvian = super.isAvian
}
75 changes: 0 additions & 75 deletions standard.sbt

This file was deleted.