Skip to content

Commit c77adfc

Browse files
committed
Merge pull request #8 from adriaanm/travis
Bump partest to RC7. Enable Travis CI.
2 parents 1d3ce9d + 254ae65 commit c77adfc

File tree

2 files changed

+22
-10
lines changed

2 files changed

+22
-10
lines changed

.travis.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
language: scala
2+
script:
3+
- sbt ++$TRAVIS_SCALA_VERSION 'set concurrentRestrictions in Global += Tags.limit(Tags.Compile, 2)' compile test:compile
4+
- sbt ++$TRAVIS_SCALA_VERSION 'set concurrentRestrictions in Global += Tags.limit(Tags.Test, 1)' test
5+
scala:
6+
- 2.10.3
7+
- 2.11.0-M6
8+
jdk:
9+
- oraclejdk6
10+
- openjdk7
11+
notifications:
12+
email:
13+

build.sbt

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ libraryDependencies ++= Seq("junit" % "junit" % "4.11" % "test", "com.novocode"
8484
TestKeys.includeTestDependencies := true
8585

8686
// default
87-
TestKeys.partestVersion := "1.0.0-RC6"
87+
TestKeys.partestVersion := "1.0.0-RC7"
8888

8989
// the actual partest the interface calls into -- must be binary version close enough to ours
9090
// so that it can link to the compiler/lib we're using (testing)
@@ -107,15 +107,14 @@ libraryDependencies ++= (
107107
* 2. Declare dependencies in partest as provided so they are not includeded transitively.
108108
*/
109109
def excludeScalaXml(dep: ModuleID): ModuleID =
110-
dep.exclude("org.scala-lang.modules", "scala-parser-combinators_2.11.0-M4").
111-
exclude("org.scala-lang.modules", "scala-parser-combinators_2.11.0-M5").
112-
exclude("org.scala-lang.modules", "scala-parser-combinators_2.11.0-M6")
113-
Seq("org.scala-lang.modules" % "scala-partest-interface_2.11.0-M5" % "0.2" % "test" intransitive,
114-
"org.scala-lang.modules" % "scala-partest_2.11.0-M5" % TestKeys.partestVersion.value % "test" intransitive,
115-
// diffutils is needed by partest
116-
"com.googlecode.java-diff-utils" % "diffutils" % "1.3.0" % "test",
117-
"org.scala-lang" % "scala-compiler" % scalaVersion.value % "test").
118-
map(excludeScalaXml)
110+
(dep exclude("org.scala-lang.modules", "scala-parser-combinators_2.11.0-M4")
111+
exclude("org.scala-lang.modules", "scala-parser-combinators_2.11.0-M5")
112+
exclude("org.scala-lang.modules", "scala-parser-combinators_2.11.0-M6"))
113+
// (this space intentionally not left blank)
114+
Seq("org.scala-lang.modules" % s"scala-partest-interface_${scalaBinaryVersion.value}" % "0.2" % "test" intransitive,
115+
"org.scala-lang.modules" % s"scala-partest_${scalaBinaryVersion.value}" % TestKeys.partestVersion.value % "test" intransitive,
116+
"com.googlecode.java-diff-utils" % "diffutils" % "1.3.0" % "test", // diffutils is needed by partest
117+
"org.scala-lang" % "scala-compiler" % scalaVersion.value % "test").map(excludeScalaXml)
119118
}
120119
else Seq.empty
121120
)

0 commit comments

Comments
 (0)