Skip to content

Commit

Permalink
Merge pull request #102 from wavesplatform/version-0.4.1
Browse files Browse the repository at this point in the history
Version was set to 0.4.1. Version 1.5.1 of Scorex was used.
  • Loading branch information
alexeykiselev authored Dec 23, 2016
2 parents 72afb2d + 9bbca54 commit 47760bb
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ scalacOptions in ThisBuild += "-target:jvm-1.8"

resolvers += "SonaType" at "https://oss.sonatype.org/content/groups/public"

val scorexVersion = "1.5.1-SNAPSHOT"
val scorexVersion = "1.5.1"

libraryDependencies ++= Seq(
"com.wavesplatform" %% "scorex-basics" % scorexVersion,
Expand Down
24 changes: 12 additions & 12 deletions lock.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencyOverrides in ThisBuild ++= Set(
"com.fasterxml.jackson.jaxrs" % "jackson-jaxrs-json-provider" % "2.4.5",
"com.fasterxml.jackson.module" % "jackson-module-jaxb-annotations" % "2.4.5",
"com.fasterxml.jackson.module" % "jackson-module-scala_2.11" % "2.4.2",
"com.github.dnvriend" % "akka-persistence-inmemory_2.11" % "1.3.17",
"com.github.dnvriend" % "akka-persistence-inmemory_2.11" % "1.3.18",
"com.github.jnr" % "jffi" % "1.2.10",
"com.github.jnr" % "jnr-constants" % "0.9.0",
"com.github.jnr" % "jnr-ffi" % "2.0.7",
Expand All @@ -34,24 +34,24 @@ dependencyOverrides in ThisBuild ++= Set(
"com.thoughtworks.paranamer" % "paranamer" % "2.6",
"com.typesafe" % "config" % "1.3.0",
"com.typesafe" % "ssl-config-core_2.11" % "0.2.1",
"com.typesafe.akka" % "akka-actor_2.11" % "2.4.14",
"com.typesafe.akka" % "akka-actor_2.11" % "2.4.16",
"com.typesafe.akka" % "akka-http-core_2.11" % "10.0.0",
"com.typesafe.akka" % "akka-http_2.11" % "10.0.0",
"com.typesafe.akka" % "akka-parsing_2.11" % "10.0.0",
"com.typesafe.akka" % "akka-persistence-query-experimental_2.11" % "2.4.14",
"com.typesafe.akka" % "akka-persistence_2.11" % "2.4.14",
"com.typesafe.akka" % "akka-protobuf_2.11" % "2.4.14",
"com.typesafe.akka" % "akka-persistence-query-experimental_2.11" % "2.4.16",
"com.typesafe.akka" % "akka-persistence_2.11" % "2.4.16",
"com.typesafe.akka" % "akka-protobuf_2.11" % "2.4.16",
"com.typesafe.akka" % "akka-slf4j_2.11" % "2.4.14",
"com.typesafe.akka" % "akka-stream-testkit_2.11" % "2.4.14",
"com.typesafe.akka" % "akka-stream_2.11" % "2.4.14",
"com.typesafe.akka" % "akka-testkit_2.11" % "2.4.14",
"com.typesafe.akka" % "akka-stream-testkit_2.11" % "2.4.16",
"com.typesafe.akka" % "akka-stream_2.11" % "2.4.16",
"com.typesafe.akka" % "akka-testkit_2.11" % "2.4.16",
"com.typesafe.play" % "play-datacommons_2.11" % "2.4.8",
"com.typesafe.play" % "play-functional_2.11" % "2.4.8",
"com.typesafe.play" % "play-iteratees_2.11" % "2.4.8",
"com.typesafe.play" % "play-json_2.11" % "2.4.8",
"com.wavesplatform" % "scorex-basics_2.11" % "1.5.1-SNAPSHOT",
"com.wavesplatform" % "scorex-consensus_2.11" % "1.5.1-SNAPSHOT",
"com.wavesplatform" % "scorex-transaction_2.11" % "1.5.1-SNAPSHOT",
"com.wavesplatform" % "scorex-basics_2.11" % "1.5.1",
"com.wavesplatform" % "scorex-consensus_2.11" % "1.5.1",
"com.wavesplatform" % "scorex-transaction_2.11" % "1.5.1",
"commons-net" % "commons-net" % "3.5",
"io.dropwizard.metrics" % "metrics-core" % "3.1.2",
"io.netty" % "netty" % "3.10.0.Final",
Expand Down Expand Up @@ -102,4 +102,4 @@ dependencyOverrides in ThisBuild ++= Set(
"org.whispersystems" % "curve25519-java" % "0.2.4",
"org.yaml" % "snakeyaml" % "1.12"
)
// LIBRARY_DEPENDENCIES_HASH b83ad2dd6ebef21f692418855d70e72e075e5789
// LIBRARY_DEPENDENCIES_HASH 55e0255d76c0626f8f1674aa8243744e1a3664a8
2 changes: 1 addition & 1 deletion src/main/resources/application-dev.conf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
app {
product = "Waves"
release = "Release0"
version = "0.4.1-SNAPSHOT"
version = "0.4.1"
}
scorex {
fastHash = "scorex.crypto.hash.Blake2b256"
Expand Down

0 comments on commit 47760bb

Please sign in to comment.