diff --git a/CMakeLists.txt b/CMakeLists.txt index 2b6871e32..e0be5fea4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ include(EthPolicy) eth_policy() # project name and version should be set after cmake_policy CMP0048 -project(cpp-ethereum VERSION "1.2.0") +project(cpp-ethereum VERSION "1.2.1") include(EthCompilerSettings) diff --git a/alethzero b/alethzero index 785fc5e1f..2ce12f938 160000 --- a/alethzero +++ b/alethzero @@ -1 +1 @@ -Subproject commit 785fc5e1fa59cb6ed69d96f8bb27ac8cf35db437 +Subproject commit 2ce12f938378661da4820534d235bcbd06503bf5 diff --git a/dependency_graph/generate.py b/dependency_graph/generate.py index 47a552aae..387ac92a0 100755 --- a/dependency_graph/generate.py +++ b/dependency_graph/generate.py @@ -158,10 +158,17 @@ def processUmbrella(root): print " }" print ' "base" -> "boost"' print ' "base" -> "Jsoncpp"' +print ' "base" -> "json_spirit"' print ' "base" -> "LevelDB"' print ' "base" -> "pthreads"' print ' "secp256k1" -> "gmp"' +# Hard-coded dependencies for 'libaleth', which doesn't have a UseAleth.cmake +# to go with it, because the library is only used by the Aleth* applications, +# and is not exposed to other applications. +print ' "AlethZero" -> "aleth"' +print ' "AlethOne" -> "aleth"' + processUmbrella('..') print "}" diff --git a/libethereum b/libethereum index 45582db08..1b72dc785 160000 --- a/libethereum +++ b/libethereum @@ -1 +1 @@ -Subproject commit 45582db08ca37e5df9399a96df4dd9fbea2f4763 +Subproject commit 1b72dc785901da23f225e02de6a61cb272386f9b diff --git a/libweb3core b/libweb3core index d6093a980..e641c737d 160000 --- a/libweb3core +++ b/libweb3core @@ -1 +1 @@ -Subproject commit d6093a9802a5a29db114f06ad21076c8df266dbb +Subproject commit e641c737d922ed8ee9ac2b64bc5228c58b9c93b9 diff --git a/mix b/mix index 8bbca88b0..9f6fb2f58 160000 --- a/mix +++ b/mix @@ -1 +1 @@ -Subproject commit 8bbca88b0ec1581ec238d96d2de9590c2ddba8f1 +Subproject commit 9f6fb2f582079c7bffb54f8a61343775ca50d186 diff --git a/solidity b/solidity index 8339330ba..02bb315d9 160000 --- a/solidity +++ b/solidity @@ -1 +1 @@ -Subproject commit 8339330ba3d3ae5c3c84a686586e73cdc46b6eaa +Subproject commit 02bb315d9412b3c67fe6f24a072701439d4ddbec diff --git a/web3.js b/web3.js index ed0431c00..9642608f5 160000 --- a/web3.js +++ b/web3.js @@ -1 +1 @@ -Subproject commit ed0431c00ba2a16fc5253a78a4e4acfb56e7322e +Subproject commit 9642608f51ac82b9f7a286a092c3f4b02d410288 diff --git a/webthree b/webthree index 60f9147f0..1b54e3dec 160000 --- a/webthree +++ b/webthree @@ -1 +1 @@ -Subproject commit 60f9147f0089458d1f83d77d1964b28dba801c84 +Subproject commit 1b54e3dec34f6a43a196e000c6cd9cd41019cc39 diff --git a/webthree-helpers b/webthree-helpers index f4ea3cc99..8b5416a91 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit f4ea3cc99376db1d4d03e5aafbcaa78053544c0d +Subproject commit 8b5416a910d8cb18916fa00758cd937f98199004