matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-26 17:03:12 +03:00
Code Activity

Update to Olm 3

Browse Source
This commit is contained in:
David Baker
2018-10-24 16:58:48 +01:00
parent f165b55a1d
commit 40cb37e824
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -319,13 +319,13 @@ To provide the Olm library in a browser application:
To provide the Olm library in a node.js application: To provide the Olm library in a node.js application:
* ``npm install https://matrix.org/packages/npm/olm/olm-2.2.2.tgz`` * ``npm install https://matrix.org/packages/npm/olm/olm-3.0.0.tgz``
(replace the URL with the latest version you want to use from (replace the URL with the latest version you want to use from
https://matrix.org/packages/npm/olm/) https://matrix.org/packages/npm/olm/)
* ``global.Olm = require('olm');`` *before* loading ``matrix-js-sdk``. * ``global.Olm = require('olm');`` *before* loading ``matrix-js-sdk``.
If you want to package Olm as dependency for your node.js application, you If you want to package Olm as dependency for your node.js application, you
can use ``npm install https://matrix.org/packages/npm/olm/olm-2.2.2.tgz can use ``npm install https://matrix.org/packages/npm/olm/olm-3.0.0.tgz
--save-optional`` (if your application also works without e2e crypto enabled) --save-optional`` (if your application also works without e2e crypto enabled)
or ``--save`` (if it doesn't) to do so. or ``--save`` (if it doesn't) to do so.

2
travis.sh
View File

@@ -5,7 +5,7 @@ set -ex
npm run lint npm run lint
# install Olm so that we can run the crypto tests. # install Olm so that we can run the crypto tests.
npm install https://matrix.org/packages/npm/olm/olm-2.3.0.tgz npm install https://matrix.org/packages/npm/olm/olm-3.0.0.tgz
npm run test npm run test