Skip to content

Commit 52e96ff

Browse files
committed
Merge pull request #138 from bpitman/master
print env
2 parents 654dac1 + 24a81a8 commit 52e96ff

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ endif
1818

1919
build:
2020
echo "Starting build"
21-
stty cols 5000
2221
$(SBT) 'inspect tree clean' test checkLicenseHeaders
2322

2423
publish:
@@ -37,5 +36,6 @@ license:
3736
$(SBT) formatLicenseHeaders
3837

3938
get-ivy-cache:
39+
stty cols 5000
4040
curl -L $(IVY_CACHE_URL) -o $(HOME)/ivy.tar.gz
4141
tar -C $(HOME) -xzf $(HOME)/ivy.tar.gz

project/Bintray.scala

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ object Bintray {
2222
licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0.txt")),
2323
credentials += Credentials("Artifactory Realm", "oss.jfrog.org", user, pass),
2424

25-
// publishTo := {
26-
// if (isSnapshot.value)
27-
// Some("OJO" at s"https://oss.jfrog.org/oss-snapshot-local;build.timestamp=${now}/")
28-
// else
29-
// publishTo in bintray value
30-
// //Some("bintray" at s"https://api.bintray.com/${bintrayOrganization.value.get}/${bintrayRepository.value}/")
31-
// },
25+
publishTo := {
26+
if (isSnapshot.value)
27+
Some("OJO" at s"https://oss.jfrog.org/oss-snapshot-local;build.timestamp=${now}/")
28+
else
29+
publishTo in bintray value
30+
//Some("bintray" at s"https://api.bintray.com/${bintrayOrganization.value.get}/${bintrayRepository.value}/")
31+
},
3232

3333
storeBintrayCredentials := {
3434
IO.write(bintrayCredentialsFile.value, api.template(user, pass))

project/sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ java \
1717
-Dsbt.boot.directory=${WORKSPACE:-$HOME}/.sbt \
1818
-Dsbt.ivy.home=${WORKSPACE:-$HOME}/.ivy2 \
1919
$OPTIONS \
20-
-jar `dirname $0`/sbt-launch.jar "$@"
20+
-jar `dirname $0`/sbt-launch-0.13.8.jar "$@"

0 commit comments

Comments
 (0)