Skip to content

Upgrade scala and sbt #221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
komamitsu merged 4 commits into from
Apr 27, 2015
Merged

Upgrade scala and sbt #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
27c4d1b
Fix version in README
xerial Apr 27, 2015
a6b3bec
Upgrade scala and sbt versions
xerial Apr 27, 2015
2d70492
Removed sbt-idea plugin, which is no longer necessary
xerial Apr 27, 2015
8c2bae4
Upgrade sbt script
xerial Apr 27, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ++
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
sbt.version=0.13.6
sbt.version=0.13.8

2 changes: 0 additions & 2 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
6 changes: 3 additions & 3 deletions sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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##*/}"
Expand Down