Permalink
Browse files

Switch to scala 2.12.7

  • Loading branch information...
alexarchambault committed Oct 2, 2018
1 parent 4d2ce64 commit 192ea62ce87da22705f78200e3734db35b21ebf7
Showing with 4 additions and 3 deletions.
  1. +1 −0 .travis.yml
  2. +2 −2 project/Settings.scala
  3. +1 −1 scripts/generate-website.sh
View
@@ -19,6 +19,7 @@ jobs:
include: include:
- scala: 2.11.12 - scala: 2.11.12
- scala: 2.12.6 - scala: 2.12.6
- scala: 2.12.7
- env: WEBSITE=1 # unused from the script, just to know what the job does from the Travis UI - env: WEBSITE=1 # unused from the script, just to know what the job does from the Travis UI
script: scripts/update-website.sh script: scripts/update-website.sh
- stage: update-website - stage: update-website
View
@@ -8,11 +8,11 @@ import sbt.Keys._
object Settings { object Settings {
private val scala211 = "2.11.12" private val scala211 = "2.11.12"
private val scala212 = "2.12.6" private val scala212 = "2.12.7"
lazy val shared = Seq( lazy val shared = Seq(
scalaVersion := scala212, scalaVersion := scala212,
crossScalaVersions := Seq(scala212, scala211), crossScalaVersions := Seq(scala212, "2.12.6", scala211),
scalacOptions ++= Seq( scalacOptions ++= Seq(
// see http://tpolecat.github.io/2017/04/25/scalac-flags.html // see http://tpolecat.github.io/2017/04/25/scalac-flags.html
"-deprecation", "-deprecation",
@@ -25,7 +25,7 @@ echo "Processing Markdown files"
# with # with
# sbt interpreter-api/publishLocal scala-kernel-api/publishLocal almond-spark/publishLocal # sbt interpreter-api/publishLocal scala-kernel-api/publishLocal almond-spark/publishLocal
../scripts/coursier.sh launch \ ../scripts/coursier.sh launch \
"com.geirsson:mdoc_$SCALA_VERSION:0.4.5" \ "com.geirsson:mdoc_$SCALA_VERSION:0.5.0" \
"sh.almond:scala-kernel-api_$SCALA_VERSION:$VERSION" \ "sh.almond:scala-kernel-api_$SCALA_VERSION:$VERSION" \
-- \ -- \
--in ../docs/pages \ --in ../docs/pages \

0 comments on commit 192ea62

Please sign in to comment.