Merge pull request #614 from jbouffard/fix/travis/published-version-f…

…inal Travis Deployment Fixes
locationtech-labs · Jan 12, 2018 · 4e976ac · 4e976ac
2 parents 4398be0 + 724149e
commit 4e976ac
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -71,8 +71,5 @@ deploy:
     on:
       repo: locationtech-labs/geopyspark
       branch: master
-      jdk: oraclejdk8
-      scala: "2.11.8"
-
-after_deploy:
-  - rm -f "${HOME}/.bintray/.credentials"
+      tags: false
+      condition: "$TRAVIS_PYTHON_VERSION = 3.6"
diff --git a/deploy.sh b/deploy.sh
@@ -3,4 +3,6 @@
 set -e
 set -x
 
-cd geopyspark-backend && ./sbt "++TRAVIS_SCALA_VERSION" -Dbintray.user=$BINTRAY_USER -Dbintray.pass=$BINTRAY_PASS "project geotrellis-backend" publish
+cd geopyspark-backend \
+  && ./sbt -Dbintray.user=$BINTRAY_USER -Dbintray.pass=$BINTRAY_PASS "project geotrellis-backend" publish \
+  && ./sbt -Dbintray.user=$BINTRAY_USER -Dbintray.pass=$BINTRAY_PASS "project vectorpipe" publish
diff --git a/geopyspark-backend/build.sbt b/geopyspark-backend/build.sbt
@@ -27,7 +27,7 @@ lazy val commonSettings = Seq(
 lazy val publishSettings =
   Seq(
     bintrayOrganization := Some("azavea"),
-    bintrayRepository := "maven",
+    bintrayRepository := "geopyspark",
     bintrayVcsUrl := Some("https://github.com/locationtech-labs/geopyspark.git"),
     publishMavenStyle := true,
     publishArtifact in Test := false,

diff --git a/geopyspark-backend/project/plugins.sbt b/geopyspark-backend/project/plugins.sbt
@@ -7,4 +7,4 @@ addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.7.5")
 
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.13.0")
 
-addSbtPlugin("me.lessis" % "bintray-sbt" % "0.3.0")
+addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.2")