Merge pull request #135 from bpitman/master

Test explicit bintray settings
Netflix · Jul 14, 2015 · f77e461 · f77e461
2 parents a433449 + 00a8a0d
commit f77e461
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: scala
 jdk:
-  - oraclejdk7
+  - oraclejdk8
 scala:
   - 2.11.5
 sudo: false

diff --git a/project/Bintray.scala b/project/Bintray.scala
@@ -22,7 +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 in bintray := {
+    publishTo := {
       if (isSnapshot.value)
         Some("OJO" at s"https://oss.jfrog.org/oss-snapshot-local;build.timestamp=${now}/")
       else