Merging dev into master

Author: wmathurin

.circleci/config.yml

@@ -39,9 +39,10 @@ jobs:
     environment:
       DEVICE: << parameters.device >>
       IOS_VERSION: << parameters.ios >>
-      FASTLANE_SKIP_UPDATE_CHECK: "true"
       LIB: << parameters.lib >>
       NIGHTLY_TEST: << parameters.nightly-test >>
+      FASTLANE_SKIP_UPDATE_CHECK: "true"
+      HOMEBREW_NO_AUTO_UPDATE: 1
     steps:
       - checkout
       - restore_cache: 
@@ -56,6 +57,7 @@ jobs:
             ./build/pre-build
             cd .circleci
             bundle check || sudo bundle install --path vendor/bundle
+            brew install xcbeautify
       - save_cache: 
           key: v1-gem-cahce{{ checksum ".circleci/Gemfile.lock" }}
           paths:

.circleci/fastlane/Fastfile

@@ -1,7 +1,7 @@
 $git_pr_api = "https://api.github.com/repos/%s/SalesforceMobileSDK-iOS/pulls/%s/files"
 $schemes = ['SalesforceSDKCommon', 'SalesforceAnalytics', 'SalesforceSDKCore', 'SmartStore', 'MobileSync']
 ENV['DEVICE'] = 'iPhone-SE-3rd-generation' unless ENV.has_key?('DEVICE')
-ENV['IOS_VERSION'] = '15.5' unless ENV.has_key?('IOS_VERSION')
+ENV['IOS_VERSION'] = '17.2' unless ENV.has_key?('IOS_VERSION')
 
 lane :PR do |options|
   lib_to_test = options[:lib]
@@ -97,7 +97,9 @@ def test_scheme(scheme)
         output_directory: 'test_output',
         output_types: 'html,junit',
         code_coverage: true,
-        skip_build: true
+        skip_build: true,
+        number_of_retries: 1,
+        xcodebuild_formatter: "xcbeautify"
     )
   ensure
     system("mv ../test_output/report.html ../test_output/#{scheme}_results.html")

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "external/fmdb"]
 	path = external/fmdb
-	url = https://github.com/forcedotcom/fmdb
+	url = https://github.com/ccgus/fmdb

MobileSync.podspec

@@ -1,14 +1,14 @@
 Pod::Spec.new do |s|
 
   s.name         = "MobileSync"
-  s.version      = "11.1.0"
+  s.version      = "12.0.0"
   s.summary      = "Salesforce Mobile SDK for iOS - MobileSync"
   s.homepage     = "https://github.com/forcedotcom/SalesforceMobileSDK-iOS"
 
   s.license      = { :type => "Salesforce.com Mobile SDK License", :file => "LICENSE.md" }
   s.author       = { "Kevin Hawkins" => "[email protected]" }
 
