Bump to Scala 2.11.0-M7, enable snapshot integration builds.

split build into interesting (build.sbt) / boilerplate (standard.sbt) parts

Author: adriaanm

.travis.yml

@@ -2,9 +2,8 @@ language: scala
 script:
   - sbt ++$TRAVIS_SCALA_VERSION compile
 scala:
-  - 2.11.0-M6
+  - 2.11.0-SNAPSHOT
 jdk:
-  - oraclejdk6
   - openjdk7
 notifications:
   email:

build.sbt

@@ -1,93 +1,17 @@
 organization := "org.scala-lang.modules"
 
-name := "scala-partest-interface"
+name         := "scala-partest-interface"
 
-version := "0.2"
+version      := "0.2"
 
-
-// dependencies:
-libraryDependencies += "org.scala-sbt" % "test-interface" % "1.0"
-
-// standard stuff follows:
-scalaVersion := "2.11.0-M6"
-
-// NOTE: not necessarily equal to scalaVersion
-// (e.g., during PR validation, we override scalaVersion to validate,
-// but don't rebuild scalacheck, so we don't want to rewire that dependency)
-scalaBinaryVersion := "2.11.0-M6"
-
-// to allow compiling against snapshot versions of Scala
-resolvers += Resolver.sonatypeRepo("snapshots")
+scalaVersion := "2.11.0-M7"
 
 // don't use for doc scope, scaladoc warnings are not to be reckoned with
-scalacOptions in compile ++= Seq("-optimize", "-Xfatal-warnings", "-feature", "-deprecation", "-unchecked", "-Xlint")
-
-
-// Generate $name.properties to store our version as well as the scala version used to build
-resourceGenerators in Compile <+= Def.task {
-  val props = new java.util.Properties
-  props.put("version.number", version.value)
-  props.put("scala.version.number", scalaVersion.value)
-  props.put("scala.binary.version.number", scalaBinaryVersion.value)
-  val file = (resourceManaged in Compile).value / s"${name.value}.properties"
-  IO.write(props, null, file)
-  Seq(file)
-}
-
-mappings in (Compile, packageBin) += {
-   (baseDirectory.value / s"${name.value}.properties") -> s"${name.value}.properties"
-}
+// "-Xfatal-warnings",
+scalacOptions in compile ++= Seq("-optimize", "-feature", "-deprecation", "-unchecked", "-Xlint")
 
-
-// maven publishing
-publishTo := {
-  val nexus = "https://oss.sonatype.org/"
-  if (version.value.trim.endsWith("SNAPSHOT"))
-    Some("snapshots" at nexus + "content/repositories/snapshots")
-  else
-    Some("releases" at nexus + "service/local/staging/deploy/maven2")
-}
-
-credentials += Credentials(Path.userHome / ".ivy2" / ".credentials")
-
-publishMavenStyle := true
-
-publishArtifact in Test := false
-
-pomIncludeRepository := { _ => false }
-
-pomExtra := (
-  <url>http://www.scala-lang.org/</url>
-  <inceptionYear>2002</inceptionYear>
-  <licenses>
-    <license>
-        <distribution>repo</distribution>
-        <name>BSD 3-Clause</name>
-        <url>https://github.com/scala/{name.value}/blob/master/LICENSE.md</url>
-    </license>
-   </licenses>
-  <scm>
-    <connection>scm:git:git://github.com/scala/{name.value}.git</connection>
-    <url>https://github.com/scala/{name.value}</url>
-  </scm>
-  <issueManagement>
-    <system>JIRA</system>
-    <url>https://issues.scala-lang.org/</url>
-  </issueManagement>
-  <developers>
-    <developer>
-      <id>epfl</id>
-      <name>EPFL</name>
-    </developer>
-    <developer>
-      <id>Typesafe</id>
-      <name>Typesafe, Inc.</name>
-    </developer>
-  </developers>
-)
+// dependencies:
+libraryDependencies += "org.scala-sbt" % "test-interface" % "1.0"
 
 
-// TODO: mima
-// import com.typesafe.tools.mima.plugin.MimaPlugin.mimaDefaultSettings
-// import com.typesafe.tools.mima.plugin.MimaKeys.previousArtifact
-// previousArtifact := Some(organization.value %% name.value % binaryReferenceVersion.value)
+// looking for boilerplate? we have it! (in standard.sbt)

standard.sbt

@@ -0,0 +1,68 @@
+// to allow compiling against snapshot versions of Scala
+resolvers += Resolver.sonatypeRepo("snapshots")
+
+resolvers += Resolver.sonatypeRepo("releases")
+
+
+// Generate $name.properties to store our version as well as the scala version used to build
+resourceGenerators in Compile <+= Def.task {
+  val props = new java.util.Properties
+  props.put("version.number", version.value)
+  props.put("scala.version.number", scalaVersion.value)
+  props.put("scala.binary.version.number", scalaBinaryVersion.value)
+  val file = (resourceManaged in Compile).value / s"${name.value}.properties"
+  IO.write(props, null, file)
+  Seq(file)
+}
+
+mappings in (Compile, packageBin) += {
+   (baseDirectory.value / s"${name.value}.properties") -> s"${name.value}.properties"
+}
+
+
+// maven publishing
+publishTo := {
+  val nexus = "https://oss.sonatype.org/"
+  if (version.value.trim.endsWith("SNAPSHOT"))
+    Some("snapshots" at nexus + "content/repositories/snapshots")
+  else
+    Some("releases" at nexus + "service/local/staging/deploy/maven2")
+}
+
+credentials += Credentials(Path.userHome / ".ivy2" / ".credentials")
+
+publishMavenStyle := true
+
+publishArtifact in Test := false
+
+pomIncludeRepository := { _ => false }
+
+pomExtra := (
+  <url>http://www.scala-lang.org/</url>
+  <inceptionYear>2002</inceptionYear>
+  <licenses>
+    <license>
+        <distribution>repo</distribution>
+        <name>BSD 3-Clause</name>
+        <url>https://github.com/scala/{name.value}/blob/master/LICENSE.md</url>
+    </license>
+   </licenses>
+  <scm>
+    <connection>scm:git:git://github.com/scala/{name.value}.git</connection>
+    <url>https://github.com/scala/{name.value}</url>
+  </scm>
+  <issueManagement>
+    <system>JIRA</system>
+    <url>https://issues.scala-lang.org/</url>
+  </issueManagement>
+  <developers>
+    <developer>
+      <id>epfl</id>
+      <name>EPFL</name>
+    </developer>
+    <developer>
+      <id>Typesafe</id>
+      <name>Typesafe, Inc.</name>
+    </developer>
+  </developers>
+)