From 02ae66735d044a8f2afd8aaac254c550007a9155 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 27 Sep 2018 17:46:14 -0300
Subject: [PATCH] [NEW] Apps are enabled by default now (#12189)

---
 packages/rocketchat-apps/server/orchestrator.js       | 2 +-
 packages/rocketchat-lib/rocketchat.info               | 3 +--
 packages/rocketchat-version/plugin/compile-version.js | 6 ++++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/rocketchat-apps/server/orchestrator.js b/packages/rocketchat-apps/server/orchestrator.js
index a56630b1716..a4d6d39664f 100644
--- a/packages/rocketchat-apps/server/orchestrator.js
+++ b/packages/rocketchat-apps/server/orchestrator.js
@@ -98,7 +98,7 @@ class AppServerOrchestrator {
 	}
 }
 
-RocketChat.settings.add('Apps_Framework_enabled', false, {
+RocketChat.settings.add('Apps_Framework_enabled', true, {
 	type: 'boolean',
 	hidden: true,
 });
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index e30240a2b9d..bb9572785c1 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,4 +1,3 @@
 {
-	"version": "0.70.0-develop",
-	"marketplaceApiVersion": "1.0.0"
+	"version": "0.70.0-develop"
 }
diff --git a/packages/rocketchat-version/plugin/compile-version.js b/packages/rocketchat-version/plugin/compile-version.js
index e9ecc32f822..a96fd6fcac8 100644
--- a/packages/rocketchat-version/plugin/compile-version.js
+++ b/packages/rocketchat-version/plugin/compile-version.js
@@ -1,5 +1,7 @@
 import { exec } from 'child_process';
 import os from 'os';
+import fs from 'fs';
+import path from 'path';
 import Future from 'fibers/future';
 import async from 'async';
 
@@ -51,6 +53,10 @@ class VersionCompiler {
 						if (err == null && output.commit != null) {
 							output.commit.branch = result.replace('\n', '');
 						}
+
+						const pkg = JSON.parse(fs.readFileSync(path.join(process.cwd(), 'package.json'), 'utf8'));
+						output.marketplaceApiVersion = pkg.dependencies['@rocket.chat/apps-engine'].replace(/[^0-9.]/g, '');
+
 						output = `RocketChat.Info = ${ JSON.stringify(output, null, 4) };`;
 						file.addJavaScript({
 							data: output,