Merge pull request #13 from antonkulaga/master

updated dependencies, extended gitignore

Author: softprops

.gitignore

@@ -1 +1,19 @@
-target
+*.class
+*.log
+
+# sbt specific
+.cache/
+.history/
+.lib/
+dist/*
+target/
+lib_managed/
+src_managed/
+project/boot/
+project/plugins/project/
+
+# Scala-IDE specific
+.scala_dependencies
+.worksheet
+
+.idea

build.sbt

@@ -1,16 +1,18 @@
+import BintrayPlugin.autoImport._
+
 organization := "me.lessis"
 
 name := "retry"
 
-version := "0.2.0"
+version := "0.2.1"
 
 description := "a library of simple primitives for asynchronously retrying Scala Futures"
 
-crossScalaVersions := Seq("2.10.4", "2.11.1")
+crossScalaVersions := Seq("2.10.5", "2.11.6")
 
 libraryDependencies ++= Seq(
   "me.lessis" %% "odelay-core" % "0.1.0",
-  "org.scalatest" %% "scalatest" % "2.2.0" % "test")
+  "org.scalatest" %% "scalatest" % "2.2.4" % "test")
 
 scalacOptions += "-feature"
 
@@ -43,10 +45,8 @@ lsSettings
 
 LsKeys.tags in LsKeys.lsync := Seq("future", "retry")
 
-bintraySettings
-
-bintray.Keys.packageLabels in bintray.Keys.bintray := (LsKeys.tags in LsKeys.lsync).value
+bintrayPackageLabels := (LsKeys.tags in LsKeys.lsync).value
 
-resolvers += bintray.Opts.resolver.mavenRepo("softprops")
+resolvers += sbt.Resolver.bintrayRepo("softprops","maven")
 
-externalResolvers in LsKeys.lsync := (resolvers in bintray.Keys.bintray).value
+externalResolvers in LsKeys.lsync := (resolvers in bintray).value

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.0
+sbt.version=0.13.8

project/plugins.sbt

@@ -1,10 +1,3 @@
 addSbtPlugin("me.lessis" % "ls-sbt" % "0.1.3")
 
-//addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.2.0")
-
-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.2")
+addSbtPlugin("me.lessis" % "bintray-sbt" % "0.3.0")