From bbdbc8cebec3a110b798171721064531f576e56e Mon Sep 17 00:00:00 2001 From: Marcos Pereira Date: Thu, 28 Jun 2018 11:50:59 -0400 Subject: [PATCH 1/2] Update sbt, interplay and mima --- project/build.properties | 2 +- project/plugins.sbt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project/build.properties b/project/build.properties index 64317fd..133a8f1 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.15 +sbt.version=0.13.17 diff --git a/project/plugins.sbt b/project/plugins.sbt index bdd2a4a..9a5611d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,7 @@ resolvers ++= DefaultOptions.resolvers(snapshot = true) -addSbtPlugin("com.typesafe.play" % "interplay" % "1.3.5") -addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.8") +addSbtPlugin("com.typesafe.play" % "interplay" % "1.3.16") +addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.3.0") addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.6.0") From 6b842261947dae337ed35a815b787df122a4ed2c Mon Sep 17 00:00:00 2001 From: Marcos Pereira Date: Thu, 28 Jun 2018 11:51:12 -0400 Subject: [PATCH 2/2] Add Scala 2.13.0-M3 support --- .travis.yml | 5 +++-- build.sbt | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2a5359f..feebe1f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,9 @@ dist: trusty sudo: false group: beta scala: -- 2.12.1 -- 2.11.8 +- 2.12.6 +- 2.11.11 +- 2.13.0-M3 jdk: - oraclejdk8 cache: diff --git a/build.sbt b/build.sbt index 1c8bb2a..81ef3d9 100644 --- a/build.sbt +++ b/build.sbt @@ -1,19 +1,24 @@ import interplay.ScalaVersions._ -val specsVersion = "3.8.9" +val scala213Version = "2.13.0-M3" + +val specsVersion = "4.2.0" val specsBuild = Seq( "specs2-core", "specs2-junit", "specs2-mock" ).map("org.specs2" %% _ % specsVersion) +val commonSettings = scalariformSettings ++ Seq( + scalaVersion := scala212, + crossScalaVersions := Seq(scala212, scala211, scala213Version) +) + lazy val `play-iteratees` = project .in(file("iteratees")) .enablePlugins(PlayLibrary) - .settings(scalariformSettings: _*) + .settings(commonSettings: _*) .settings( - scalaVersion := scala212, - crossScalaVersions := Seq(scala212, scala211), libraryDependencies ++= Seq( "org.scala-stm" %% "scala-stm" % "0.8" ) ++ specsBuild.map(_ % Test) @@ -22,21 +27,16 @@ lazy val `play-iteratees` = project lazy val `play-iteratees-reactive-streams` = project .in(file("streams")) .enablePlugins(PlayLibrary) - .settings(scalariformSettings: _*) + .settings(commonSettings: _*) .settings( - scalaVersion := scala212, - crossScalaVersions := Seq(scala212, scala211), libraryDependencies ++= Seq( - "org.reactivestreams" % "reactive-streams" % "1.0.0" + "org.reactivestreams" % "reactive-streams" % "1.0.2" ) ++ specsBuild.map(_ % Test) ).dependsOn(`play-iteratees`) lazy val `play-iteratees-root` = (project in file(".")) .enablePlugins(PlayRootProject) .aggregate(`play-iteratees`, `play-iteratees-reactive-streams`) - .settings( - scalaVersion := scala212, - crossScalaVersions := Seq(scala212, scala211) - ) + .settings(commonSettings: _*) playBuildRepoName in ThisBuild := "play-iteratees"