From f9c096c06125a91be42d8de22cdf21e0c2cab69b Mon Sep 17 00:00:00 2001 From: JC Brand Date: Sat, 2 Nov 2013 10:15:26 +0200 Subject: [PATCH] Use new otr.js release 0.27 --- Gruntfile.js | 2 +- bower.json | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index fa3785480..df877ff85 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -55,7 +55,7 @@ module.exports = function(grunt) { var done = this.async(); var child_process = require('child_process'); var exec = child_process.exec; - exec('./node_modules/.bin/bower update && cd ./components/strophe && make normal && cd ../otr && npm install && make build', + exec('./node_modules/.bin/bower update && cd ./components/strophe && make normal', function (err, stdout, stderr) { if (err) { grunt.log.write('build failed with error code '+err.code); diff --git a/bower.json b/bower.json index 40e339cfb..29f8f9ecc 100644 --- a/bower.json +++ b/bower.json @@ -2,7 +2,8 @@ "name": "converse", "version": "0.6.6", "devDependencies": { - "jasmine": "https://github.com/jcbrand/jasmine.git#1_3_x" + "jasmine": "https://github.com/jcbrand/jasmine.git#1_3_x", + "otr": "0.2.7" }, "dependencies": { "requirejs": "2.1.8", @@ -17,7 +18,7 @@ "strophe.vcard": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/vcard/strophe.vcard.js", "strophe.disco": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/disco/strophe.disco.js", "strophe.muc": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/muc/strophe.muc.js", - "otr": "https://github.com/arlolra/otr.git#e6cc5c247569df1118de8dd86ee57c2d1b3ce91e", + "otr": "0.2.7", "crypto-js": "~3.1.2", "almond": "~0.2.6" },