From 80f16990757e40b873bc87b31616d38b9795d8a6 Mon Sep 17 00:00:00 2001 From: lucyhe Date: Mon, 2 Feb 2015 20:22:04 -0500 Subject: [PATCH 1/7] Update minor version number for new release --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cc9443d0e8..46c36d80d0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "uProxy", "description": "Share your pathway to the Internet", - "version": "0.4.0", + "version": "0.5.0", "repository": { "type": "git", "url": "https://github.com/uproxy/uproxy" From 4e1876e67bd7093a4227cf6986dc46ac95b99f32 Mon Sep 17 00:00:00 2001 From: lucyhe Date: Tue, 3 Feb 2015 11:41:23 -0500 Subject: [PATCH 2/7] Update uproxy-lib dependency to 18.0.0 --- package.json | 2 +- src/mocks/freedom-mocks.ts | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 46c36d80d0..ab83342189 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "grunt-vulcanize": "^0.6.0", "typescript": "^1.0.1", "uproxy-churn": "^0.0.5", - "uproxy-lib": "^17.0.0", + "uproxy-lib": "^18.0.0", "uproxy-networking": "^5.0.0" }, "peerDependencies" : { diff --git a/src/mocks/freedom-mocks.ts b/src/mocks/freedom-mocks.ts index c3d4969ac9..d8a5c97fb0 100644 --- a/src/mocks/freedom-mocks.ts +++ b/src/mocks/freedom-mocks.ts @@ -20,6 +20,11 @@ class MockCore { public getId = () => { return ['useless']; } + public getLogger = (tag) => { + var logger = jasmine.createSpyObj('logger-'+tag, ['log', 'info', 'error']); + freedom['loggers'][tag] = logger; + return Promise.resolve(logger); + } } // class MockCore class MockCorePeerConnection { @@ -106,6 +111,7 @@ var mockSocial = () => { return new MockSocial(); }; mockSocial['api'] = 'social'; mockSocial['manifest'] = 'I have no manifest :)'; +freedom['loggers'] = {}; freedom['core'] = () => { return new MockCore(); }; freedom['core.console'] = () => { return new MockLog(); }; freedom['core.rtcpeerconnection'] = () => { return new MockCorePeerConnection(); }; From 1dc9d19ff5a53bc4fadfd39e7e95709c6a04fdb0 Mon Sep 17 00:00:00 2001 From: lucyhe Date: Tue, 3 Feb 2015 11:43:15 -0500 Subject: [PATCH 3/7] Remove version change from this pull request --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ab83342189..0db595ffd6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "uProxy", "description": "Share your pathway to the Internet", - "version": "0.5.0", + "version": "0.4.0", "repository": { "type": "git", "url": "https://github.com/uproxy/uproxy" From fbbad05a118bc916bb1d8ce9e953c1aaf4201669 Mon Sep 17 00:00:00 2001 From: lucyhe Date: Tue, 3 Feb 2015 13:41:26 -0500 Subject: [PATCH 4/7] Update freedom patch numbers to latest --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 0db595ffd6..97e0f2ef1e 100644 --- a/package.json +++ b/package.json @@ -18,9 +18,9 @@ ], "devDependencies": { "es6-promise": "^0.1.1", - "freedom-social-xmpp": "~0.3.5", - "freedom-for-chrome": "~0.4.8", - "freedom-for-firefox": "~0.6.6", + "freedom-social-xmpp": "~0.3.6", + "freedom-for-chrome": "~0.4.11", + "freedom-for-firefox": "~0.6.7", "fs-extra": "^0.12.0", "grunt": "~0.4.2", "grunt-contrib-clean": "~0.5.0", @@ -44,7 +44,7 @@ "uproxy-networking": "^5.0.0" }, "peerDependencies" : { - "freedom": "~0.6.11" + "freedom": "~0.6.18" }, "private": true, "scripts": { From 3fc737883d93bbd410e099fbb52fc99e338d9c9d Mon Sep 17 00:00:00 2001 From: lucyhe Date: Tue, 3 Feb 2015 14:03:25 -0500 Subject: [PATCH 5/7] Add comment and reference to freedom mocks --- src/mocks/freedom-mocks.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/mocks/freedom-mocks.ts b/src/mocks/freedom-mocks.ts index d8a5c97fb0..09a7d4dc19 100644 --- a/src/mocks/freedom-mocks.ts +++ b/src/mocks/freedom-mocks.ts @@ -1,10 +1,13 @@ /** * freedom-mocks.ts * + * Mock freedom objects used for uProxy unit tests. The mock classes below + * implement different freedom interfaces found in freedom/typings/freedom.d.ts. * This file must be compiled independently of all other typescript in uProxy. */ /// +/// /// From 116d25af2355e91de32ebcb5c0f87011d23a5ba3 Mon Sep 17 00:00:00 2001 From: lucyhe Date: Tue, 3 Feb 2015 14:16:47 -0500 Subject: [PATCH 6/7] Bump Chrome webstore minor version --- src/chrome/app/manifest.json | 2 +- src/chrome/extension/manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chrome/app/manifest.json b/src/chrome/app/manifest.json index bc02a26b51..7b17b5715d 100644 --- a/src/chrome/app/manifest.json +++ b/src/chrome/app/manifest.json @@ -3,7 +3,7 @@ "name": "__MSG_appName__", "description": "__MSG_appDescription__", "minimum_chrome_version": "41.0.2267", - "version": "0.5.3", + "version": "0.6.0", "default_locale": "en", "icons": { "128": "icons/default-128.png", diff --git a/src/chrome/extension/manifest.json b/src/chrome/extension/manifest.json index 12d8c968ae..97394553a4 100644 --- a/src/chrome/extension/manifest.json +++ b/src/chrome/extension/manifest.json @@ -1,6 +1,6 @@ { "name": "__MSG_extName__", - "version": "0.5.3", + "version": "0.6.0", "manifest_version": 2, "description": "__MSG_extDescription__", "minimum_chrome_version": "41.0.2267", From 91a025b968791a3bd794f111ddda9859b4b206e9 Mon Sep 17 00:00:00 2001 From: lucyhe Date: Tue, 3 Feb 2015 14:20:54 -0500 Subject: [PATCH 7/7] Update uProxy version number --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 97e0f2ef1e..d567549c4e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "uProxy", "description": "Share your pathway to the Internet", - "version": "0.4.0", + "version": "0.6.0", "repository": { "type": "git", "url": "https://github.com/uproxy/uproxy"