From cbcf7ab076a3979e7ce4b05f1ebb78591e109023 Mon Sep 17 00:00:00 2001 From: rampalli-github Date: Fri, 10 Apr 2015 11:30:42 +0530 Subject: [PATCH 1/2] upgrade sbt, scala, scalate, scalacheck, jackson --- project/build.properties | 2 +- project/build.scala | 62 ++++++++++++++++++++-------------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/project/build.properties b/project/build.properties index 8ac605a..a6e117b 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.2 +sbt.version=0.13.8 diff --git a/project/build.scala b/project/build.scala index ae5c9f0..7a8b03a 100644 --- a/project/build.scala +++ b/project/build.scala @@ -4,17 +4,17 @@ import Keys._ object JacksBuild extends Build { val buildSettings = Project.defaultSettings ++ Seq( name := "jacks", - version := "2.3.3", + version := "2.3.4", organization := "com.lambdaworks", - scalaVersion := "2.11.0", + scalaVersion := "2.11.6", - crossScalaVersions := Seq("2.11.0", "2.10.4"), + crossScalaVersions := Seq("2.11.6", "2.10.5"), libraryDependencies <+= scalaVersion("org.scala-lang" % "scalap" % _), libraryDependencies ++= Seq( - "com.fasterxml.jackson.core" % "jackson-databind" % "2.3.3", - "org.scalatest" %% "scalatest" % "2.1.3" % "test", - "org.scalacheck" %% "scalacheck" % "1.11.3" % "test" + "com.fasterxml.jackson.core" % "jackson-databind" % "2.4.4", + "org.scalatest" %% "scalatest" % "2.2.4" % "test", + "org.scalacheck" %% "scalacheck" % "1.12.2" % "test" ), scalacOptions ++= Seq( "-language:_", "-unchecked", "-optimize"), @@ -29,31 +29,31 @@ object JacksBuild extends Build { } }, - pomIncludeRepository := { _ => false }, - pomExtra := ( - http://github.com/wg/jacks - - - scm:git:git://github.com/wg/jacks.git - scm:git:git://github.com/wg/jacks.git - http://github.com/wg/jacks - - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - will - Will Glozer - - - ) + pomIncludeRepository := { _ => false }//, +// pomExtra := ( +// http://github.com/wg/jacks +// +// +// scm:git:git://github.com/wg/jacks.git +// scm:git:git://github.com/wg/jacks.git +// http://github.com/wg/jacks +// +// +// +// +// Apache License, Version 2.0 +// http://www.apache.org/licenses/LICENSE-2.0.txt +// repo +// +// +// +// +// +// will +// Will Glozer +// +// +// ) ) val jacks = Project(id = "jacks", base = file("."), settings = buildSettings) From e2a99f2bea3f7052f28990bc204151d6b5ec5b73 Mon Sep 17 00:00:00 2001 From: rampalli-github Date: Fri, 10 Apr 2015 11:34:02 +0530 Subject: [PATCH 2/2] uncomment pomExtra --- project/build.scala | 50 ++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/project/build.scala b/project/build.scala index 7a8b03a..07e2328 100644 --- a/project/build.scala +++ b/project/build.scala @@ -29,31 +29,31 @@ object JacksBuild extends Build { } }, - pomIncludeRepository := { _ => false }//, -// pomExtra := ( -// http://github.com/wg/jacks -// -// -// scm:git:git://github.com/wg/jacks.git -// scm:git:git://github.com/wg/jacks.git -// http://github.com/wg/jacks -// -// -// -// -// Apache License, Version 2.0 -// http://www.apache.org/licenses/LICENSE-2.0.txt -// repo -// -// -// -// -// -// will -// Will Glozer -// -// -// ) + pomIncludeRepository := { _ => false }, + pomExtra := ( + http://github.com/wg/jacks + + + scm:git:git://github.com/wg/jacks.git + scm:git:git://github.com/wg/jacks.git + http://github.com/wg/jacks + + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + will + Will Glozer + + + ) ) val jacks = Project(id = "jacks", base = file("."), settings = buildSettings)