From d6ff0b6731117bd68e55134fd17b2e66ff8c9b09 Mon Sep 17 00:00:00 2001 From: Erik Osheim Date: Wed, 5 Mar 2014 22:17:34 -0500 Subject: [PATCH] Bintray release junk, docs, and errata. This commit adds bintray support, bumps the version, and works around a really dumb Scaladoc bug. --- README.md | 4 +--- build.sbt | 5 +++++ project/Build.scala | 2 +- project/build.properties | 2 +- project/plugins.sbt | 6 ++++++ src/main/scala/debox/Buffer.scala | 2 +- 6 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 build.sbt create mode 100644 project/plugins.sbt diff --git a/README.md b/README.md index c612137..568b8a3 100644 --- a/README.md +++ b/README.md @@ -13,15 +13,13 @@ Debox is available for Scala 2.10, and depends on Spire. ### Set up -*Debox is not yet published, so these instructions do not yet apply.* - If you have a Scala 2.10 which uses SBT, add the following to `build.sbt`: ``` resolvers += "bintray/non" at "http://dl.bintray.com/non/maven" -libraryDependencies += "org.spire-math" %% "debox" % "0.3.0" +libraryDependencies += "org.spire-math" %% "debox" % "0.4.0" ``` ### Debox Types diff --git a/build.sbt b/build.sbt new file mode 100644 index 0000000..8928fe7 --- /dev/null +++ b/build.sbt @@ -0,0 +1,5 @@ +seq(bintrayResolverSettings: _*) + +seq(bintrayPublishSettings: _*) + +licenses += ("MIT", url("http://opensource.org/licenses/MIT")) diff --git a/project/Build.scala b/project/Build.scala index fecbbe7..e5d1230 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -4,7 +4,7 @@ import sbt.Keys._ object MyBuild extends Build { override lazy val settings = super.settings ++ Seq( name := "debox", - version := "0.3.0", + version := "0.4.0", scalaVersion := "2.10.3", diff --git a/project/build.properties b/project/build.properties index a8c2f84..0974fce 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.12.0 +sbt.version=0.13.0 diff --git a/project/plugins.sbt b/project/plugins.sbt new file mode 100644 index 0000000..c61a4a3 --- /dev/null +++ b/project/plugins.sbt @@ -0,0 +1,6 @@ +resolvers += Resolver.url( + "bintray-sbt-plugin-releases", + url("http://dl.bintray.com/content/sbt/sbt-plugin-releases") +)(Resolver.ivyStylePatterns) + +addSbtPlugin("me.lessis" % "bintray-sbt" % "0.1.1") diff --git a/src/main/scala/debox/Buffer.scala b/src/main/scala/debox/Buffer.scala index e002634..20bf1ad 100644 --- a/src/main/scala/debox/Buffer.scala +++ b/src/main/scala/debox/Buffer.scala @@ -751,7 +751,7 @@ object Buffer { * The identity value is an empty buffer, and the ++ operator is * used to concatenate two buffers without modifying their contents. */ - implicit def monoid[@sp A: ClassTag]: Monoid[Buffer[A]] = + implicit def monoid[@sp A: ClassTag] = new Monoid[Buffer[A]] { def id: Buffer[A] = Buffer.empty[A] def op(lhs: Buffer[A], rhs: Buffer[A]): Buffer[A] = lhs ++ rhs