Skip to content
This repository was archived by the owner on Aug 6, 2020. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
24 changes: 12 additions & 12 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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"
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.15
sbt.version=0.13.17
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")