Skip to content

Commit 50408bd

Browse files
wmathurinwmathurin
committed
Merging dev into master
2 parents f6e6bce + 4057fdd commit 50408bd

File tree

54 files changed

+836
-216
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+836
-216
lines changed

‎MobileSync.podspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
Pod::Spec.new do |s|
22

33
s.name = "MobileSync"
4-
s.version = "12.1.1"
4+
s.version = "12.2.0"
55
s.summary = "Salesforce Mobile SDK for iOS - MobileSync"
66
s.homepage = "https://github.com/forcedotcom/SalesforceMobileSDK-iOS"
77

88
s.license = { :type => "Salesforce.com Mobile SDK License", :file => "LICENSE.md" }
99
s.author = { "Kevin Hawkins" => "[email protected]" }
1010

11-
s.platform = :ios, "16.0"
11+
s.platforms = { :ios => "16.0", :visionos => "2.0" }
1212
s.swift_versions = ['5.0']
1313

1414
s.source = { :git => "https://github.com/forcedotcom/SalesforceMobileSDK-iOS.git",

‎SalesforceAnalytics.podspec‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
Pod::Spec.new do |s|
22

33
s.name = "SalesforceAnalytics"
4-
s.version = "12.1.1"
4+
s.version = "12.2.0"
55
s.summary = "Salesforce Mobile SDK for iOS"
66
s.homepage = "https://github.com/forcedotcom/SalesforceMobileSDK-iOS"
77

88
s.license = { :type => "Salesforce.com Mobile SDK License", :file => "LICENSE.md" }
99
s.author = { "Bharath Hariharan" => "[email protected]" }
1010

11-
s.platform = :ios, "16.0"
11+
s.platforms = { :ios => "16.0", :visionos => "2.0" }
1212

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

16-
s.frameworks = 'CoreTelephony'
16+
s.xcconfig = { 'OTHER_LDFLAGS[sdk=iphoneos*]' => '$(inherited) -framework "CoreTelephony"',
17+
'OTHER_LDFLAGS[sdk=iphonesimulator*]' => '$(inherited) -framework "CoreTelephony"' }
1718

1819
s.requires_arc = true
1920
s.default_subspec = 'SalesforceAnalytics'

‎SalesforceSDKCommon.podspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
Pod::Spec.new do |s|
22

33
s.name = "SalesforceSDKCommon"
4-
s.version = "12.1.1"
4+
s.version = "12.2.0"
55
s.summary = "Salesforce Mobile SDK for iOS"
66
s.homepage = "https://github.com/forcedotcom/SalesforceMobileSDK-iOS"
77

88
s.license = { :type => "Salesforce.com Mobile SDK License", :file => "LICENSE.md" }
99
s.author = { "Raj Rao" => "[email protected]" }
1010

11-
s.platform = :ios, "16.0"
11+
s.platforms = { :ios => "16.0", :visionos => "2.0" }
1212
s.swift_versions = ['5.0']
1313

1414
s.source = { :git => "https://github.com/forcedotcom/SalesforceMobileSDK-iOS.git",

‎SalesforceSDKCore.podspec‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
Pod::Spec.new do |s|
22

33
s.name = "SalesforceSDKCore"
4-
s.version = "12.1.1"
4+
s.version = "12.2.0"
55
s.summary = "Salesforce Mobile SDK for iOS"
66
s.homepage = "https://github.com/forcedotcom/SalesforceMobileSDK-iOS"
77

88
s.license = { :type => "Salesforce.com Mobile SDK License", :file => "LICENSE.md" }
99
s.author = { "Kevin Hawkins" => "[email protected]" }
1010

11-
s.platform = :ios, "16.0"
11+
s.platforms = { :ios => "16.0", :visionos => "2.0" }
1212
s.swift_versions = ['5.0']
1313

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

17-
s.frameworks = 'CoreTelephony'
18-
1917
s.requires_arc = true
2018
s.default_subspec = 'SalesforceSDKCore'
2119

‎SmartStore.podspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
Pod::Spec.new do |s|
22

33
s.name = "SmartStore"
4-
s.version = "12.1.1"
4+
s.version = "12.2.0"
55
s.summary = "Salesforce Mobile SDK for iOS - SmartStore"
66
s.homepage = "https://github.com/forcedotcom/SalesforceMobileSDK-iOS"
77

88
s.license = { :type => "Salesforce.com Mobile SDK License", :file => "LICENSE.md" }
99
s.author = { "Kevin Hawkins" => "[email protected]" }
1010

11-
s.platform = :ios, "16.0"
11+
s.platforms = { :ios => "16.0", :visionos => "2.0" }
1212
s.swift_versions = ['5.0']
1313

1414
s.source = { :git => "https://github.com/forcedotcom/SalesforceMobileSDK-iOS.git",
@@ -20,7 +20,7 @@ Pod::Spec.new do |s|
2020
s.subspec 'SmartStore' do |smartstore|
2121

2222
smartstore.dependency 'SalesforceSDKCore', "~>#{s.version}"
23-
smartstore.dependency 'FMDB/SQLCipher', '~> 2.7.10'
23+
smartstore.dependency 'FMDB/SQLCipher', '~> 2.7.12'
2424
smartstore.dependency 'SQLCipher', '~> 4.6.1'
2525
smartstore.source_files = 'libs/SmartStore/SmartStore/Classes/**/*.{h,m,swift}', 'libs/SmartStore/SmartStore/SmartStore.h'
2626
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'

‎configuration/Version.xcconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
CURRENT_PROJECT_VERSION = 12.1.1
1+
CURRENT_PROJECT_VERSION = 12.2.0

‎external/ThirdPartyDependencies/sqlcipher/SQLCipher.xcframework/Info.plist‎

Lines changed: 36 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@
66
<array>
77
<dict>
88
<key>BinaryPath</key>
9-
<string>libsqlcipher-catalyst.a</string>
9+
<string>libsqlcipher-xrsimulator.a</string>
1010
<key>LibraryIdentifier</key>
11-
<string>ios-arm64_x86_64-maccatalyst</string>
11+
<string>xros-arm64_x86_64-simulator</string>
1212
<key>LibraryPath</key>
13-
<string>libsqlcipher-catalyst.a</string>
13+
<string>libsqlcipher-xrsimulator.a</string>
1414
<key>SupportedArchitectures</key>
1515
<array>
1616
<string>arm64</string>
1717
<string>x86_64</string>
1818
</array>
1919
<key>SupportedPlatform</key>
20-
<string>ios</string>
20+
<string>xros</string>
2121
<key>SupportedPlatformVariant</key>
22-
<string>maccatalyst</string>
22+
<string>simulator</string>
2323
</dict>
2424
<dict>
2525
<key>BinaryPath</key>
@@ -38,6 +38,37 @@
3838
<key>SupportedPlatformVariant</key>
3939
<string>simulator</string>
4040
</dict>
41+
<dict>
42+
<key>BinaryPath</key>
43+
<string>libsqlcipher-catalyst.a</string>
44+
<key>LibraryIdentifier</key>
45+
<string>ios-arm64_x86_64-maccatalyst</string>
46+
<key>LibraryPath</key>
47+
<string>libsqlcipher-catalyst.a</string>
48+
<key>SupportedArchitectures</key>
49+
<array>
50+
<string>arm64</string>
51+
<string>x86_64</string>
52+
</array>
53+
<key>SupportedPlatform</key>
54+
<string>ios</string>
55+
<key>SupportedPlatformVariant</key>
56+
<string>maccatalyst</string>
57+
</dict>
58+
<dict>
59+
<key>BinaryPath</key>
60+
<string>libsqlcipher-xros.a</string>
61+
<key>LibraryIdentifier</key>
62+
<string>xros-arm64</string>
63+
<key>LibraryPath</key>
64+
<string>libsqlcipher-xros.a</string>
65+
<key>SupportedArchitectures</key>
66+
<array>
67+
<string>arm64</string>
68+
</array>
69+
<key>SupportedPlatform</key>
70+
<string>xros</string>
71+
</dict>
4172
<dict>
4273
<key>BinaryPath</key>
4374
<string>libsqlcipher-iphoneos.a</string>

‎external/ThirdPartyDependencies/sqlcipher/SQLCipher.xcframework/ios-arm64_arm64e/libsqlcipher-iphoneos.a‎

-160 Bytes
Binary file not shown.

‎external/ThirdPartyDependencies/sqlcipher/SQLCipher.xcframework/ios-arm64_x86_64-maccatalyst/libsqlcipher-catalyst.a‎

-288 Bytes
Binary file not shown.

‎external/ThirdPartyDependencies/sqlcipher/SQLCipher.xcframework/ios-arm64_x86_64-simulator/libsqlcipher-iphonesimulator.a‎

-192 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)