Skip to content

Commit

Permalink
Merging dev into master
Browse files Browse the repository at this point in the history
  • Loading branch information
wmathurin committed Jul 20, 2020
2 parents 3318111 + 9d88fe4 commit a0425c1
Show file tree
Hide file tree
Showing 133 changed files with 3,366 additions and 892 deletions.
2 changes: 1 addition & 1 deletion .circleci/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -197,4 +197,4 @@ DEPENDENCIES
xcpretty

BUNDLED WITH
1.16.6
2.0.2
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ executors:
mac:
working_directory: ~/SalesforceMobileSDK-iOS
macos:
xcode: 11.3.1
xcode: 11.5.0
shell: /bin/bash --login -eo pipefail
environment:
BASH_ENV: ~/.bashrc
FASTLANE_SKIP_UPDATE_CHECK: "true"
CHRUBY_VER: 2.6.5
CHRUBY_VER: 2.7.1

version: 2.1
jobs:
Expand All @@ -21,7 +21,7 @@ jobs:
default: "iPhone 11"
ios:
type: string
default: "13.3"
default: "13.5"
nightly-test:
type: boolean
default: false
Expand Down
5 changes: 2 additions & 3 deletions MobileSync.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "MobileSync"
s.version = "8.1.0"
s.version = "8.2.0"
s.summary = "Salesforce Mobile SDK for iOS - MobileSync"
s.homepage = "https://github.com/forcedotcom/SalesforceMobileSDK-iOS"

Expand All @@ -20,8 +20,7 @@ Pod::Spec.new do |s|

s.subspec 'MobileSync' do |mobilesync|

mobilesync.dependency 'SmartStore'
mobilesync.dependency 'SalesforceSDKCore'
mobilesync.dependency 'SmartStore', "~>#{s.version}"
mobilesync.source_files = 'libs/MobileSync/MobileSync/Classes/**/*.{h,m,swift}', 'libs/MobileSync/MobileSync/MobileSync.h'
mobilesync.public_header_files = 'libs/MobileSync/MobileSync/MobileSync.h', 'libs/MobileSync/MobileSync/Classes/Manager/MobileSyncSDKManager.h', 'libs/MobileSync/MobileSync/Classes/Target/SFAdvancedSyncUpTarget.h', 'libs/MobileSync/MobileSync/Classes/Target/SFBatchSyncUpTarget.h', 'libs/MobileSync/MobileSync/Classes/Util/SFChildrenInfo.h', 'libs/MobileSync/MobileSync/Classes/Model/SFLayout.h', 'libs/MobileSync/MobileSync/Classes/Target/SFLayoutSyncDownTarget.h', 'libs/MobileSync/MobileSync/Classes/Manager/SFLayoutSyncManager.h', 'libs/MobileSync/MobileSync/Classes/Model/SFMetadata.h', 'libs/MobileSync/MobileSync/Classes/Target/SFMetadataSyncDownTarget.h', 'libs/MobileSync/MobileSync/Classes/Manager/SFMetadataSyncManager.h', 'libs/MobileSync/MobileSync/Classes/Util/SFMobileSyncConstants.h', 'libs/MobileSync/MobileSync/Classes/Util/SFMobileSyncNetworkUtils.h', 'libs/MobileSync/MobileSync/Classes/Util/SFMobileSyncObjectUtils.h', 'libs/MobileSync/MobileSync/Classes/Model/SFMobileSyncPersistableObject.h', 'libs/MobileSync/MobileSync/Classes/Instrumentation/SFMobileSyncSyncManager+Instrumentation.h', 'libs/MobileSync/MobileSync/Classes/Manager/SFMobileSyncSyncManager.h', 'libs/MobileSync/MobileSync/Classes/Target/SFMruSyncDownTarget.h', 'libs/MobileSync/MobileSync/Classes/Model/SFObject.h', 'libs/MobileSync/MobileSync/Classes/Target/SFParentChildrenSyncDownTarget.h', 'libs/MobileSync/MobileSync/Classes/Util/SFParentChildrenSyncHelper.h', 'libs/MobileSync/MobileSync/Classes/Target/SFParentChildrenSyncUpTarget.h', 'libs/MobileSync/MobileSync/Classes/Util/SFParentInfo.h', 'libs/MobileSync/MobileSync/Classes/Target/SFRefreshSyncDownTarget.h', 'libs/MobileSync/MobileSync/Classes/Util/SFSDKMobileSyncLogger.h', 'libs/MobileSync/MobileSync/Classes/Config/SFSDKSyncsConfig.h', 'libs/MobileSync/MobileSync/Classes/Target/SFSoqlSyncDownTarget.h', 'libs/MobileSync/MobileSync/Classes/Target/SFSoslSyncDownTarget.h', 'libs/MobileSync/MobileSync/Classes/Target/SFSyncDownTarget.h', 'libs/MobileSync/MobileSync/Classes/Util/SFSyncOptions.h', 'libs/MobileSync/MobileSync/Classes/Util/SFSyncState.h', 'libs/MobileSync/MobileSync/Classes/Target/SFSyncTarget.h', 'libs/MobileSync/MobileSync/Classes/Target/SFSyncUpTarget.h'
mobilesync.prefix_header_contents = '#import "SFSDKMobileSyncLogger.h"'
Expand Down
4 changes: 2 additions & 2 deletions SalesforceAnalytics.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "SalesforceAnalytics"
s.version = "8.1.0"
s.version = "8.2.0"
s.summary = "Salesforce Mobile SDK for iOS"
s.homepage = "https://github.com/forcedotcom/SalesforceMobileSDK-iOS"

