diff --git a/.travis.yml b/.travis.yml index 8eb7d55a..a3e6a0b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ jdk: - oraclejdk7 - oraclejdk8 scala: - - 2.11.5 - - 2.10.4 + - 2.11.6 + - 2.10.5 script: "sbt clean coverage test" after_success: "sbt coveralls" \ No newline at end of file diff --git a/README.md b/README.md index e603cc00..31f7746f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Enumeratum [![Build Status](https://travis-ci.org/lloydmeta/enumeratum.svg)](https://travis-ci.org/lloydmeta/enumeratum) [![Coverage Status](https://coveralls.io/repos/lloydmeta/enumeratum/badge.png)](https://coveralls.io/r/lloydmeta/enumeratum) [![Codacy Badge](https://www.codacy.com/project/badge/a71a20d8678f4ed3a5b74b0659c1bc4c)](https://www.codacy.com/public/lloydmeta/enumeratum) +# Enumeratum [![Build Status](https://travis-ci.org/lloydmeta/enumeratum.svg)](https://travis-ci.org/lloydmeta/enumeratum) [![Coverage Status](https://coveralls.io/repos/lloydmeta/enumeratum/badge.svg?branch=master)](https://coveralls.io/r/lloydmeta/enumeratum?branch=master) [![Codacy Badge](https://www.codacy.com/project/badge/a71a20d8678f4ed3a5b74b0659c1bc4c)](https://www.codacy.com/public/lloydmeta/enumeratum) Yet another enumeration implementation for Scala for the sake of exhaustive pattern match warnings, Enumeratum is an implementation based on a single Scala macro that searches for implementations of a sealed trait or class. @@ -17,8 +17,8 @@ Compatible with Scala 2.10.x and 2.11.x ```scala libraryDependencies ++= Seq( - "com.beachape" %% "enumeratum" % "1.0.0", - "com.beachape" %% "enumeratum-play" % "1.0.0" // if you are using Play and want to avoid boilerplate + "com.beachape" %% "enumeratum" % "1.0.1", + "com.beachape" %% "enumeratum-play" % "1.0.1" // if you are using Play and want to avoid boilerplate ) ``` diff --git a/project/Enumeratum.scala b/project/Enumeratum.scala index 60737675..7cdb81b3 100644 --- a/project/Enumeratum.scala +++ b/project/Enumeratum.scala @@ -6,21 +6,22 @@ import scoverage.ScoverageSbtPlugin.ScoverageKeys._ object Enumeratum extends Build { - lazy val theVersion = "1.0.1-SNAPSHOT" - lazy val theScalaVersion = "2.11.5" + lazy val theVersion = "1.0.1" + lazy val theScalaVersion = "2.11.6" + lazy val scalaVersions = Seq("2.10.5", "2.11.6") lazy val root = Project(id = "enumeratum-root", base = file("."), settings = commonWithPublishSettings) .settings( name := "enumeratum-root", publishArtifact := false, - crossScalaVersions := Seq("2.10.4", "2.11.5"), + crossScalaVersions := scalaVersions, crossVersion := CrossVersion.binary ).aggregate(macros, core, enumeratumPlay) lazy val core = Project(id = "enumeratum", base = file("enumeratum-core"), settings = commonWithPublishSettings) .settings( name := "enumeratum", - crossScalaVersions := Seq("2.10.4", "2.11.5"), + crossScalaVersions := scalaVersions, crossVersion := CrossVersion.binary, libraryDependencies ++= Seq( "org.scalatest" %% "scalatest" % "2.2.1" % "test" @@ -30,7 +31,7 @@ object Enumeratum extends Build { lazy val macros = Project(id = "enumeratum-macros", base = file("macros"), settings = commonWithPublishSettings) .settings( name := "enumeratum-macros", - crossScalaVersions := Seq("2.10.4", "2.11.5"), + crossScalaVersions := scalaVersions, crossVersion := CrossVersion.binary, libraryDependencies ++= Seq( "org.scala-lang" % "scala-reflect" % scalaVersion.value, @@ -51,10 +52,10 @@ object Enumeratum extends Build { lazy val enumeratumPlay = Project(id = "enumeratum-play", base = file("enumeratum-play"), settings = commonWithPublishSettings) .settings( - crossScalaVersions := Seq("2.10.4", "2.11.5"), + crossScalaVersions := scalaVersions, crossVersion := CrossVersion.binary, libraryDependencies ++= Seq( - "com.typesafe.play" %% "play" % "2.3.7" % "provided", + "com.typesafe.play" %% "play" % "2.3.8" % "provided", "org.scalatest" %% "scalatest" % "2.2.1" % "test" ) ).dependsOn(core)