Skip to content

Commit

Permalink
Update to scala 2.11.12, sbt 1.1.1 and others
Browse files Browse the repository at this point in the history
  • Loading branch information
guersam committed Feb 25, 2018
1 parent 3f6d31a commit b48242c
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: scala

scala:
- 2.11.11
- 2.11.12
- 2.12.4

jdk:
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
),
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.1.0
sbt.version=1.1.1
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")
Expand All @@ -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")

0 comments on commit b48242c

Please sign in to comment.