Merge branch 'master' into version0425

ethereum · Sep 13, 2018 · be36248 · be36248
2 parents 3058156 + e17ee77
commit be36248
Show file tree

Hide file tree

Showing 14 changed files with 1,539 additions and 192 deletions.
diff --git a/package.json b/package.json
@@ -43,7 +43,7 @@
     "memorystream": "^0.3.1",
     "require-from-string": "^1.1.0",
     "semver": "^5.3.0",
-    "yargs": "^4.7.1"
+    "yargs": "^11.0.0"
   },
   "devDependencies": {
     "coveralls": "^3.0.0",

diff --git a/solcjs b/solcjs
@@ -37,8 +37,7 @@ var yargs = require('yargs')
     describe: 'Output directory for the contracts.',
     type: 'string'
   })
-  .global([ 'version', 'optimize' ])
-  .version(function() { return solc.version(); })
+  .version(solc.version())
   .showHelpOnFail(false, 'Specify --help for available options')
   .help()