Commit 12513d7

committed

Merging dev into master

2 parents 036fbc5 + 45f8251 commit 12513d7Copy full SHA for 12513d7

41 files changed

+815

-526

lines changed

.circleci
- ci-helper.sh
- config.yml
README.md
build.gradle
external
- shared
gradle/wrapper
- gradle-wrapper.properties
libs
- SalesforceAnalytics
  - AndroidManifest.xml
  - build.gradle
- SalesforceHybrid
  - AndroidManifest.xml
  - build.gradle
  - res/xml
    - config.xml
- SalesforceReact
- SalesforceSDK
  - AndroidManifest.xml
  - build.gradle
  - res/values
    - strings.xml
  - src/com/salesforce/androidsdk
    - app
      - SalesforceSDKManager.java
    - auth
      - OAuth2.java
    - rest
      - ApiVersionStrings.java
    - security
      - PasscodeManager.java
      - SalesforceKeyGenerator.java
    - ui
      - PasscodeActivity.java
- SmartStore
  - AndroidManifest.xml
  - build.gradle
- SmartSync
  - AndroidManifest.xml
  - build.gradle
  - src/com/salesforce/androidsdk/smartsync/target
    - BatchSyncUpTarget.java
- test
  - SalesforceHybridTest
    - res/xml
      - config.xml
    - src/com/salesforce/androidsdk/phonegap
      - SmartSyncJSTest.java
  - SalesforceReactTest
    - proguard.cfg
    - src/com/salesforce/androidsdk/reactnative/util
      - ReactNativeTestHost.java
      - SalesforceReactTestApp.java
  - SalesforceSDKTest
    - res/values
      - bootconfig.xml
    - src/com/salesforce/androidsdk/auth
      - OAuth2Test.java
  - SmartSyncTest/src/com/salesforce/androidsdk/smartsync
    - manager
      - SyncManagerTest.java
    - util
      - SOQLMutatorTest.java
package.json
setversion.sh
tools
- generate_doc.sh

41 files changed

+815

-526

lines changed

`‎.circleci/ci-helper.sh`

-85

This file was deleted.

Comments

(0)