diff --git a/Makefile b/Makefile index af3f4ce0..5f3ef410 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,6 @@ endif build: echo "Starting build" - stty cols 5000 $(SBT) 'inspect tree clean' test checkLicenseHeaders publish: @@ -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 diff --git a/project/Bintray.scala b/project/Bintray.scala index beeac4b2..79ae2e1a 100644 --- a/project/Bintray.scala +++ b/project/Bintray.scala @@ -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)) diff --git a/project/sbt b/project/sbt index 0753615d..3e4942d3 100755 --- a/project/sbt +++ b/project/sbt @@ -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 "$@" diff --git a/project/sbt-launch.jar b/project/sbt-launch-0.13.8.jar similarity index 72% rename from project/sbt-launch.jar rename to project/sbt-launch-0.13.8.jar index 1c1cecaa..0d9dd94c 100755 Binary files a/project/sbt-launch.jar and b/project/sbt-launch-0.13.8.jar differ