Skip to content

Commit

Permalink
Merge pull request #138 from bpitman/master
Browse files Browse the repository at this point in the history
print env
  • Loading branch information
bpitman committed Jul 15, 2015
2 parents 654dac1 + 24a81a8 commit 52e96ff
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ endif

build:
echo "Starting build"
stty cols 5000
$(SBT) 'inspect tree clean' test checkLicenseHeaders

publish:
Expand All @@ -37,5 +36,6 @@ license:
$(SBT) formatLicenseHeaders

get-ivy-cache:
stty cols 5000
curl -L $(IVY_CACHE_URL) -o $(HOME)/ivy.tar.gz
tar -C $(HOME) -xzf $(HOME)/ivy.tar.gz
14 changes: 7 additions & 7 deletions project/Bintray.scala
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ 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}/")
// 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))
Expand Down
2 changes: 1 addition & 1 deletion project/sbt
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ java \
-Dsbt.boot.directory=${WORKSPACE:-$HOME}/.sbt \
-Dsbt.ivy.home=${WORKSPACE:-$HOME}/.ivy2 \
$OPTIONS \
-jar `dirname $0`/sbt-launch.jar "$@"
-jar `dirname $0`/sbt-launch-0.13.8.jar "$@"
Binary file not shown.

0 comments on commit 52e96ff

Please sign in to comment.