Merge pull request msgpack#221 from xerial/upgrade-scala

komamitsu · komamitsu · commit d9919ee71da3 · 2015-04-27T13:34:51.000+09:00
Upgrade scala and sbt
diff --git a/README.md b/README.md
@@ -17,13 +17,13 @@ For Maven users:
 <dependency>
    <groupId>org.msgpack</groupId>
    <artifactId>msgpack-core</artifactId>
-   <version>0.7.0-p7</version>
+   <version>0.7.0-p9</version>
 </dependency>
 ```
 
 For sbt users:
 ```
-libraryDependencies += "org.msgpack" % "msgpack-core" % "0.7.0-p7"
+libraryDependencies += "org.msgpack" % "msgpack-core" % "0.7.0-p9"
 ```
 
 - [Usage examples](msgpack-core/src/main/java/org/msgpack/core/example/MessagePackExample.java)
diff --git a/project/Build.scala b/project/Build.scala
@@ -27,7 +27,7 @@ import com.typesafe.sbt.pgp.PgpKeys
 
 object Build extends Build {
 
-  val SCALA_VERSION = "2.11.1"
+  val SCALA_VERSION = "2.11.6"
 
   lazy val buildSettings = Defaults.coreDefaultSettings ++
     releaseSettings ++
@@ -162,7 +162,7 @@ object Build extends Build {
     val testLib = Seq(
       "org.scalatest" %% "scalatest" % "2.2.4" % "test",
       "org.scalacheck" %% "scalacheck" % "1.12.2" % "test",
-      "org.xerial" % "xerial-core" % "3.3.5" % "test",
+      "org.xerial" % "xerial-core" % "3.3.6" % "test",
       "org.msgpack" % "msgpack" % "0.6.11" % "test",
       junitInterface,
       "commons-codec" % "commons-codec" % "1.10" % "test",
diff --git a/project/build.properties b/project/build.properties
@@ -1,2 +1,2 @@
-sbt.version=0.13.6
+sbt.version=0.13.8
 
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -5,8 +5,6 @@ addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "0.2.1")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.3")
 
-addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")
-
 addSbtPlugin("de.johoop" % "findbugs4sbt" % "1.3.0")
 
 addSbtPlugin("de.johoop" % "jacoco4sbt" % "2.1.6")
diff --git a/sbt b/sbt
@@ -4,8 +4,8 @@
 # Author: Paul Phillips <paulp@typesafe.com>
 
 # todo - make this dynamic
-declare -r sbt_release_version="0.13.1"
-declare -r sbt_unreleased_version="0.13.2-SNAPSHOT" # -sbt-dev doesn't work at present
+declare -r sbt_release_version="0.13.8"
+declare -r sbt_unreleased_version="0.13.8-SNAPSHOT" # -sbt-dev doesn't work at present
 declare -r buildProps="project/build.properties"
 
 declare sbt_jar sbt_dir sbt_create sbt_launch_dir
@@ -124,7 +124,7 @@ declare -r noshare_opts="-Dsbt.global.base=project/.sbtboot -Dsbt.boot.directory
 declare -r latest_28="2.8.2"
 declare -r latest_29="2.9.3"
 declare -r latest_210="2.10.3"
-declare -r latest_211="2.11.0-M5"
+declare -r latest_211="2.11.6"
 
 declare -r script_path="$(get_script_path "$BASH_SOURCE")"
 declare -r script_name="${script_path##*/}"

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-sbt.version=0.13.6`
	`1`	`+sbt.version=0.13.8`
`2`	`2`