support versions on embark json config

lib/core/config.js

@@ -18,6 +18,7 @@ var Config = function(options) {
   this.plugins = options.plugins;
   this.logger = options.logger;
   this.events = options.events;
+  this.embarkConfig = {};
 };
 
 Config.prototype.loadConfigFiles = function(options) {
@@ -92,7 +93,7 @@ Config.prototype.loadBlockchainConfigFile = function() {
 Config.prototype.loadContractsConfigFile = function() {
   var configObject = {
     "default": {
-      "versions": {
+      "versions": this.embarkConfig.versions || {
         "web3.js": "1.0.0-beta",
         "solc": "0.4.17"
       },
@@ -120,7 +121,7 @@ Config.prototype.loadContractsConfigFile = function() {
 Config.prototype.loadStorageConfigFile = function() {
   var configObject = {
     "default": {
-      "versions": {
+      "versions": this.embarkConfig.versions || {
         "ipfs-api": "17.2.4"
       },
       "enabled": true,

templates/boilerplate/config/contracts.json

@@ -1,9 +1,5 @@
 {
   "default": {
-    "versions": {
-      "web3.js": "1.0.0-beta",
-      "solc": "0.4.17"
-    },
     "deployment": {
       "host": "localhost",
       "port": 8545,

templates/boilerplate/config/storage.json

@@ -1,8 +1,5 @@
 {
   "default": {
-    "versions": {
-      "ipfs-api": "17.2.4"
-    },
     "enabled": true,
     "ipfs_bin": "ipfs",
     "provider": "ipfs",

templates/boilerplate/embark.json

@@ -8,5 +8,10 @@
   },
   "buildDir": "dist/",
   "config": "config/",
+  "versions": {
+    "web3.js": "1.0.0-beta",
+    "solc": "0.4.17",
+    "ipfs-api": "17.2.4"
+  },
   "plugins": {}
 }

templates/demo/config/contracts.json

@@ -1,9 +1,5 @@
 {
   "default": {
-    "versions": {
-      "web3.js": "1.0.0-beta",
-      "solc": "0.4.17"
-    },
     "deployment": {
       "host": "localhost",
       "port": 8545,

templates/demo/config/storage.json

@@ -1,8 +1,5 @@
 {
   "default": {
-    "versions": {
-      "ipfs-api": "17.2.4"
-    },
     "enabled": true,
     "ipfs_bin": "ipfs",
     "provider": "ipfs",

templates/demo/embark.json

@@ -7,6 +7,11 @@
   },
   "buildDir": "dist/",
   "config": "config/",
+  "versions": {
+    "web3.js": "1.0.0-beta",
+    "solc": "0.4.17",
+    "ipfs-api": "17.2.4"
+  },
   "plugins": {
   }
 }

templates/simple/contracts.json

@@ -1,9 +1,5 @@
 {
   "default": {
-    "versions": {
-      "web3.js": "1.0.0-beta",
-      "solc": "0.4.17"
-    },
     "deployment": {
       "host": "localhost",
       "port": 8545,

templates/simple/embark.json

@@ -3,5 +3,8 @@
   "app": {},
   "buildDir": "build/",
   "config": "./",
+  "versions": {
+    "solc": "0.4.17"
+  },
   "plugins": {}
 }

test_apps/contracts_app/embark.json

@@ -2,5 +2,9 @@
   "contracts": ["contracts/**"],
   "app": {},
   "buildDir": "build/",
-  "config": "./"
+  "config": "./",
+  "versions": {
+    "web3.js": "1.0.0-beta",
+    "solc": "0.4.17"
+  }
 }

test_apps/test_app/config/contracts.json

@@ -1,9 +1,5 @@
 {
   "default": {
-    "versions": {
-      "web3.js": "1.0.0-beta.27",
-      "solc": "0.4.18"
-    },
     "deployment": {
       "host": "localhost",
       "port": 8545,

test_apps/test_app/config/storage.json

@@ -1,8 +1,5 @@
 {
   "default": {
-    "versions": {
-      "ipfs-api": "17.2.6"
-    },
     "enabled": true,
     "available_providers": ["ipfs"],
     "ipfs_bin": "ipfs",

test_apps/test_app/embark.json

@@ -14,6 +14,11 @@
   },
   "buildDir": "dist/",
   "config": "config/",
+  "versions": {
+    "web3.js": "1.0.0-beta.27",
+    "solc": "0.4.18",
+    "ipfs-api": "17.2.6"
+  },
   "plugins": {
     "embark-service": {}
   }