Merge pull request forcedotcom#32 from wmathurin/unstable

Latest ios/shared/android (includes delete crash bug fix)
anandbhardwaj · Jan 25, 2016 · 86e16c4 · 86e16c4
2 parents 7b907d3 + 3fba3d9
commit 86e16c4
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/app/ios/PodFile b/app/ios/PodFile
@@ -23,7 +23,6 @@ pod 'React', :path => '../node_modules/react-native', :subspecs => [
 pod 'SalesforceSDKCore', :path => '../../external/ios'
 pod 'SalesforceNetwork', :path => '../../external/ios'
 pod 'SalesforceRestAPI', :path => '../../external/ios'
-pod 'FMDB', :path => '../../external/ios'
 pod 'SmartStore', :path => '../../external/ios'
 pod 'SmartSync', :path => '../../external/ios'
 pod 'SalesforceReact', :path => '../../external/ios'

diff --git a/external/android b/external/android
diff --git a/external/ios b/external/ios
diff --git a/external/shared b/external/shared
+1 −1		external/shared
+2 −2		libs/SalesforceHybrid/AndroidManifest.xml
+1 −1		libs/SalesforceHybrid/res/xml/config.xml
+9 −2		libs/SalesforceHybrid/src/com/salesforce/androidsdk/phonegap/app/SalesforceHybridSDKManager.java
+2 −2		libs/SalesforceReact/AndroidManifest.xml
+2 −2		libs/SalesforceSDK/AndroidManifest.xml
+1 −1		libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.java
+2 −2		libs/SmartStore/AndroidManifest.xml
+1 −1		libs/SmartStore/build.gradle
+44 −7		libs/SmartStore/src/com/salesforce/androidsdk/smartstore/store/SmartStore.java
+2 −2		libs/SmartSync/AndroidManifest.xml
+1 −1		libs/test/SalesforceHybridTest/res/xml/config.xml
+22 −1		libs/test/SalesforceHybridTest/src/com/salesforce/androidsdk/phonegap/SmartStoreJSTest.java
+23 −10		libs/test/SmartStoreTest/src/com/salesforce/androidsdk/store/AbstractSmartStoreTest.java
+2 −2		node/forcedroid.js
+1 −1		package.json
+1 −1		tools/generate_doc.sh
+1 −1		test/MockSDKInfo.js
+87 −20		test/MockSmartStore.js
+1 −1		test/SFSDKInfoTestSuite.js
+141 −12		test/SFSmartStoreTestSuite.js