Expand All @@ -19,7 +19,7 @@ Pod::Spec.new do |s|

s.subspec 'SalesforceAnalytics' do |sdkanalytics|

sdkanalytics.dependency 'SalesforceSDKCommon'
sdkanalytics.dependency 'SalesforceSDKCommon', "~>#{s.version}"
sdkanalytics.source_files = 'libs/SalesforceAnalytics/SalesforceAnalytics/Classes/**/*.{h,m}', 'libs/SalesforceAnalytics/SalesforceAnalytics/SalesforceAnalytics.h'
sdkanalytics.public_header_files = 'libs/SalesforceAnalytics/SalesforceAnalytics/Classes/Transform/SFSDKAILTNTransform.h', 'libs/SalesforceAnalytics/SalesforceAnalytics/Classes/Util/SFSDKAnalyticsLogger.h', 'libs/SalesforceAnalytics/SalesforceAnalytics/Classes/Manager/SFSDKAnalyticsManager.h', 'libs/SalesforceAnalytics/SalesforceAnalytics/Classes/Model/SFSDKDeviceAppAttributes.h', 'libs/SalesforceAnalytics/SalesforceAnalytics/Classes/Store/SFSDKEventStoreManager.h', 'libs/SalesforceAnalytics/SalesforceAnalytics/Classes/Model/SFSDKInstrumentationEvent.h', 'libs/SalesforceAnalytics/SalesforceAnalytics/Classes/Model/SFSDKInstrumentationEventBuilder.h', 'libs/SalesforceAnalytics/SalesforceAnalytics/Classes/Transform/SFSDKTransform.h', 'libs/SalesforceAnalytics/SalesforceAnalytics/SalesforceAnalytics.h'
sdkanalytics.prefix_header_contents = '#import "SFSDKAnalyticsLogger.h"'
Expand Down
2 changes: 1 addition & 1 deletion SalesforceSDKCommon.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "SalesforceSDKCommon"
s.version = "8.1.0"
s.version = "8.2.0"
s.summary = "Salesforce Mobile SDK for iOS"
s.homepage = "https://github.com/forcedotcom/SalesforceMobileSDK-iOS"

Expand Down
6 changes: 3 additions & 3 deletions SalesforceSDKCore.podspec

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions SmartStore.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "SmartStore"
s.version = "8.1.0"
s.version = "8.2.0"
s.summary = "Salesforce Mobile SDK for iOS - SmartStore"
s.homepage = "https://github.com/forcedotcom/SalesforceMobileSDK-iOS"

Expand All @@ -20,9 +20,9 @@ Pod::Spec.new do |s|

s.subspec 'SmartStore' do |smartstore|

smartstore.dependency 'SalesforceSDKCore'
smartstore.dependency 'SalesforceSDKCore', "~>#{s.version}"
smartstore.dependency 'FMDB/SQLCipher', '~> 2.7.5'
smartstore.dependency 'SQLCipher/fts', '~> 4.2.0'
smartstore.dependency 'SQLCipher/fts', '~> 4.4.0'
smartstore.source_files = 'libs/SmartStore/SmartStore/Classes/**/*.{h,m,swift}', 'libs/SmartStore/SmartStore/SmartStore.h'
smartstore.public_header_files = 'libs/SmartStore/SmartStore/Classes/SFAlterSoupLongOperation.h', 'libs/SmartStore/SmartStore/Classes/SFQuerySpec.h', 'libs/SmartStore/SmartStore/Classes/SFSDKSmartStoreLogger.h', 'libs/SmartStore/SmartStore/Classes/SFSDKStoreConfig.h', 'libs/SmartStore/SmartStore/Classes/SFSmartSqlHelper.h', 'libs/SmartStore/SmartStore/Classes/SFSmartStore.h', 'libs/SmartStore/SmartStore/Classes/SFSmartStoreDatabaseManager.h', 'libs/SmartStore/SmartStore/Classes/SFSmartStoreInspectorViewController.h', 'libs/SmartStore/SmartStore/Classes/SFSmartStoreUpgrade.h', 'libs/SmartStore/SmartStore/Classes/SFSmartStoreUtils.h', 'libs/SmartStore/SmartStore/Classes/SFSoupIndex.h', 'libs/SmartStore/SmartStore/Classes/SFSoupSpec.h', 'libs/SmartStore/SmartStore/Classes/SFStoreCursor.h', 'libs/SmartStore/SmartStore/SmartStore.h', 'libs/SmartStore/SmartStore/Classes/SmartStoreSDKManager.h'
smartstore.prefix_header_contents = '#import "SFSDKSmartStoreLogger.h"', '#import <SalesforceSDKCore/SalesforceSDKConstants.h>'
Expand Down
2 changes: 1 addition & 1 deletion configuration/Version.xcconfig
Original file line number Diff line number Diff line change
@@ -1 +1 @@
CURRENT_PROJECT_VERSION = 8.1.0
CURRENT_PROJECT_VERSION = 8.2.0
Binary file modified external/ThirdPartyDependencies/sqlcipher/libsqlcipher.a
Binary file not shown.
Loading

0 comments on commit a0425c1

Please sign in to comment.