Merge branch 'development' of https://github.com/0xProject/0x-monorepo into website/feature/react-16

3 files changed, 22 insertions, 15 deletions

diff --git a/packages/sol-compiler/CHANGELOG.json b/packages/sol-compiler/CHANGELOG.json
index a723ea12e..b27253b01 100644
--- a/packages/sol-compiler/CHANGELOG.json
+++ b/packages/sol-compiler/CHANGELOG.json
@@ -15,7 +15,8 @@
                 "note": "Export types: `CompilerSettings`, `OutputField`",
                 "pr": 924
             }
-        ]
+        ],
+        "timestamp": 1535133899
     },
     {
         "timestamp": 1534210131,
diff --git a/packages/sol-compiler/CHANGELOG.md b/packages/sol-compiler/CHANGELOG.md
index ee9eadeaa..852015ff9 100644
--- a/packages/sol-compiler/CHANGELOG.md
+++ b/packages/sol-compiler/CHANGELOG.md
@@ -5,7 +5,13 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v1.0.5 - _August 13, 2018_
+## v1.1.0 - _August 24, 2018_
+
+    * Quicken compilation by sending multiple contracts to the same solcjs invocation, batching them together based on compiler version requirements. (#965)
+    * Stop exporting types: `ContractArtifact`, `ContractNetworks` (#924)
+    * Export types: `CompilerSettings`, `OutputField` (#924)
+
+## v1.0.5 - _August 14, 2018_
 
     * Dependencies updated
 
@@ -25,7 +31,7 @@ CHANGELOG
 
     * Dependencies updated
 
-## v1.0.0 - _July 19, 2018_
+## v1.0.0 - _July 20, 2018_
 
     * Dependencies updated
 
@@ -51,7 +57,7 @@ CHANGELOG
     * Properly export the executable binary (#588)
     * Add the ability to define a specific solidity version (#589)
 
-## v0.4.3 - _May 4, 2018_
+## v0.4.3 - _May 5, 2018_
 
     * Dependencies updated
 
diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json
index ee7dffe30..f7e901819 100644
--- a/packages/sol-compiler/package.json
+++ b/packages/sol-compiler/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/sol-compiler",
-    "version": "1.0.5",
+    "version": "1.1.0",
     "engines": {
         "node": ">=6.12"
     },
@@ -42,8 +42,8 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/sol-compiler/README.md",
     "devDependencies": {
-        "@0xproject/dev-utils": "^1.0.4",
-        "@0xproject/tslint-config": "^1.0.5",
+        "@0xproject/dev-utils": "^1.0.5",
+        "@0xproject/tslint-config": "^1.0.6",
         "@types/mkdirp": "^0.5.2",
         "@types/require-from-string": "^1.2.0",
         "@types/semver": "^5.5.0",
@@ -65,16 +65,16 @@
         "zeppelin-solidity": "1.8.0"
     },
     "dependencies": {
-        "@0xproject/assert": "^1.0.5",
-        "@0xproject/json-schemas": "^1.0.1-rc.4",
-        "@0xproject/sol-resolver": "^1.0.5",
-        "@0xproject/types": "^1.0.1-rc.4",
-        "@0xproject/typescript-typings": "^1.0.4",
-        "@0xproject/utils": "^1.0.5",
-        "@0xproject/web3-wrapper": "^1.2.0",
+        "@0xproject/assert": "^1.0.6",
+        "@0xproject/json-schemas": "^1.0.1-rc.5",
+        "@0xproject/sol-resolver": "^1.0.6",
+        "@0xproject/types": "^1.0.1-rc.5",
+        "@0xproject/typescript-typings": "^1.0.5",
+        "@0xproject/utils": "^1.0.6",
+        "@0xproject/web3-wrapper": "^2.0.0",
         "@types/yargs": "^11.0.0",
         "chalk": "^2.3.0",
-        "ethereum-types": "^1.0.4",
+        "ethereum-types": "^1.0.5",
         "ethereumjs-util": "^5.1.1",
         "lodash": "^4.17.5",
         "mkdirp": "^0.5.1",