Skip to content

Commit

Permalink
Mobile SDK 4.0.2 Patch Release
Browse files Browse the repository at this point in the history
  • Loading branch information
bhariharan committed Jan 14, 2016
1 parent e86bae3 commit ab2452d
Show file tree
Hide file tree
Showing 11 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion libs/SalesforceHybrid/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.salesforce.androidsdk.hybrid"
android:versionCode="47"
android:versionName="4.1.0.unstable">
android:versionName="4.0.2">

<uses-sdk android:minSdkVersion="19"
android:targetSdkVersion="23" />
Expand Down
2 changes: 1 addition & 1 deletion libs/SalesforceHybrid/res/xml/config.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<widget xmlns = "http://www.w3.org/ns/widgets"
id = "com.salesforce.androidsdk"
version = "4.1.0">
version = "4.0.2">

<!-- To allow XHR requests with the new Whitelist plugin -->
<allow-navigation href="https://localhost" />
Expand Down
2 changes: 1 addition & 1 deletion libs/SalesforceReact/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.salesforce.androidsdk.reactnative"
android:versionCode="47"
android:versionName="4.1.0.unstable">
android:versionName="4.0.2">

<uses-sdk android:minSdkVersion="19"
android:targetSdkVersion="23" />
Expand Down
2 changes: 1 addition & 1 deletion libs/SalesforceSDK/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.salesforce.androidsdk"
android:versionCode="47"
android:versionName="4.1.0.unstable">
android:versionName="4.0.2">

<uses-sdk android:minSdkVersion="19"
android:targetSdkVersion="23" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public class SalesforceSDKManager {
/**
* Current version of this SDK.
*/
public static final String SDK_VERSION = "4.1.0.unstable";
public static final String SDK_VERSION = "4.0.2";

/**
* Default app name.
Expand Down
2 changes: 1 addition & 1 deletion libs/SmartStore/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.salesforce.androidsdk.smartstore"
android:versionCode="47"
android:versionName="4.1.0.unstable">
android:versionName="4.0.2">

<uses-sdk android:minSdkVersion="19"
android:targetSdkVersion="23" />
Expand Down
2 changes: 1 addition & 1 deletion libs/SmartSync/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.salesforce.androidsdk.smartsync"
android:versionCode="47"
android:versionName="4.1.0.unstable">
android:versionName="4.0.2">

<uses-sdk android:minSdkVersion="19"
android:targetSdkVersion="23" />
Expand Down
2 changes: 1 addition & 1 deletion libs/test/SalesforceHybridTest/res/xml/config.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<widget xmlns = "http://www.w3.org/ns/widgets"
id = "com.salesforce.androidsdk"
version = "4.1.0">
version = "4.0.2">

<!-- To allow XHR requests with the new Whitelist plugin -->
<allow-navigation href="https://localhost" />
Expand Down
4 changes: 2 additions & 2 deletions node/forcedroid.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ var fs = require('fs');
var cordovaHelper = require('../external/shared/node/cordovaHelper');
var miscUtils = require('../external/shared/node/utils');

var version = '4.1.0';
var version = '4.0.2';
var targetApi = {'versionNumber': 23, 'versionName': 'Marshmallow'};
var minimumCordovaCliVersion = '5.4.0';
var cordovaPlatformVersion = '5.0.0';
Expand Down Expand Up @@ -168,7 +168,7 @@ function createHybridApp(config) {
shelljs.exec('cordova create "' + config.projectDir + '" ' + config.packagename + ' ' + config.appname);
shelljs.pushd(config.projectDir);
shelljs.exec('cordova platform add android@' + cordovaPlatformVersion);
shelljs.exec('cordova plugin add https://github.com/forcedotcom/SalesforceMobileSDK-CordovaPlugin#unstable');
shelljs.exec('cordova plugin add https://github.com/forcedotcom/SalesforceMobileSDK-CordovaPlugin#v' + version);

// Remove the default Cordova app.
shelljs.rm('-rf', path.join('www', '*'));
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "forcedroid",
"version": "4.1.0",
"version": "4.0.2",
"description": "Utilities for creating mobile apps based on the Salesforce Mobile SDK for Android",
"keywords": [ "salesforce mobile sdk", "android", "salesforce", "mobile", "sdk" ],
"homepage": "https://github.com/forcedotcom/SalesforceMobileSDK-Android",
Expand Down
2 changes: 1 addition & 1 deletion tools/generate_doc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ if [ ! -d "external" ]
then
echo "You must run this tool from the root directory of your repo clone"
else
javadoc -d doc -author -version -verbose -use -doctitle "SalesforceSDK 4.1 API" -sourcepath "libs/SalesforceSDK/src:libs/SmartStore/src:libs/SmartSync/src:libs/SalesforceHybrid/src:libs/SalesforceReact/src" -subpackages com
javadoc -d doc -author -version -verbose -use -doctitle "SalesforceSDK 4.0 API" -sourcepath "libs/SalesforceSDK/src:libs/SmartStore/src:libs/SmartSync/src:libs/SalesforceHybrid/src:libs/SalesforceReact/src" -subpackages com
fi

0 comments on commit ab2452d

Please sign in to comment.