From 3b783cc9715d993dfa1c99b920b198aaca206d39 Mon Sep 17 00:00:00 2001 From: Brent Pitman Date: Wed, 15 Jul 2015 14:47:45 -0700 Subject: [PATCH 1/7] Change scala to 2.11.6 --- .travis.yml | 2 +- Makefile | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index e1845820..bbfcab8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: scala jdk: - oraclejdk7 scala: - - 2.11.5 + - 2.11.6 sudo: false script: - "make travis" diff --git a/Makefile b/Makefile index 5f3ef410..1be0743f 100644 --- a/Makefile +++ b/Makefile @@ -18,15 +18,15 @@ endif build: echo "Starting build" - $(SBT) 'inspect tree clean' test checkLicenseHeaders + $(SBT) clean test checkLicenseHeaders publish: echo "Starting publish" - $(SBT) 'inspect tree clean' test checkLicenseHeaders storeBintrayCredentials publish + $(SBT) clean test checkLicenseHeaders storeBintrayCredentials publish release: echo "Starting release" - $(SBT) 'inspect tree clean' test checkLicenseHeaders storeBintrayCredentials publish bintrayRelease + $(SBT) clean test checkLicenseHeaders storeBintrayCredentials publish bintrayRelease coverage: $(SBT) clean coverage test coverageReport @@ -37,5 +37,6 @@ license: get-ivy-cache: stty cols 5000 + $(SBT) --version curl -L $(IVY_CACHE_URL) -o $(HOME)/ivy.tar.gz tar -C $(HOME) -xzf $(HOME)/ivy.tar.gz From 7b642e9311d23c7528c6029e73e3ccb5790ae6c4 Mon Sep 17 00:00:00 2001 From: Brent Pitman Date: Wed, 15 Jul 2015 15:50:42 -0700 Subject: [PATCH 2/7] log exec lines --- project/sbt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/project/sbt b/project/sbt index 3e4942d3..3631b646 100755 --- a/project/sbt +++ b/project/sbt @@ -1,3 +1,5 @@ +#!/bin/bash -v + # This script is used to launch sbt on developer workstations. # Additional options to add in when calling java From ca3fc5645221e95d767db355edbce396b7fd6ad6 Mon Sep 17 00:00:00 2001 From: Brent Pitman Date: Wed, 15 Jul 2015 15:55:26 -0700 Subject: [PATCH 3/7] log java cmd --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1be0743f..8953a17c 100644 --- a/Makefile +++ b/Makefile @@ -37,6 +37,7 @@ license: get-ivy-cache: stty cols 5000 - $(SBT) --version + which java + #$(SBT) --version curl -L $(IVY_CACHE_URL) -o $(HOME)/ivy.tar.gz tar -C $(HOME) -xzf $(HOME)/ivy.tar.gz From 4747977451e4592b020925c12a0eff8f27f9e79e Mon Sep 17 00:00:00 2001 From: Brent Pitman Date: Wed, 15 Jul 2015 15:58:11 -0700 Subject: [PATCH 4/7] more logging --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 8953a17c..606eba0e 100644 --- a/Makefile +++ b/Makefile @@ -38,6 +38,7 @@ license: get-ivy-cache: stty cols 5000 which java + find ${WORKSPACE:-$HOME}/.sbt #$(SBT) --version curl -L $(IVY_CACHE_URL) -o $(HOME)/ivy.tar.gz tar -C $(HOME) -xzf $(HOME)/ivy.tar.gz From d5a3dddf36022958aaec9b58dfa24a4e08cabe9f Mon Sep 17 00:00:00 2001 From: Brent Pitman Date: Wed, 15 Jul 2015 15:58:59 -0700 Subject: [PATCH 5/7] add inspect back in --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 606eba0e..9ee1a172 100644 --- a/Makefile +++ b/Makefile @@ -18,15 +18,15 @@ endif build: echo "Starting build" - $(SBT) clean test checkLicenseHeaders + $(SBT) 'inspect tree clean' clean test checkLicenseHeaders publish: echo "Starting publish" - $(SBT) clean test checkLicenseHeaders storeBintrayCredentials publish + $(SBT) 'inspect tree clean' clean test checkLicenseHeaders storeBintrayCredentials publish release: echo "Starting release" - $(SBT) clean test checkLicenseHeaders storeBintrayCredentials publish bintrayRelease + $(SBT) 'inspect tree clean' clean test checkLicenseHeaders storeBintrayCredentials publish bintrayRelease coverage: $(SBT) clean coverage test coverageReport From 51545e043a31fea012998c8493c20fe454cef8bf Mon Sep 17 00:00:00 2001 From: Brent Pitman Date: Wed, 15 Jul 2015 16:21:12 -0700 Subject: [PATCH 6/7] Remove .sbt check --- Makefile | 2 +- project/Bintray.scala | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9ee1a172..da278126 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ license: get-ivy-cache: stty cols 5000 which java - find ${WORKSPACE:-$HOME}/.sbt + #find ${WORKSPACE:-$HOME}/.sbt #$(SBT) --version 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 79ae2e1a..32fa0b55 100644 --- a/project/Bintray.scala +++ b/project/Bintray.scala @@ -22,6 +22,7 @@ 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}/") @@ -29,6 +30,7 @@ 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)) From c4b31f3ea2efa8e9841fc548e6b62a8bc6879001 Mon Sep 17 00:00:00 2001 From: Brent Pitman Date: Wed, 15 Jul 2015 16:35:06 -0700 Subject: [PATCH 7/7] 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))