Skip to content
This repository was archived by the owner on May 3, 2018. It is now read-only.

Commit ac8b981

Browse files
adriaanmadriaanm
committed
Merge pull request #2 from scala/travis
Bump to Scala 2.11.0-M7, enable Travis CI.
2 parents 2fa846b + 667751e commit ac8b981

File tree

3 files changed

+77
-86
lines changed

3 files changed

+77
-86
lines changed

‎.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ language: scala
22
script:
33
- sbt ++$TRAVIS_SCALA_VERSION compile
44
scala:
5-
- 2.11.0-M6
5+
- 2.11.0-SNAPSHOT
66
jdk:
7-
- oraclejdk6
87
- openjdk7
98
notifications:
109
email:

‎build.sbt

Lines changed: 8 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,17 @@
11
organization := "org.scala-lang.modules"
22

3-
name := "scala-partest-interface"
3+
name := "scala-partest-interface"
44

5-
version := "0.2"
5+
version := "0.2"
66

7-
8-
// dependencies:
9-
libraryDependencies += "org.scala-sbt" % "test-interface" % "1.0"
10-
11-
// standard stuff follows:
12-
scalaVersion := "2.11.0-M6"
13-
14-
// NOTE: not necessarily equal to scalaVersion
15-
// (e.g., during PR validation, we override scalaVersion to validate,
16-
// but don't rebuild scalacheck, so we don't want to rewire that dependency)
17-
scalaBinaryVersion := "2.11.0-M6"
18-
19-
// to allow compiling against snapshot versions of Scala
20-
resolvers += Resolver.sonatypeRepo("snapshots")
7+
scalaVersion := "2.11.0-M7"
218

229
// don't use for doc scope, scaladoc warnings are not to be reckoned with
23-
scalacOptions in compile ++= Seq("-optimize", "-Xfatal-warnings", "-feature", "-deprecation", "-unchecked", "-Xlint")
24-
25-
26-
// Generate $name.properties to store our version as well as the scala version used to build
27-
resourceGenerators in Compile <+= Def.task {
28-
val props = new java.util.Properties
29-
props.put("version.number", version.value)
30-
props.put("scala.version.number", scalaVersion.value)
31-
props.put("scala.binary.version.number", scalaBinaryVersion.value)
32-
val file = (resourceManaged in Compile).value / s"${name.value}.properties"
33-
IO.write(props, null, file)
34-
Seq(file)
35-
}
36-
37-
mappings in (Compile, packageBin) += {
38-
(baseDirectory.value / s"${name.value}.properties") -> s"${name.value}.properties"
39-
}
10+
// "-Xfatal-warnings",
11+
scalacOptions in compile ++= Seq("-optimize", "-feature", "-deprecation", "-unchecked", "-Xlint")
4012

41-
42-
// maven publishing
43-
publishTo := {
44-
val nexus = "https://oss.sonatype.org/"
45-
if (version.value.trim.endsWith("SNAPSHOT"))
46-
Some("snapshots" at nexus + "content/repositories/snapshots")
47-
else
48-
Some("releases" at nexus + "service/local/staging/deploy/maven2")
49-
}
50-
51-
credentials += Credentials(Path.userHome / ".ivy2" / ".credentials")
52-
53-
publishMavenStyle := true
54-
55-
publishArtifact in Test := false
56-
57-
pomIncludeRepository := { _ => false }
58-
59-
pomExtra := (
60-
<url>http://www.scala-lang.org/</url>
61-
<inceptionYear>2002</inceptionYear>
62-
<licenses>
63-
<license>
64-
<distribution>repo</distribution>
65-
<name>BSD 3-Clause</name>
66-
<url>https://github.com/scala/{name.value}/blob/master/LICENSE.md</url>
67-
</license>
68-
</licenses>
69-
<scm>
70-
<connection>scm:git:git://github.com/scala/{name.value}.git</connection>
71-
<url>https://github.com/scala/{name.value}</url>
72-
</scm>
73-
<issueManagement>
74-
<system>JIRA</system>
75-
<url>https://issues.scala-lang.org/</url>
76-
</issueManagement>
77-
<developers>
78-
<developer>
79-
<id>epfl</id>
80-
<name>EPFL</name>
81-
</developer>
82-
<developer>
83-
<id>Typesafe</id>
84-
<name>Typesafe, Inc.</name>
85-
</developer>
86-
</developers>
87-
)
13+
// dependencies:
14+
libraryDependencies += "org.scala-sbt" % "test-interface" % "1.0"
8815

8916

90-
// TODO: mima
91-
// import com.typesafe.tools.mima.plugin.MimaPlugin.mimaDefaultSettings
92-
// import com.typesafe.tools.mima.plugin.MimaKeys.previousArtifact
93-
// previousArtifact := Some(organization.value %% name.value % binaryReferenceVersion.value)
17+
// looking for boilerplate? we have it! (in standard.sbt)

‎standard.sbt

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
// to allow compiling against snapshot versions of Scala
2+
resolvers += Resolver.sonatypeRepo("snapshots")
3+
4+
resolvers += Resolver.sonatypeRepo("releases")
5+
6+
7+
// Generate $name.properties to store our version as well as the scala version used to build
8+
resourceGenerators in Compile <+= Def.task {
9+
val props = new java.util.Properties
10+
props.put("version.number", version.value)
11+
props.put("scala.version.number", scalaVersion.value)
12+
props.put("scala.binary.version.number", scalaBinaryVersion.value)
13+
val file = (resourceManaged in Compile).value / s"${name.value}.properties"
14+
IO.write(props, null, file)
15+
Seq(file)
16+
}
17+
18+
mappings in (Compile, packageBin) += {
19+
(baseDirectory.value / s"${name.value}.properties") -> s"${name.value}.properties"
20+
}
21+
22+
23+
// maven publishing
24+
publishTo := {
25+
val nexus = "https://oss.sonatype.org/"
26+
if (version.value.trim.endsWith("SNAPSHOT"))
27+
Some("snapshots" at nexus + "content/repositories/snapshots")
28+
else
29+
Some("releases" at nexus + "service/local/staging/deploy/maven2")
30+
}
31+
32+
credentials += Credentials(Path.userHome / ".ivy2" / ".credentials")
33+
34+
publishMavenStyle := true
35+
36+
publishArtifact in Test := false
37+
38+
pomIncludeRepository := { _ => false }
39+
40+
pomExtra := (
41+
<url>http://www.scala-lang.org/</url>
42+
<inceptionYear>2002</inceptionYear>
43+
<licenses>
44+
<license>
45+
<distribution>repo</distribution>
46+
<name>BSD 3-Clause</name>
47+
<url>https://github.com/scala/{name.value}/blob/master/LICENSE.md</url>
48+
</license>
49+
</licenses>
50+
<scm>
51+
<connection>scm:git:git://github.com/scala/{name.value}.git</connection>
52+
<url>https://github.com/scala/{name.value}</url>
53+
</scm>
54+
<issueManagement>
55+
<system>JIRA</system>
56+
<url>https://issues.scala-lang.org/</url>
57+
</issueManagement>
58+
<developers>
59+
<developer>
60+
<id>epfl</id>
61+
<name>EPFL</name>
62+
</developer>
63+
<developer>
64+
<id>Typesafe</id>
65+
<name>Typesafe, Inc.</name>
66+
</developer>
67+
</developers>
68+
)

0 commit comments

Comments
 (0)