Make timestamp a lazy val outside of versioning code (#317)

* Make timestamp a lazy val outside of versioning code

* revert bitcoin-s snapshot to something that is published
This commit is contained in:
Chris Stewart 2019-01-30 04:38:15 -06:00 committed by GitHub
parent 8bbd4e0631
commit 4fa376eac9
2 changed files with 5 additions and 3 deletions

View File

@ -5,6 +5,8 @@ import com.typesafe.sbt.SbtGit.GitKeys._
cancelable in Global := true cancelable in Global := true
lazy val timestamp = new java.util.Date().getTime
lazy val commonCompilerOpts = { lazy val commonCompilerOpts = {
List( List(
"-Xmax-classfile-name", "-Xmax-classfile-name",
@ -70,7 +72,7 @@ lazy val commonSettings = List(
val bintrayPublish = publishTo.value val bintrayPublish = publishTo.value
if (isSnapshot.value) { if (isSnapshot.value) {
Some("Artifactory Realm" at Some("Artifactory Realm" at
"https://oss.jfrog.org/artifactory/oss-snapshot-local;build.timestamp=" + new java.util.Date().getTime) "https://oss.jfrog.org/artifactory/oss-snapshot-local;build.timestamp=" + timestamp)
} else { } else {
bintrayPublish bintrayPublish
} }
@ -81,7 +83,7 @@ lazy val commonSettings = List(
//fix for https://github.com/sbt/sbt/issues/3519 //fix for https://github.com/sbt/sbt/issues/3519
updateOptions := updateOptions.value.withGigahorse(false), updateOptions := updateOptions.value.withGigahorse(false),
git.formattedShaVersion := git.gitHeadCommit.value.map { sha => s"${sha.take(6)}-${new java.util.Date().getTime}-SNAPSHOT" } git.formattedShaVersion := git.gitHeadCommit.value.map { sha => s"${sha.take(6)}-${timestamp}-SNAPSHOT" }
) )

View File

@ -17,7 +17,7 @@ object Deps {
val nativeLoaderV = "2.3.2" val nativeLoaderV = "2.3.2"
val typesafeConfigV = "1.3.3" val typesafeConfigV = "1.3.3"
val bitcoinsV = "5d3bf4-1548681478579-SNAPSHOT" val bitcoinsV = "0.0.4.1-SNAPSHOT"
} }
object Compile { object Compile {