From c4b31f3ea2efa8e9841fc548e6b62a8bc6879001 Mon Sep 17 00:00:00 2001 From: Brent Pitman Date: Wed, 15 Jul 2015 16:35:06 -0700 Subject: [PATCH] Try storing creds in separate command --- Makefile | 6 ++++-- project/Bintray.scala | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index da278126..7e6667ba 100644 --- a/Makefile +++ b/Makefile @@ -22,11 +22,13 @@ build: publish: echo "Starting publish" - $(SBT) 'inspect tree clean' clean test checkLicenseHeaders storeBintrayCredentials publish + $(SBT) storeBintrayCredentials + $(SBT) 'inspect tree clean' clean test checkLicenseHeaders publish release: echo "Starting release" - $(SBT) 'inspect tree clean' clean test checkLicenseHeaders storeBintrayCredentials publish bintrayRelease + $(SBT) storeBintrayCredentials + $(SBT) 'inspect tree clean' clean test checkLicenseHeaders publish bintrayRelease coverage: $(SBT) clean coverage test coverageReport diff --git a/project/Bintray.scala b/project/Bintray.scala index 32fa0b55..79ae2e1a 100644 --- a/project/Bintray.scala +++ b/project/Bintray.scala @@ -22,7 +22,6 @@ object Bintray { 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}/") @@ -30,7 +29,6 @@ object Bintray { 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))