From 227edcc22b38e378762ccd698698b6be8e86ea7e Mon Sep 17 00:00:00 2001 From: karma4u101 Date: Fri, 27 Jun 2014 21:39:13 +0200 Subject: [PATCH] Bumping version to 2.9-SNAPSHOT --- .travis.yml | 2 +- build.sbt | 8 ++++---- project/autobuildscript/build-publish-Lift25.txt | 4 ++-- project/autobuildscript/build-publish-Lift26.txt | 4 ++-- project/autobuildscript/build-publish-Lift3.txt | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index fcdb4b7..4897b69 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: scala scala: - - "2.10.0" + - "2.10.4" - "2.9.2" jdk: - openjdk7 diff --git a/build.sbt b/build.sbt index a75e17d..19e1dc6 100644 --- a/build.sbt +++ b/build.sbt @@ -10,11 +10,11 @@ liftEdition in ThisBuild <<= liftVersion apply { _.substring(0,3) } moduleName <<= (name, liftEdition) { (n, e) => n + "_" + e } -scalaVersion in ThisBuild := "2.10.0" +scalaVersion in ThisBuild := "2.10.4" scalacOptions ++= Seq("-unchecked", "-deprecation") -crossScalaVersions := Seq("2.10.0", "2.9.2", "2.9.1-1", "2.9.1") +crossScalaVersions := Seq("2.10.4", "2.9.2", "2.9.1-1", "2.9.1") logLevel := Level.Info @@ -34,12 +34,12 @@ libraryDependencies <++= scalaVersion { sv => "log4j" % "log4j" % "1.2.16" % "provided" :: (sv match { case "2.11.1" => "org.specs2" %% "specs2" % "2.3.12" % "test" - case "2.10.0" | "2.9.2" | "2.9.1" | "2.9.1-1" => "org.specs2" %% "specs2" % "1.12.3" % "test" + case "2.10.4" | "2.9.2" | "2.9.1" | "2.9.1-1" => "org.specs2" %% "specs2" % "1.12.3" % "test" case _ => "org.specs2" %% "specs2" % "1.12.3" % "test" }) :: (sv match { case "2.11.1" => "org.scalacheck" %% "scalacheck" % "1.11.4" % "test" - case "2.10.0" | "2.9.2" => "org.scalacheck" %% "scalacheck" % "1.10.0" % "test" + case "2.10.4" | "2.9.2" => "org.scalacheck" %% "scalacheck" % "1.10.0" % "test" case _ => "org.scalacheck" %% "scalacheck" % "1.10.0" % "test" }) :: Nil diff --git a/project/autobuildscript/build-publish-Lift25.txt b/project/autobuildscript/build-publish-Lift25.txt index dda7c58..49ff4be 100644 --- a/project/autobuildscript/build-publish-Lift25.txt +++ b/project/autobuildscript/build-publish-Lift25.txt @@ -1,6 +1,6 @@ -alias pub=publish-signed +alias pub=publish-local-signed -set version in ThisBuild:="2.8" +set version in ThisBuild:="2.9-SNAPSHOT" set scalacOptions += "-target:jvm-1.5" set javacOptions ++= Seq("-source", "1.5", "-target", "1.5") diff --git a/project/autobuildscript/build-publish-Lift26.txt b/project/autobuildscript/build-publish-Lift26.txt index bfe380f..58e19fe 100644 --- a/project/autobuildscript/build-publish-Lift26.txt +++ b/project/autobuildscript/build-publish-Lift26.txt @@ -1,6 +1,6 @@ -alias pub=publish-signed +alias pub=publish-local-signed -set version in ThisBuild:="2.8" +set version in ThisBuild:="2.9-SNAPSHOT" set scalacOptions += "-target:jvm-1.5" set javacOptions ++= Seq("-source", "1.5", "-target", "1.5") diff --git a/project/autobuildscript/build-publish-Lift3.txt b/project/autobuildscript/build-publish-Lift3.txt index 52f22ab..d3519c2 100644 --- a/project/autobuildscript/build-publish-Lift3.txt +++ b/project/autobuildscript/build-publish-Lift3.txt @@ -1,12 +1,12 @@ -alias pub=publish-signed +alias pub=publish-local-signed -set version in ThisBuild:="2.8" +set version in ThisBuild:="2.9-SNAPSHOT" set scalacOptions in ThisBuild += "-target:jvm-1.7" set javacOptions in ThisBuild ++= Seq("-source", "1.7", "-target", "1.7") set liftVersion in ThisBuild:="3.0-M1" -set scalaVersion in ThisBuild:="2.10.0" +set scalaVersion in ThisBuild:="2.10.4" project lift-jquery-module set parallelExecution in Test := false