Merge pull request #9068 from vector-im/dbkr/olm_isnt_optional

Change olm dependency to normal dep

package.json

@@ -73,6 +73,7 @@
     "matrix-js-sdk": "1.0.1",
     "matrix-react-sdk": "1.0.3",
     "modernizr": "^3.6.0",
+    "olm": "https://matrix.org/packages/npm/olm/olm-3.1.0-pre1.tgz",
     "prop-types": "^15.6.2",
     "react": "^15.6.0",
     "react-dom": "^15.6.0",
@@ -147,9 +148,6 @@
     "webpack-cli": "^3.1.2",
     "webpack-dev-server": "^3.1.10"
   },
-  "optionalDependencies": {
-    "olm": "https://matrix.org/packages/npm/olm/olm-3.1.0-pre1.tgz"
-  },
   "build": {
     "appId": "im.riot.app",
     "electronVersion": "4.0.6",

scripts/jenkins.sh

@@ -10,9 +10,6 @@ set -x
 
 npm install
 
-# apparently npm 3.10.3 on node 6.4.0 doesn't upgrade #develop target with npm install unless explicitly asked.
-npm install olm
-
 # check out corresponding branches of dependencies.
 #
 # clone the deps with depth 1: we know we will only ever need that one