-  s.platform     = :ios, "15.0"
+  s.platform     = :ios, "16.0"
   s.swift_versions = ['5.0']
 
   s.source       = { :git => "https://github.com/forcedotcom/SalesforceMobileSDK-iOS.git",
@@ -23,7 +23,7 @@ Pod::Spec.new do |s|
       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"'
-      mobilesync.resource = 'libs/MobileSync/MobileSync/PrivacyInfo.xcprivacy'
+      mobilesync.resource_bundles = { 'MobileSync' => [ 'libs/MobileSync/MobileSync/PrivacyInfo.xcprivacy' ] }
       mobilesync.requires_arc = true
 
   end

SalesforceAnalytics.podspec

@@ -1,14 +1,14 @@
 Pod::Spec.new do |s|
 
   s.name         = "SalesforceAnalytics"
-  s.version      = "11.1.0"
+  s.version      = "12.0.0"
   s.summary      = "Salesforce Mobile SDK for iOS"
   s.homepage     = "https://github.com/forcedotcom/SalesforceMobileSDK-iOS"
 
   s.license      = { :type => "Salesforce.com Mobile SDK License", :file => "LICENSE.md" }
   s.author       = { "Bharath Hariharan" => "[email protected]" }
 
-  s.platform     = :ios, "15.0"
+  s.platform     = :ios, "16.0"
 
   s.source       = { :git => "https://github.com/forcedotcom/SalesforceMobileSDK-iOS.git",
                      :tag => "v#{s.version}" }
@@ -24,7 +24,7 @@ Pod::Spec.new do |s|
       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"'
-      sdkanalytics.resource = 'libs/SalesforceAnalytics/SalesforceAnalytics/PrivacyInfo.xcprivacy'
+      sdkanalytics.resource_bundles = { 'SalesforceAnalytics' => [ 'libs/SalesforceAnalytics/SalesforceAnalytics/PrivacyInfo.xcprivacy' ] }
       sdkanalytics.requires_arc = true
 
   end

SalesforceSDKCommon.podspec

@@ -1,14 +1,14 @@
 Pod::Spec.new do |s|
 
   s.name         = "SalesforceSDKCommon"
-  s.version      = "11.1.0"
+  s.version      = "12.0.0"
   s.summary      = "Salesforce Mobile SDK for iOS"
   s.homepage     = "https://github.com/forcedotcom/SalesforceMobileSDK-iOS"
 
   s.license      = { :type => "Salesforce.com Mobile SDK License", :file => "LICENSE.md" }
   s.author       = { "Raj Rao" => "[email protected]" }
 
-  s.platform     = :ios, "15.0"
+  s.platform     = :ios, "16.0"
   s.swift_versions = ['5.0']
 
   s.source       = { :git => "https://github.com/forcedotcom/SalesforceMobileSDK-iOS.git",
@@ -21,7 +21,7 @@ Pod::Spec.new do |s|
       sdkcommon.source_files = 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/**/*.{h,m,swift}', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/SalesforceSDKCommon.h'
       sdkcommon.public_header_files = 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/NSUserDefaults+SFAdditions.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Logger/SFDefaultLogger.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFFileProtectionHelper.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFJsonUtils.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Logger/SFLogger.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFPathUtil.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFSDKDatasharingHelper.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFSDKReachability.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFSDKSafeMutableArray.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFSDKSafeMutableDictionary.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFSDKSafeMutableSet.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFSwiftDetectUtil.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFTestContext.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/SalesforceSDKCommon.h'
       sdkcommon.prefix_header_contents = ''
-      sdkcommon.resource = 'libs/SalesforceSDKCommon/SalesforceSDKCommon/PrivacyInfo.xcprivacy'
+      sdkcommon.resource_bundles = { 'SalesforceSDKCommon' => [ 'libs/SalesforceSDKCommon/SalesforceSDKCommon/PrivacyInfo.xcprivacy' ] }
       sdkcommon.requires_arc = true
 
   end

SalesforceSDKCore.podspec

@@ -1,14 +1,14 @@
 Pod::Spec.new do |s|
 
   s.name         = "SmartStore"
-  s.version      = "11.1.0"
+  s.version      = "12.0.0"
   s.summary      = "Salesforce Mobile SDK for iOS - SmartStore"
   s.homepage     = "https://github.com/forcedotcom/SalesforceMobileSDK-iOS"
 
   s.license      = { :type => "Salesforce.com Mobile SDK License", :file => "LICENSE.md" }
   s.author       = { "Kevin Hawkins" => "[email protected]" }
 
-  s.platform     = :ios, "15.0"
+  s.platform     = :ios, "16.0"
   s.swift_versions = ['5.0']
 
   s.source       = { :git => "https://github.com/forcedotcom/SalesforceMobileSDK-iOS.git",
@@ -20,12 +20,12 @@ Pod::Spec.new do |s|
   s.subspec 'SmartStore' do |smartstore|
 
       smartstore.dependency 'SalesforceSDKCore', "~>#{s.version}"
-      smartstore.dependency 'FMDB/SQLCipher', '~> 2.7.5'
-      smartstore.dependency 'SQLCipher', '~> 4.5.4'
+      smartstore.dependency 'FMDB/SQLCipher', '~> 2.7.10'
+      smartstore.dependency 'SQLCipher', '~> 4.5.6'
       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/SFSmartStoreUtils.h', 'libs/SmartStore/SmartStore/Classes/SFSoupIndex.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>'
-      smartstore.resource = 'libs/SmartStore/SmartStore/PrivacyInfo.xcprivacy'
+      smartstore.resource_bundles = { 'SmartStore' => [ 'libs/Smartstore/Smartstore/PrivacyInfo.xcprivacy' ] }
       smartstore.requires_arc = true
 
   end

SmartStore.podspec

@@ -6,4 +6,4 @@
 //
 //
 
-IPHONEOS_DEPLOYMENT_TARGET = 15.0
+IPHONEOS_DEPLOYMENT_TARGET = 16.0

configuration/Packaging-Dynamic.xcconfig

@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 11.1.0
+CURRENT_PROJECT_VERSION = 12.0.0