move upload to coveralls into test script, add GitVersioning plugin t…

…o various sub projects (#466)
bitcoin-s · May 9, 2019 · 88122fc · 88122fc
1 parent 37fac82
commit 88122fc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -58,10 +58,8 @@ jobs:
       script:
         sbt ++$TRAVIS_SCALA_VERSION coverage test &&
         sbt ++$TRAVIS_SCALA_VERSION core/coverageReport &&
-        sbt ++$TRAVIS_SCALA_VERSION coverageAggregate
+        sbt ++$TRAVIS_SCALA_VERSION coverageAggregate &&
+        sbt ++$TRAVIS_SCALA_VERSION coveralls
     # run ci-release only if previous stages passed
     - stage: release
       script: sbt ci-release
-
-after_success:
-  - sbt ++$TRAVIS_SCALA_VERSION coveralls
diff --git a/build.sbt b/build.sbt
@@ -1,3 +1,5 @@
+import sbt.Credentials
+import sbt.Keys.publishTo
 import com.typesafe.sbt.SbtGit.GitKeys._
 
 import scala.util.Properties
@@ -130,14 +132,14 @@ lazy val secp256k1jni = project
     //https://github.com/scoverage/sbt-scoverage/issues/275
     coverageEnabled := false
   )
-  .enablePlugins()
+  .enablePlugins(GitVersioning)
 
 lazy val core = project
   .in(file("core"))
   .settings(commonProdSettings: _*)
   .dependsOn(
     secp256k1jni
-  ).enablePlugins()
+  ).enablePlugins(GitVersioning)
 
 lazy val coreTest = project
   .in(file("core-test"))
@@ -157,7 +159,7 @@ lazy val zmq = project
     libraryDependencies ++= Deps.bitcoindZmq)
   .dependsOn(
     core
-  ).enablePlugins()
+  ).enablePlugins(GitVersioning)
 
 lazy val bitcoindRpc = project
   .in(file("bitcoind-rpc"))
@@ -166,7 +168,7 @@ lazy val bitcoindRpc = project
     name := "bitcoin-s-bitcoind-rpc",
     libraryDependencies ++= Deps.bitcoindRpc)
   .dependsOn(core)
-  .enablePlugins()
+  .enablePlugins(GitVersioning)
 
 lazy val bitcoindRpcTest = project
   .in(file("bitcoind-rpc-test"))
@@ -189,7 +191,7 @@ lazy val bench = project
     skip in publish := true
   )
   .dependsOn(core)
-  .enablePlugins()
+  .enablePlugins(GitVersioning)
 
 lazy val eclairRpc = project
   .in(file("eclair-rpc"))
@@ -200,7 +202,7 @@ lazy val eclairRpc = project
   .dependsOn(
     core,
     bitcoindRpc
-  ).enablePlugins()
+  ).enablePlugins(GitVersioning)
 
 lazy val eclairRpcTest = project
   .in(file("eclair-rpc-test"))
@@ -218,7 +220,7 @@ lazy val testkit = project
     core,
     bitcoindRpc,
     eclairRpc
-  ).enablePlugins()
+  ).enablePlugins(GitVersioning)
 
 
 lazy val doc = project