diff --git a/.travis.yml b/.travis.yml index dd8e4a39a7..9a810b5340 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: scala scala: - - 2.11.11 + - 2.11.12 - 2.12.4 jdk: @@ -24,7 +24,7 @@ env: script: - sbt ++$TRAVIS_SCALA_VERSION -Dfile.encoding=UTF8 -Dfs2.test.verbose test mimaReportBinaryIssues - - (test $TRAVIS_SCALA_VERSION == "2.11.11" && sbt ++$TRAVIS_SCALA_VERSION -Dfile.encoding=UTF8 -J-Xms2g -J-Xmx2g docs/tut) || test $TRAVIS_SCALA_VERSION == "2.12.4" + - (test $TRAVIS_SCALA_VERSION == "2.11.12" && sbt ++$TRAVIS_SCALA_VERSION -Dfile.encoding=UTF8 -J-Xms2g -J-Xmx2g docs/tut) || test $TRAVIS_SCALA_VERSION == "2.12.4" after_success: - test $PUBLISH == "true" && test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "series/0.10" && sbt +publish diff --git a/build.sbt b/build.sbt index 421ebbc1ff..e5ff011e11 100644 --- a/build.sbt +++ b/build.sbt @@ -48,8 +48,8 @@ lazy val commonSettings = Seq( scalacOptions in (Compile, console) += "-Ydelambdafy:inline", scalacOptions in (Test, console) := (scalacOptions in (Compile, console)).value, libraryDependencies ++= Seq( - compilerPlugin("org.spire-math" %% "kind-projector" % "0.9.5"), - "org.scalatest" %%% "scalatest" % "3.0.4" % "test", + compilerPlugin("org.spire-math" %% "kind-projector" % "0.9.6"), + "org.scalatest" %%% "scalatest" % "3.0.5" % "test", "org.scalacheck" %%% "scalacheck" % "1.13.5" % "test", "org.typelevel" %%% "cats-laws" % "1.0.1" % "test" ), @@ -207,7 +207,7 @@ lazy val core = crossProject .settings(commonSettings: _*) .settings( name := "fs2-core", - libraryDependencies += "org.typelevel" %%% "cats-effect" % "0.8", + libraryDependencies += "org.typelevel" %%% "cats-effect" % "0.9", sourceDirectories in (Compile, scalafmt) += baseDirectory.value / "../shared/src/main/scala" ) .jsSettings(commonJsSettings: _*) diff --git a/project/build.properties b/project/build.properties index 8b697bbb94..31334bbd3d 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.1.0 +sbt.version=1.1.1 diff --git a/project/plugins.sbt b/project/plugins.sbt index a199e8aa5a..04d350f5f9 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0") +addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.2") addSbtPlugin("com.dwijnand" % "sbt-travisci" % "1.1.1") addSbtPlugin("com.github.tkawachi" % "sbt-doctest" % "0.7.1") addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.2") @@ -8,6 +8,6 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.18") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.1") addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.6.2") addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.3") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.21") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.22") addSbtPlugin("com.lucidchart" % "sbt-scalafmt-coursier" % "1.15") addSbtPlugin("com.47deg" % "sbt-microsites" % "0.7.15")