From 27f3676abc18c437783e7bb3f585f021d15ee810 Mon Sep 17 00:00:00 2001 From: Jason Zaugg Date: Mon, 16 Feb 2015 15:59:19 +1000 Subject: [PATCH 1/2] Bump to 0.3.0-SNAPSHOT --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index d98200b..fec0d46 100644 --- a/build.sbt +++ b/build.sbt @@ -12,7 +12,7 @@ organization := "org.scala-lang.modules" name := "scala-java8-compat" -version := "0.2.0-SNAPSHOT" +version := "0.3.0-SNAPSHOT" // important!! must come here (why?) scalaModuleOsgiSettings From 2a36b518fe07552cff5da82870c6957e7c89f1af Mon Sep 17 00:00:00 2001 From: Jason Zaugg Date: Mon, 16 Feb 2015 16:01:12 +1000 Subject: [PATCH 2/2] Bump to Scala 2.11.5 --- .travis.yml | 2 +- build.sbt | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index aa17538..a5a7a74 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ script: - admin/build.sh scala: - 2.10.4 - - 2.11.4 + - 2.11.5 jdk: - oraclejdk8 notifications: diff --git a/build.sbt b/build.sbt index fec0d46..0defedc 100644 --- a/build.sbt +++ b/build.sbt @@ -2,11 +2,9 @@ import com.typesafe.tools.mima.plugin.{MimaPlugin, MimaKeys} scalaModuleSettings -scalaVersion := "2.11.4" +scalaVersion := "2.11.5" -snapshotScalaBinaryVersion := "2.11.4" - -// TODO this project can be cross build against 2.11 and 2.10, express that here. +snapshotScalaBinaryVersion := "2.11.5" organization := "org.scala-lang.modules"