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 Jun 22, 2023
2 parents 76f3a1c + 02f2ec3 commit 5efef13
Show file tree
Hide file tree
Showing 156 changed files with 2,651 additions and 6,606 deletions.
13 changes: 7 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
# Each post contains a full image manifest, including iOS runtimes, devices, CocoaPods version, etc.
# NOTE: When updaing Xcode check the manifest for compatible chruby versions.
anchors:
- &latest-xcode "13.4.1"
- &latest-ios "15.5"
- &min-ios "14.5"
- &requres-string "test << matrix.lib >> iOS 14.5" # Keep this version up to date
- &latest-xcode "14.1.0"
- &latest-ios "16.1"
- &min-ios "15.5"
- &requres-string "test << matrix.lib >> iOS 15.5" # Keep this version up to date
- &chruby "3.1.2"
- &device "iPhone 12"
- &device "iPhone 13"
- &invalid ""

executors:
Expand Down Expand Up @@ -39,6 +39,7 @@ jobs:
default: *device
macos:
xcode: << parameters.xcode >>
resource_class: macos.x86.medium.gen2
working_directory: ~/SalesforceMobileSDK-iOS
shell: /bin/bash --login -eo pipefail
environment:
Expand Down Expand Up @@ -79,7 +80,7 @@ jobs:
name: Danger Lib
command: |
chruby ${CHRUBY_VER}
DANGER_GITHUB_API_TOKEN="279a29d75427e4178cef""b7b5b2d7646c540f025a" danger --dangerfile=.circleci/Dangerfile-Lib.rb --danger_id="${LIB}" --verbose
danger --dangerfile=.circleci/Dangerfile-Lib.rb --danger_id="${LIB}" --verbose
background: true
when: always
- store_test_results:
Expand Down
4 changes: 2 additions & 2 deletions .circleci/fastlane/Fastfile
Original file line number Diff line number Diff line change
@@ -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 11' unless ENV.has_key?('DEVICE')
ENV['IOS_VERSION'] = '14.5' unless ENV.has_key?('IOS_VERSION')
ENV['DEVICE'] = 'iPhone 13' unless ENV.has_key?('DEVICE')
ENV['IOS_VERSION'] = '15.5' unless ENV.has_key?('IOS_VERSION')

lane :PR do |options|
lib_to_test = options[:lib]
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@ clangReport/
test_output/
.circleci/fastlane/README.md
.circleci/fastlane/report.xml
.build
7 changes: 3 additions & 4 deletions MobileSync.podspec
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
Pod::Spec.new do |s|

s.name = "MobileSync"
s.version = "10.2.0"
s.version = "11.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, "14.0"
s.platform = :ios, "15.0"
s.swift_versions = ['5.0']

s.source = { :git => "https://github.com/forcedotcom/SalesforceMobileSDK-iOS.git",
:tag => "v#{s.version}",
:submodules => true }
:tag => "v#{s.version}" }

s.requires_arc = true
s.default_subspec = 'MobileSync'
Expand Down
7 changes: 3 additions & 4 deletions SalesforceAnalytics.podspec
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
Pod::Spec.new do |s|

s.name = "SalesforceAnalytics"
s.version = "10.2.0"
s.version = "11.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, "14.0"
s.platform = :ios, "15.0"

s.source = { :git => "https://github.com/forcedotcom/SalesforceMobileSDK-iOS.git",
:tag => "v#{s.version}",
:submodules => true }
:tag => "v#{s.version}" }

s.frameworks = 'CoreTelephony'

Expand Down
7 changes: 3 additions & 4 deletions SalesforceSDKCommon.podspec
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
Pod::Spec.new do |s|

s.name = "SalesforceSDKCommon"
s.version = "10.2.0"
s.version = "11.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, "14.0"
s.platform = :ios, "15.0"
s.swift_versions = ['5.0']

s.source = { :git => "https://github.com/forcedotcom/SalesforceMobileSDK-iOS.git",
:tag => "v#{s.version}",
:submodules => true }
:tag => "v#{s.version}" }

s.requires_arc = true
s.default_subspec = 'SalesforceSDKCommon'
Expand Down
40 changes: 7 additions & 33 deletions SalesforceSDKCore.podspec

Large diffs are not rendered by default.

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

s.name = "SmartStore"
s.version = "10.2.0"
s.version = "11.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, "14.0"
s.platform = :ios, "15.0"
s.swift_versions = ['5.0']

s.source = { :git => "https://github.com/forcedotcom/SalesforceMobileSDK-iOS.git",
:tag => "v#{s.version}",
:submodules => true }
:tag => "v#{s.version}" }

s.requires_arc = true
s.default_subspec = 'SmartStore'
Expand All @@ -22,9 +21,9 @@ Pod::Spec.new do |s|

smartstore.dependency 'SalesforceSDKCore', "~>#{s.version}"
smartstore.dependency 'FMDB/SQLCipher', '~> 2.7.5'
smartstore.dependency 'SQLCipher', '~> 4.5.2'
smartstore.dependency 'SQLCipher', '~> 4.5.4'
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/SFSoupSpec.h', 'libs/SmartStore/SmartStore/Classes/SFStoreCursor.h', 'libs/SmartStore/SmartStore/SmartStore.h', 'libs/SmartStore/SmartStore/Classes/SmartStoreSDKManager.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.requires_arc = true

Expand Down
2 changes: 1 addition & 1 deletion configuration/Packaging-Dynamic.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
//
//

IPHONEOS_DEPLOYMENT_TARGET = 14.0
IPHONEOS_DEPLOYMENT_TARGET = 15.0
2 changes: 1 addition & 1 deletion configuration/Version.xcconfig
Original file line number Diff line number Diff line change
@@ -1 +1 @@
CURRENT_PROJECT_VERSION = 10.2.0
CURRENT_PROJECT_VERSION = 11.0.0
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,18 @@
<array>
<dict>
<key>LibraryIdentifier</key>
<string>ios-arm64_arm64e</string>
<string>ios-arm64_x86_64-maccatalyst</string>
<key>LibraryPath</key>
<string>libsqlcipher-iphoneos.a</string>
<string>libsqlcipher-catalyst.a</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>arm64e</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>maccatalyst</string>
</dict>
<dict>
<key>LibraryIdentifier</key>
Expand All @@ -34,18 +36,16 @@
</dict>
<dict>
<key>LibraryIdentifier</key>
<string>ios-arm64_x86_64-maccatalyst</string>
<string>ios-arm64_arm64e</string>
<key>LibraryPath</key>
<string>libsqlcipher-catalyst.a</string>
<string>libsqlcipher-iphoneos.a</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
<string>arm64e</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>maccatalyst</string>
</dict>
</array>
<key>CFBundlePackageType</key>
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 5efef13

Please sign in to comment.