Merge pull request #255 from lrytz/ci-release

Use version set by sbt-dynver, not by parsing travis tag

Author: lrytz

build.sbt

@@ -281,7 +281,7 @@ lazy val dontPublish = Seq(
 )
 
 val travisScalaVersion = sys.env.get("TRAVIS_SCALA_VERSION").flatMap(Version.parse)
-val releaseVersion     = sys.env.get("TRAVIS_TAG").flatMap(Version.parse)
+val isTravisTag        = sys.env.get("TRAVIS_TAG").map(_.nonEmpty).getOrElse(false)
 val isScalaJs          = sys.env.get("SCALAJS_VERSION").map(_.nonEmpty).getOrElse(false)
 val isScalaNative      = sys.env.get("SCALANATIVE_VERSION").map(_.nonEmpty).getOrElse(false)
 val isScalafix         = sys.env.get("TEST_SCALAFIX").nonEmpty
@@ -339,11 +339,8 @@ inThisBuild(
               compatProject
             }
 
-          val setPublishVersion =
-            releaseVersion.map("set every version := \"" + _ + "\"").toList
-
           val publishTask =
-            if (releaseVersion.nonEmpty && !isBinaryCompat && jdkVersion == Some(8)) {
+            if (isTravisTag && !isBinaryCompat && jdkVersion == Some(8)) {
               // we cannot run "ci-release" because that reads the `CI_RELEASE` / `CI_SONATYPE_RELEASE`
               // env vars, which we cannot modify from java (easily). so we inline what this command does.
               CiReleasePlugin.setupGpg()
@@ -361,7 +358,6 @@ inThisBuild(
             }
 
           Seq(
-            setPublishVersion,
             List(s"$projectPrefix/clean"),
             if (isScalaNative) List() else List(s"$testProjectPrefix/test"),
             List(s"$projectPrefix/publishLocal"),