Skip to content

Commit

Permalink
Merge pull request #664 from ergoplatform/tcp-fix
Browse files Browse the repository at this point in the history
Scorex version with tcp fix.
  • Loading branch information
oskin1 authored Mar 21, 2019
2 parents a08114e + 3349e94 commit fa28364
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import sbt._
lazy val commonSettings = Seq(
organization := "org.ergoplatform",
name := "ergo",
version := "2.0.0",
version := "2.0.1",
scalaVersion := "2.12.8",
resolvers ++= Seq("Sonatype Releases" at "https://oss.sonatype.org/content/repositories/releases/",
"SonaType" at "https://oss.sonatype.org/content/groups/public",
Expand All @@ -14,7 +14,7 @@ lazy val commonSettings = Seq(
licenses := Seq("CC0" -> url("https://creativecommons.org/publicdomain/zero/1.0/legalcode"))
)

val scorexVersion = "c33ceedf-SNAPSHOT"
val scorexVersion = "1594a02c-SNAPSHOT"
val sigmaStateVersion = "master-2b4b07a1-SNAPSHOT"
// for testing current sigmastate build (see sigmastate-ergo-it jenkins job)
val effectiveSigmaStateVersion = Option(System.getenv().get("SIGMASTATE_VERSION")).getOrElse(sigmaStateVersion)
Expand Down
4 changes: 2 additions & 2 deletions lock.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ dependencyOverrides in ThisBuild ++= Seq(
"org.scalacheck" % "scalacheck_2.12" % "1.13.5",
"org.scorexfoundation" % "avl-iodb_2.12" % "0.2.15",
"org.scorexfoundation" % "iodb_2.12" % "0.3.2",
"org.scorexfoundation" % "scorex-core_2.12" % "c33ceedf-SNAPSHOT",
"org.scorexfoundation" % "scorex-core_2.12" % "1594a02c-SNAPSHOT",
"org.scorexfoundation" % "scorex-util_2.12" % "0.1.3",
"org.scorexfoundation" % "scrypto_2.12" % "2.1.6",
"org.scorexfoundation" % "sigma-api_2.12" % "master-2b4b07a1-SNAPSHOT",
Expand All @@ -83,4 +83,4 @@ dependencyOverrides in ThisBuild ++= Seq(
"org.typelevel" % "spire_2.12" % "0.14.1",
"org.whispersystems" % "curve25519-java" % "0.5.0"
)
// LIBRARY_DEPENDENCIES_HASH 052d963f4fdab429a697701ab969eac901770569
// LIBRARY_DEPENDENCIES_HASH 32ebddd3cf1247df26d339b64b37b4b3b60d798c

0 comments on commit fa28364

Please sign in to comment.