Merging back from master to unstable and bumping up version numbers

forcedotcom · Jul 8, 2016 · 6dfe929 · 6dfe929
1 parent 6785d9c
commit 6dfe929
Show file tree

Hide file tree

Showing 30 changed files with 31 additions and 31 deletions.
diff --git a/gen/cordova_plugins.js b/gen/cordova_plugins.js
@@ -47,7 +47,7 @@ module.exports = [
 module.exports.metadata = 
 // TOP OF METADATA
 {
-    "com.salesforce": "4.2.0"
+    "com.salesforce": "4.3.0"
 }
 // BOTTOM OF METADATA
 });
diff --git a/gen/plugins/com.salesforce/com.salesforce.plugin.oauth.js b/gen/plugins/com.salesforce/com.salesforce.plugin.oauth.js
@@ -25,7 +25,7 @@
  */
 
 // Version this js was shipped with
-var SALESFORCE_MOBILE_SDK_VERSION = "4.2.0";
+var SALESFORCE_MOBILE_SDK_VERSION = "4.3.0";
 var SERVICE = "com.salesforce.oauth";
 
 var exec = require("com.salesforce.util.exec").exec;

diff --git a/gen/plugins/com.salesforce/com.salesforce.plugin.sdkinfo.js b/gen/plugins/com.salesforce/com.salesforce.plugin.sdkinfo.js
@@ -25,7 +25,7 @@
  */
 
 // Version this js was shipped with
-var SALESFORCE_MOBILE_SDK_VERSION = "4.2.0";
+var SALESFORCE_MOBILE_SDK_VERSION = "4.3.0";
 var SERVICE = "com.salesforce.sdkinfo";
 
 var exec = require("com.salesforce.util.exec").exec;

diff --git a/gen/plugins/com.salesforce/com.salesforce.plugin.sfaccountmanager.js b/gen/plugins/com.salesforce/com.salesforce.plugin.sfaccountmanager.js
@@ -25,7 +25,7 @@
  */
 
 // Version this js was shipped with
-var SALESFORCE_MOBILE_SDK_VERSION = "4.2.0";
+var SALESFORCE_MOBILE_SDK_VERSION = "4.3.0";
 var SERVICE = "com.salesforce.sfaccountmanager";
 
 var exec = require("com.salesforce.util.exec").exec;

diff --git a/gen/plugins/com.salesforce/com.salesforce.plugin.smartstore.js b/gen/plugins/com.salesforce/com.salesforce.plugin.smartstore.js
@@ -25,7 +25,7 @@
  */
 
 // Version this js was shipped with
-var SALESFORCE_MOBILE_SDK_VERSION = "4.2.0";
+var SALESFORCE_MOBILE_SDK_VERSION = "4.3.0";
 var SERVICE = "com.salesforce.smartstore";
 
 var exec = require("com.salesforce.util.exec").exec;

diff --git a/gen/plugins/com.salesforce/com.salesforce.plugin.smartsync.js b/gen/plugins/com.salesforce/com.salesforce.plugin.smartsync.js
@@ -25,7 +25,7 @@
  */
 
 // Version this js was shipped with
-var SALESFORCE_MOBILE_SDK_VERSION = "4.2.0";
+var SALESFORCE_MOBILE_SDK_VERSION = "4.3.0";
 var SERVICE = "com.salesforce.smartsync";
 
 var exec = require("com.salesforce.util.exec").exec;

diff --git a/gen/plugins/com.salesforce/com.salesforce.util.bootstrap.js b/gen/plugins/com.salesforce/com.salesforce.util.bootstrap.js
@@ -25,7 +25,7 @@
  */
 
 // Version this js was shipped with
-var SALESFORCE_MOBILE_SDK_VERSION = "4.2.0";
+var SALESFORCE_MOBILE_SDK_VERSION = "4.3.0";
 
 var logger = require("com.salesforce.util.logger");
 

diff --git a/gen/plugins/com.salesforce/com.salesforce.util.event.js b/gen/plugins/com.salesforce/com.salesforce.util.event.js
@@ -25,7 +25,7 @@
  */
 
 // Version this js was shipped with
-var SALESFORCE_MOBILE_SDK_VERSION = "4.2.0";
+var SALESFORCE_MOBILE_SDK_VERSION = "4.3.0";
 
 var logger = require("com.salesforce.util.logger");
 

