Skip to content

Bump partest to RC7. Enable Travis CI. #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 13, 2013
Merged

Bump partest to RC7. Enable Travis CI. #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
language: scala
script:
- sbt ++$TRAVIS_SCALA_VERSION 'set concurrentRestrictions in Global += Tags.limit(Tags.Compile, 2)' compile test:compile
- sbt ++$TRAVIS_SCALA_VERSION 'set concurrentRestrictions in Global += Tags.limit(Tags.Test, 1)' test
scala:
- 2.10.3
- 2.11.0-M6
jdk:
- oraclejdk6
- openjdk7
notifications:
email:
- [email protected]
19 changes: 9 additions & 10 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ libraryDependencies ++= Seq("junit" % "junit" % "4.11" % "test", "com.novocode"
TestKeys.includeTestDependencies := true

// default
TestKeys.partestVersion := "1.0.0-RC6"
TestKeys.partestVersion := "1.0.0-RC7"

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