From a12c3f7d8dd098a00aef91b0113a354858030657 Mon Sep 17 00:00:00 2001 From: Kailuo Wang Date: Mon, 15 May 2017 22:16:22 -0400 Subject: [PATCH 1/4] increase the number of arbitrary inputs in Eq[A=>B] to guard against false positive --- core/src/main/scala/cats/data/Kleisli.scala | 2 +- laws/src/main/scala/cats/laws/discipline/Eq.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/scala/cats/data/Kleisli.scala b/core/src/main/scala/cats/data/Kleisli.scala index f6480d2332..13856fbea9 100644 --- a/core/src/main/scala/cats/data/Kleisli.scala +++ b/core/src/main/scala/cats/data/Kleisli.scala @@ -226,7 +226,7 @@ private trait KleisliSemigroup[F[_], A, B] extends Semigroup[Kleisli[F, A, B]] { private trait KleisliMonoid[F[_], A, B] extends Monoid[Kleisli[F, A, B]] with KleisliSemigroup[F, A, B] { implicit def FB: Monoid[F[B]] - override def empty: Kleisli[F, A, B] = Kleisli[F, A, B](a => FB.empty) + override def empty: Kleisli[F, A, B] = Kleisli[F, A, B](_ => FB.empty) } private trait KleisliMonadError[F[_], A, E] extends MonadError[Kleisli[F, A, ?], E] with KleisliApplicativeError[F, A, E] with KleisliMonadReader[F, A] { diff --git a/laws/src/main/scala/cats/laws/discipline/Eq.scala b/laws/src/main/scala/cats/laws/discipline/Eq.scala index dabd41ce6a..4c550e90fb 100644 --- a/laws/src/main/scala/cats/laws/discipline/Eq.scala +++ b/laws/src/main/scala/cats/laws/discipline/Eq.scala @@ -13,7 +13,7 @@ object eq { * and comparing the application of the two functions. */ implicit def catsLawsEqForFn1[A, B](implicit A: Arbitrary[A], B: Eq[B]): Eq[A => B] = new Eq[A => B] { - val sampleCnt: Int = if (Platform.isJvm) 50 else 5 + val sampleCnt: Int = if (Platform.isJvm) 50 else 10 def eqv(f: A => B, g: A => B): Boolean = { val samples = List.fill(sampleCnt)(A.arbitrary.sample).collect{ From 9eb89b32d1195f529b775618ae5c0bc1367f5a8a Mon Sep 17 00:00:00 2001 From: Kailuo Wang Date: Mon, 15 May 2017 23:34:17 -0400 Subject: [PATCH 2/4] use matrix to cut down build time --- .travis.yml | 18 ++++++++++++++---- .../scala/cats/laws/discipline/EqTests.scala | 5 +++++ scripts/travis-publish.sh | 14 ++++++++++---- 3 files changed, 29 insertions(+), 8 deletions(-) create mode 100644 laws/src/test/scala/cats/laws/discipline/EqTests.scala diff --git a/.travis.yml b/.travis.yml index d908c4f71e..6e97af34e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,13 +10,19 @@ git: scala: - 2.10.6 - 2.11.11 + - 2.12.2 jdk: - oraclejdk7 + - oraclejdk8 matrix: - include: + exclude: - scala: 2.12.2 + jdk: oraclejdk7 + - scala: 2.10.6 + jdk: oraclejdk8 + - scala: 2.11.11 jdk: oraclejdk8 before_install: @@ -38,11 +44,15 @@ notifications: on_success: change on_failure: always on_start: false + env: + matrix: + - JS_BUILD=true + - JS_BUILD=false global: - - secure: Kf44XQFpq2QGe3rn98Dsf5Uz3WXzPDralS54co7sqT5oQGs1mYLYZRYz+I75ZSo5ffZ86H7M+AI9YFofqGwAjBixBbqf1tGkUh3oZp2fN3QfqzazGV3HzC+o41zALG5FL+UBaURev9ChQ5fYeTtFB7YAzejHz4y5E97awk934Rg= - - secure: QbNAu0jCaKrwjJi7KZtYEBA/pYbTJ91Y1x/eLAJpsamswVOvwnThA/TLYuux+oiZQCiDUpBzP3oxksIrEEUAhl0lMtqRFY3MrcUr+si9NIjX8hmoFwkvZ5o1b7pmLF6Vz3rQeP/EWMLcljLzEwsrRXeK0Ei2E4vFpsg8yz1YXJg= - - TRAVIS_NODE_VERSION="4" + - secure: Kf44XQFpq2QGe3rn98Dsf5Uz3WXzPDralS54co7sqT5oQGs1mYLYZRYz+I75ZSo5ffZ86H7M+AI9YFofqGwAjBixBbqf1tGkUh3oZp2fN3QfqzazGV3HzC+o41zALG5FL+UBaURev9ChQ5fYeTtFB7YAzejHz4y5E97awk934Rg= + - secure: QbNAu0jCaKrwjJi7KZtYEBA/pYbTJ91Y1x/eLAJpsamswVOvwnThA/TLYuux+oiZQCiDUpBzP3oxksIrEEUAhl0lMtqRFY3MrcUr+si9NIjX8hmoFwkvZ5o1b7pmLF6Vz3rQeP/EWMLcljLzEwsrRXeK0Ei2E4vFpsg8yz1YXJg= + - TRAVIS_NODE_VERSION="4" cache: directories: diff --git a/laws/src/test/scala/cats/laws/discipline/EqTests.scala b/laws/src/test/scala/cats/laws/discipline/EqTests.scala new file mode 100644 index 0000000000..7ee6e89a92 --- /dev/null +++ b/laws/src/test/scala/cats/laws/discipline/EqTests.scala @@ -0,0 +1,5 @@ +package cats.laws.discipline + +class EqTests { + +} diff --git a/scripts/travis-publish.sh b/scripts/travis-publish.sh index 804de36610..7dbf20b1d4 100755 --- a/scripts/travis-publish.sh +++ b/scripts/travis-publish.sh @@ -20,18 +20,24 @@ export publish_cmd="publishLocal" if [[ $TRAVIS_PULL_REQUEST == "false" && $TRAVIS_BRANCH == "master" && $(cat version.sbt) =~ "-SNAPSHOT" ]]; then export publish_cmd="publish gitSnapshots publish" # temporarily disable to stabilize travis - #if [[ $TRAVIS_SCALA_VERSION = "2.11.8" ]]; then - # export publish_cmd="$publish_cmd ghpagesPushSite" + #if [[ $TRAVIS_SCALA_VERSION = "2.11.11" ]]; then + # export publish_cmd="publishMicrosite" #fi fi sbt_cmd="sbt ++$TRAVIS_SCALA_VERSION" -js="$sbt_cmd validateJS" +core_js="$sbt_cmd validateJS" kernel_js="$sbt_cmd validateKernelJS" free_js="$sbt_cmd validateFreeJS" + +js="$core_js && $free_js && $kernel_js" jvm="$sbt_cmd coverage validateJVM coverageReport && codecov" -run_cmd="$js && $free_js && $kernel_js && $jvm && $sbt_cmd $publish_cmd" +if [[ $JS_BUILD == "true" ]]; then +run_cmd="$js" +else +run_cmd="$jvm && $sbt_cmd $publish_cmd" +fi eval $run_cmd From 811b164a1ba88326ac73cf2187bf74dd374a1168 Mon Sep 17 00:00:00 2001 From: Kailuo Wang Date: Tue, 16 May 2017 13:16:33 -0400 Subject: [PATCH 3/4] remove accidental file --- laws/src/test/scala/cats/laws/discipline/EqTests.scala | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 laws/src/test/scala/cats/laws/discipline/EqTests.scala diff --git a/laws/src/test/scala/cats/laws/discipline/EqTests.scala b/laws/src/test/scala/cats/laws/discipline/EqTests.scala deleted file mode 100644 index 7ee6e89a92..0000000000 --- a/laws/src/test/scala/cats/laws/discipline/EqTests.scala +++ /dev/null @@ -1,5 +0,0 @@ -package cats.laws.discipline - -class EqTests { - -} From 4b23d0a9b45365642d8c28febe970b12337b4f7a Mon Sep 17 00:00:00 2001 From: Kailuo Wang Date: Tue, 16 May 2017 13:21:51 -0400 Subject: [PATCH 4/4] updated travis publish website --- scripts/travis-publish.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/travis-publish.sh b/scripts/travis-publish.sh index 7dbf20b1d4..386aa5669f 100755 --- a/scripts/travis-publish.sh +++ b/scripts/travis-publish.sh @@ -20,7 +20,7 @@ export publish_cmd="publishLocal" if [[ $TRAVIS_PULL_REQUEST == "false" && $TRAVIS_BRANCH == "master" && $(cat version.sbt) =~ "-SNAPSHOT" ]]; then export publish_cmd="publish gitSnapshots publish" # temporarily disable to stabilize travis - #if [[ $TRAVIS_SCALA_VERSION = "2.11.11" ]]; then + #if [[ $TRAVIS_SCALA_VERSION =~ ^2\.11\. ]]; then # export publish_cmd="publishMicrosite" #fi fi