Merge pull request #126 from bpitman/master

fix snapshot release?
Netflix · Jul 13, 2015 · 8ca1070 · 8ca1070
2 parents 33ac312 + bc04b0f
commit 8ca1070
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/project/Bintray.scala b/project/Bintray.scala
@@ -8,7 +8,7 @@ object Bintray {
   lazy val isPullRequest = sys.env.getOrElse("TRAVIS_PULL_REQUEST", "false") != "false"
   lazy val (user, pass) = {
     if (isPullRequest) ("dummyUser", "dummyPass")
-    else (sys env "bintrayUser", sys env "bintrayKey")
+    else (sys.env.getOrElse("bintrayUser", "missingUser"), sys.env.getOrElse("bintrayKey", "missingKey"))
   }
   lazy val storeBintrayCredentials = taskKey[Unit]("store bintray credentials")
 
@@ -22,7 +22,7 @@ object Bintray {
 
     publishTo := {
       if (isSnapshot.value) Some("jfrog" at "https://oss.jfrog.org/oss-snapshot-local/")
-      else publishTo.value
+      else Some("bintray" at "https://api.bintray.com/maven/")
     },
 
     storeBintrayCredentials := {

diff --git a/project/GitVersion.scala b/project/GitVersion.scala
@@ -10,7 +10,7 @@ object GitVersion {
       val isPullRequest = sys.env.getOrElse("TRAVIS_PULL_REQUEST", "false") != "false"
       git.gitDescribedVersion.value getOrElse "0.1-SNAPSHOT" match {
         case v if (isPullRequest) => s"0.0.0-PULLREQUEST"
-        case snapshotVersion(v, n, h) => s"${v}-${"%02d".format(n.toInt)}-${h}-SNAPSHOT"
+        case snapshotVersion(v, n, h) => s"${v}.${"%02d".format(n.toInt)}-${h}-SNAPSHOT"
         case releaseVersion(v) => v
         case v => v
       }