Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into feature/web3-wrapper/unexport-marshaller

3 files changed, 35 insertions, 15 deletions

diff --git a/packages/sol-compiler/CHANGELOG.json b/packages/sol-compiler/CHANGELOG.json
index ff5dac15e..693d6ef20 100644
--- a/packages/sol-compiler/CHANGELOG.json
+++ b/packages/sol-compiler/CHANGELOG.json
@@ -1,5 +1,15 @@
 [
     {
+        "timestamp": 1532357734,
+        "version": "1.0.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1532043000,
         "version": "1.0.0",
         "changes": [
             {
diff --git a/packages/sol-compiler/CHANGELOG.md b/packages/sol-compiler/CHANGELOG.md
index 2ee2931a6..781c1794a 100644
--- a/packages/sol-compiler/CHANGELOG.md
+++ b/packages/sol-compiler/CHANGELOG.md
@@ -1,10 +1,18 @@
 <!--
-This file is auto-generated using the monorepo-scripts package. Don't edit directly.
+changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
 Edit the package's CHANGELOG.json file only.
 -->
 
 CHANGELOG
 
+## v1.0.1 - _July 23, 2018_
+
+    * Dependencies updated
+
+## v1.0.0 - _July 20, 2018_
+
+    * Dependencies updated
+
 ## v0.5.4 - _July 18, 2018_
 
     * Dependencies updated
@@ -17,13 +25,15 @@ CHANGELOG
 
     * Dependencies updated
 
-## v0.5.1 - _June 1, 2018_
+## v0.5.1 - _May 22, 2018_
 
-    * Incorrect publish that was unpublished
+    * Make `opts` constructor parameter optional (#621)
+    * Add schema validation for compiler configuration (#621)
 
 ## v0.5.0 - _May 22, 2018_
 
     * Properly export the executable binary (#588)
+    * Add the ability to define a specific solidity version (#589)
 
 ## v0.4.3 - _May 5, 2018_
 
diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json
index 99a49e1f2..02498d62a 100644
--- a/packages/sol-compiler/package.json
+++ b/packages/sol-compiler/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/sol-compiler",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "engines": {
         "node": ">=6.12"
     },
@@ -53,9 +53,9 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/sol-compiler/README.md",
     "devDependencies": {
-        "@0xproject/dev-utils": "^1.0.0",
-        "@0xproject/monorepo-scripts": "^1.0.0",
-        "@0xproject/tslint-config": "^1.0.0",
+        "@0xproject/dev-utils": "^1.0.1",
+        "@0xproject/monorepo-scripts": "^1.0.1",
+        "@0xproject/tslint-config": "^1.0.1",
         "@types/mkdirp": "^0.5.2",
         "@types/require-from-string": "^1.2.0",
         "@types/semver": "^5.5.0",
@@ -76,16 +76,16 @@
         "zeppelin-solidity": "1.8.0"
     },
     "dependencies": {
-        "@0xproject/assert": "^1.0.0",
-        "@0xproject/json-schemas": "^1.0.0-rc.1",
-        "@0xproject/sol-resolver": "^1.0.0",
-        "@0xproject/types": "^1.0.0-rc.1",
-        "@0xproject/typescript-typings": "^1.0.0",
-        "@0xproject/utils": "^1.0.0",
-        "@0xproject/web3-wrapper": "^1.0.0",
+        "@0xproject/assert": "^1.0.1",
+        "@0xproject/json-schemas": "^1.0.0",
+        "@0xproject/sol-resolver": "^1.0.1",
+        "@0xproject/types": "^1.0.0",
+        "@0xproject/typescript-typings": "^1.0.1",
+        "@0xproject/utils": "^1.0.1",
+        "@0xproject/web3-wrapper": "^1.0.1",
         "@types/yargs": "^11.0.0",
-        "ethereum-types": "^1.0.0",
         "chalk": "^2.3.0",
+        "ethereum-types": "^1.0.1",
         "ethereumjs-util": "^5.1.1",
         "lodash": "^4.17.4",
         "mkdirp": "^0.5.1",