diff --git a/gen/plugins/com.salesforce/com.salesforce.util.exec.js b/gen/plugins/com.salesforce/com.salesforce.util.exec.js
@@ -25,7 +25,7 @@
  */
 
 // Version this js was shipped with
-var SALESFORCE_MOBILE_SDK_VERSION = "4.2.0";
+var SALESFORCE_MOBILE_SDK_VERSION = "4.3.0";
 var exec = function(pluginVersion, successCB, errorCB, service, action, args) {
     var tag = "TIMING " + service + ":" + action;
     console.time(tag);

diff --git a/gen/plugins/com.salesforce/com.salesforce.util.logger.js b/gen/plugins/com.salesforce/com.salesforce.util.logger.js
@@ -25,7 +25,7 @@
  */
 
 // Version this js was shipped with
-var SALESFORCE_MOBILE_SDK_VERSION = "4.2.0";
+var SALESFORCE_MOBILE_SDK_VERSION = "4.3.0";
 var appStartTime = (new Date()).getTime();  // Used for debug timing measurements.
 
 /**

diff --git a/gen/plugins/com.salesforce/com.salesforce.util.push.js b/gen/plugins/com.salesforce/com.salesforce.util.push.js
@@ -25,7 +25,7 @@
  */
 
 // Version this js was shipped with
-var SALESFORCE_MOBILE_SDK_VERSION = "4.2.0";
+var SALESFORCE_MOBILE_SDK_VERSION = "4.3.0";
 
 /**
  * Register push notification handler

diff --git a/gen/plugins_with_define/com.salesforce/com.salesforce.plugin.oauth.js b/gen/plugins_with_define/com.salesforce/com.salesforce.plugin.oauth.js
@@ -26,7 +26,7 @@ cordova.define("com.salesforce.plugin.oauth", function(require, exports, module)
  */
 
 // Version this js was shipped with
-var SALESFORCE_MOBILE_SDK_VERSION = "4.2.0";
+var SALESFORCE_MOBILE_SDK_VERSION = "4.3.0";
 var SERVICE = "com.salesforce.oauth";
 
 var exec = require("com.salesforce.util.exec").exec;

diff --git a/gen/plugins_with_define/com.salesforce/com.salesforce.plugin.sdkinfo.js b/gen/plugins_with_define/com.salesforce/com.salesforce.plugin.sdkinfo.js
@@ -26,7 +26,7 @@ cordova.define("com.salesforce.plugin.sdkinfo", function(require, exports, modul
  */
 
 // Version this js was shipped with
-var SALESFORCE_MOBILE_SDK_VERSION = "4.2.0";
+var SALESFORCE_MOBILE_SDK_VERSION = "4.3.0";
 var SERVICE = "com.salesforce.sdkinfo";
 
 var exec = require("com.salesforce.util.exec").exec;

diff --git a/gen/plugins_with_define/com.salesforce/com.salesforce.plugin.sfaccountmanager.js b/gen/plugins_with_define/com.salesforce/com.salesforce.plugin.sfaccountmanager.js
@@ -26,7 +26,7 @@ cordova.define("com.salesforce.plugin.sfaccountmanager", function(require, expor
  */
 
 // Version this js was shipped with
-var SALESFORCE_MOBILE_SDK_VERSION = "4.2.0";
+var SALESFORCE_MOBILE_SDK_VERSION = "4.3.0";
 var SERVICE = "com.salesforce.sfaccountmanager";
 
 var exec = require("com.salesforce.util.exec").exec;

diff --git a/gen/plugins_with_define/com.salesforce/com.salesforce.plugin.smartstore.js b/gen/plugins_with_define/com.salesforce/com.salesforce.plugin.smartstore.js
@@ -26,7 +26,7 @@ cordova.define("com.salesforce.plugin.smartstore", function(require, exports, mo
  */
 
 // Version this js was shipped with
-var SALESFORCE_MOBILE_SDK_VERSION = "4.2.0";
+var SALESFORCE_MOBILE_SDK_VERSION = "4.3.0";
 var SERVICE = "com.salesforce.smartstore";
 
 var exec = require("com.salesforce.util.exec").exec;

diff --git a/gen/plugins_with_define/com.salesforce/com.salesforce.plugin.smartsync.js b/gen/plugins_with_define/com.salesforce/com.salesforce.plugin.smartsync.js
@@ -26,7 +26,7 @@ cordova.define("com.salesforce.plugin.smartsync", function(require, exports, mod
  */
 
 // Version this js was shipped with
-var SALESFORCE_MOBILE_SDK_VERSION = "4.2.0";
+var SALESFORCE_MOBILE_SDK_VERSION = "4.3.0";
 var SERVICE = "com.salesforce.smartsync";
 
 var exec = require("com.salesforce.util.exec").exec;

diff --git a/gen/plugins_with_define/com.salesforce/com.salesforce.util.bootstrap.js b/gen/plugins_with_define/com.salesforce/com.salesforce.util.bootstrap.js
@@ -26,7 +26,7 @@ cordova.define("com.salesforce.util.bootstrap", function(require, exports, modul
  */
 
 // Version this js was shipped with
-var SALESFORCE_MOBILE_SDK_VERSION = "4.2.0";
+var SALESFORCE_MOBILE_SDK_VERSION = "4.3.0";
 
 var logger = require("com.salesforce.util.logger");
 

diff --git a/gen/plugins_with_define/com.salesforce/com.salesforce.util.event.js b/gen/plugins_with_define/com.salesforce/com.salesforce.util.event.js
@@ -26,7 +26,7 @@ cordova.define("com.salesforce.util.event", function(require, exports, module) {
  */
 
 // Version this js was shipped with
-var SALESFORCE_MOBILE_SDK_VERSION = "4.2.0";
+var SALESFORCE_MOBILE_SDK_VERSION = "4.3.0";
 
 var logger = require("com.salesforce.util.logger");
 

diff --git a/gen/plugins_with_define/com.salesforce/com.salesforce.util.exec.js b/gen/plugins_with_define/com.salesforce/com.salesforce.util.exec.js
@@ -26,7 +26,7 @@ cordova.define("com.salesforce.util.exec", function(require, exports, module) {
  */
 
 // Version this js was shipped with
-var SALESFORCE_MOBILE_SDK_VERSION = "4.2.0";
+var SALESFORCE_MOBILE_SDK_VERSION = "4.3.0";
 var exec = function(pluginVersion, successCB, errorCB, service, action, args) {
     var tag = "TIMING " + service + ":" + action;
     console.time(tag);

diff --git a/gen/plugins_with_define/com.salesforce/com.salesforce.util.logger.js b/gen/plugins_with_define/com.salesforce/com.salesforce.util.logger.js
@@ -26,7 +26,7 @@ cordova.define("com.salesforce.util.logger", function(require, exports, module)
  */
 
 // Version this js was shipped with
-var SALESFORCE_MOBILE_SDK_VERSION = "4.2.0";
+var SALESFORCE_MOBILE_SDK_VERSION = "4.3.0";
 var appStartTime = (new Date()).getTime();  // Used for debug timing measurements.
 
 /**

diff --git a/gen/plugins_with_define/com.salesforce/com.salesforce.util.push.js b/gen/plugins_with_define/com.salesforce/com.salesforce.util.push.js
@@ -26,7 +26,7 @@ cordova.define("com.salesforce.util.push", function(require, exports, module) {
  */
 
 // Version this js was shipped with
-var SALESFORCE_MOBILE_SDK_VERSION = "4.2.0";
+var SALESFORCE_MOBILE_SDK_VERSION = "4.3.0";
 
 /**
  * Register push notification handler

diff --git a/libs/cordova.force.js b/libs/cordova.force.js
@@ -25,7 +25,7 @@
  */
 
 // Version this js was shipped with
-var SALESFORCE_MOBILE_SDK_VERSION = "4.2.0";
+var SALESFORCE_MOBILE_SDK_VERSION = "4.3.0";
 
 /**
  * Utilify functions for logging

diff --git a/libs/forcetk.mobilesdk.js b/libs/forcetk.mobilesdk.js
@@ -27,7 +27,7 @@
 (function($j) {
 
 // Version this js was shipped with
-var SALESFORCE_MOBILE_SDK_VERSION = "4.2.0";
+var SALESFORCE_MOBILE_SDK_VERSION = "4.3.0";
 
 /*
  * JavaScript library to wrap REST API on Visualforce. Leverages Ajax Proxy

diff --git a/node/test_force.js b/node/test_force.js
@@ -45,7 +45,7 @@ function main(args) {
 
     // Args extraction
     var usageRequested = parsedArgs.hasOwnProperty('usage');
-    var version = parsedArgs.version || '4.2.0';
+    var version = parsedArgs.version || '4.3.0';
     var chosenOperatingSystems = cleanSplit(parsedArgs.os, ',');
     var fork = parsedArgs.fork || 'forcedotcom';
     var branch = parsedArgs.branch || 'unstable';
@@ -118,7 +118,7 @@ function usage() {
         + '      where osN are : ios, android\n'
         + '    --test=appType1,appType2,etc\n'
         + '      where appTypeN are in: native, native_swift, react_native, hybrid_local, hybrid_remote\n'
-        + '    [--version=x.y.z (defaults to 4.2.0)]\n'
+        + '    [--version=x.y.z (defaults to 4.3.0)]\n'
         + '    [--fork=FORK (defaults to forcedotcom)]\n'
         + '    [--branch=BRANCH (defaults to unstable)]\n'
         + '    [--plugin_fork=PLUGIN_FORK (defaults to forcedotcom)]\n'

diff --git a/test/MockSDKInfo.js b/test/MockSDKInfo.js
@@ -45,7 +45,7 @@ var MockSDKInfo = (function(window) {
             var self = this;
 
             cordova.interceptExec(SDKINFO_SERVICE, "getInfo", function (successCB, errorCB, args) {
-                successCB(new SDKInfo("4.2.0", 
+                successCB(new SDKInfo("4.3.0", 
                                       ["com.salesforce.oauth", "com.salesforce.sdkinfo", "com.salesforce.sfaccountmanager", "com.salesforce.testrunner", "com.salesforce.smartstore", "com.salesforce.smartsync"], 
                                       "SalesforceHybridSDKTestApp", "1.0",
                                       {

diff --git a/test/SFForcetkTestSuite.js b/test/SFForcetkTestSuite.js
@@ -305,7 +305,7 @@ ForcetkTestSuite.prototype.testDeleteFileShare = function()  {
 ForcetkTestSuite.prototype.tryUserAgent = function(expectedPlatform, expectedPlatformVersion, expectedModel, userAgent) {
     var forcetkClient = new forcetk.Client();
     var webAppSdkAgent = forcetkClient.computeWebAppSdkAgent(userAgent);
-    var match = /SalesforceMobileSDK\/4.2.0 ([^\/]*)\/([^\ ]*) \(([^\)]*)\) ([^\/]*)\/1.0 Web (.*)/.exec(webAppSdkAgent);
+    var match = /SalesforceMobileSDK\/4.3.0 ([^\/]*)\/([^\ ]*) \(([^\)]*)\) ([^\/]*)\/1.0 Web (.*)/.exec(webAppSdkAgent);
     if (match != null && match.length == 6) {
         QUnit.equals(match[1], expectedPlatform, "Wrong platform for user agent [" + userAgent + "]");
         QUnit.equals(match[2], expectedPlatformVersion, "Wrong platformVersion for user agent [" + userAgent + "]");

diff --git a/test/SFSDKInfoTestSuite.js b/test/SFSDKInfoTestSuite.js
@@ -58,7 +58,7 @@ SDKInfoTestSuite.prototype.testGetInfo = function()  {
     self.getInfo()
         .done(function(sdkInfo) {
             // sdkVersion
-        	QUnit.ok(sdkInfo.sdkVersion.indexOf("4.2") == 0, "expected different sdk version");
+        	QUnit.ok(sdkInfo.sdkVersion.indexOf("4.3") == 0, "expected different sdk version");
             // appName
             QUnit.ok(sdkInfo.appName == "SalesforceHybridSDKTestApp" || sdkInfo.appName == "SalesforceHybridTest", "expected different app name");
             // appVersion

diff --git a/test/SFTestRunnerPlugin.js b/test/SFTestRunnerPlugin.js
@@ -25,7 +25,7 @@
  */
 
 // Version this js was shipped with
-var SALESFORCE_MOBILE_SDK_VERSION = "4.2.0";
+var SALESFORCE_MOBILE_SDK_VERSION = "4.3.0";
 
 cordova.define("com.salesforce.plugin.testrunner", function(require, exports, module) {
     var SERVICE = "com.salesforce.testrunner";

diff --git a/tools/bower.json b/tools/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "salesforcemobilesdk-shared",
-    "version": "4.2.0",
+    "version": "4.3.0",
     "dependencies": {
         "jquery": "2.0.3",
         "underscore": "1.5.2",

diff --git a/tools/package.json b/tools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "salesforcemobilesdk-shared",
-  "version": "4.2.0",
+  "version": "4.3.0",
   "dependencies": {},
   "devDependencies": {
     "grunt": "~0.4.5",