Skip to content

Commit

Permalink
debug scalacheck issue 218
Browse files Browse the repository at this point in the history
  • Loading branch information
xuwei-k committed Feb 12, 2016
1 parent 48d146d commit 8b92943
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 12 deletions.
6 changes: 0 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ cache:
language: scala
scala:
- 2.11.7
- 2.10.6
jdk:
- oraclejdk8 # scalaz 7.3 does not support Java 7

Expand All @@ -31,11 +30,6 @@ script:
- find $HOME/.sbt -name "*.lock" | xargs rm
- find $HOME/.ivy2 -name "ivydata-*.properties" | xargs rm

matrix:
include:
- scala: 2.12.0-M3
jdk: oraclejdk8

addons:
apt:
packages:
Expand Down
9 changes: 3 additions & 6 deletions project/build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ object build extends Build {
enableCrossBuild = true
)

val scalaCheckVersion = SettingKey[String]("scalaCheckVersion")

private def gitHash = sys.process.Process("git rev-parse HEAD").lines_!.head

// no generic signatures for scala 2.10.x, see SI-7932, #571 and #828
Expand All @@ -56,7 +54,6 @@ object build extends Build {
crossScalaVersions := Seq("2.10.6", "2.11.7", "2.12.0-M3"),
resolvers ++= (if (scalaVersion.value.endsWith("-SNAPSHOT")) List(Opts.resolver.sonatypeSnapshots) else Nil),
fullResolvers ~= {_.filterNot(_.name == "jcenter")}, // https://github.com/sbt/sbt/issues/2217
scalaCheckVersion := "1.13.0",
scalacOptions ++= Seq(
// contains -language:postfixOps (because 1+ as a parameter to a higher-order function is treated as a postfix op)
"-deprecation",
Expand Down Expand Up @@ -249,9 +246,10 @@ object build extends Build {
dependencies = Seq(core, concurrent, iteratee),
settings = standardSettings ++ Seq[Sett](
name := "scalaz-scalacheck-binding",
libraryDependencies += "org.scalacheck" %% "scalacheck" % scalaCheckVersion.value,
osgiExport("scalaz.scalacheck")
)
).dependsOn(
ProjectRef(uri("git://github.com/xuwei-k/scalacheck.git#a6066af4447db679"), "jvm")
)

lazy val tests = Project(
Expand All @@ -260,8 +258,7 @@ object build extends Build {
dependencies = Seq(core, iteratee, concurrent, effect, scalacheckBinding % "test"),
settings = standardSettings ++Seq[Sett](
name := "scalaz-tests",
publishArtifact := false,
libraryDependencies += "org.scalacheck" %% "scalacheck" % scalaCheckVersion.value % "test"
publishArtifact := false
)
)

Expand Down

0 comments on commit 8b92943

Please sign in to comment.