Merge pull request #137 from bpitman/master

Log publishTo

Makefile

@@ -18,15 +18,16 @@ endif
 
 build:
 	echo "Starting build"
-	$(SBT) clean test checkLicenseHeaders
+	stty cols 5000
+	$(SBT) 'inspect tree clean' test checkLicenseHeaders
 
 publish:
 	echo "Starting publish"
-	$(SBT) clean test checkLicenseHeaders storeBintrayCredentials publish
+	$(SBT) 'inspect tree clean' test checkLicenseHeaders storeBintrayCredentials publish
 
 release:
 	echo "Starting release"
-	$(SBT) clean test checkLicenseHeaders storeBintrayCredentials publish bintrayRelease
+	$(SBT) 'inspect tree clean' test checkLicenseHeaders storeBintrayCredentials publish bintrayRelease
 
 coverage:
 	$(SBT) clean coverage test coverageReport

project/Bintray.scala

@@ -14,21 +14,21 @@ object Bintray {
   }
   lazy val storeBintrayCredentials = taskKey[Unit]("store bintray credentials")
 
-  lazy val settings: Seq[Def.Setting[_]] = buildPublishSettings ++ Seq(
+  lazy val settings: Seq[Def.Setting[_]] = bintraySettings ++ Seq(
     bintrayRepository := "maven",
     bintrayPackage := "iep",
     bintrayOrganization := Some("netflixoss"),
     bintrayReleaseOnPublish := false,
     licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0.txt")),
     credentials += Credentials("Artifactory Realm", "oss.jfrog.org", user, pass),
 
-    publishTo := {
-      if (isSnapshot.value)
-        Some("OJO" at s"https://oss.jfrog.org/oss-snapshot-local;build.timestamp=${now}/")
-      else
-        publishTo in bintray value
-        //Some("bintray" at s"https://api.bintray.com/${bintrayOrganization.value.get}/${bintrayRepository.value}/")
-    },
+//    publishTo := {
+//      if (isSnapshot.value)
+//        Some("OJO" at s"https://oss.jfrog.org/oss-snapshot-local;build.timestamp=${now}/")
+//      else
+//        publishTo in bintray value
+//        //Some("bintray" at s"https://api.bintray.com/${bintrayOrganization.value.get}/${bintrayRepository.value}/")
+//    },
 
     storeBintrayCredentials := {
       IO.write(bintrayCredentialsFile.value, api.template(user, pass))