Skip to content

Commit e476be0

Browse files
wmathurinwmathurin
committed
Merging dev into master
2 parents 61bbde6 + 761d3bf commit e476be0

File tree

18 files changed

+180
-47
lines changed

18 files changed

+180
-47
lines changed

‎.circleci/fastlane/Fastfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@ lane :PR do |options|
3232
pr_files = JSON.parse(pull_files)
3333
for pr_file in pr_files
3434
path = pr_file['filename']
35-
for scheme in $schemes
35+
$schemes.each do |scheme|
3636
if path.include? scheme
37-
schemes.add(scheme)
37+
schemes.merge($schemes[$schemes.index(scheme)..])
38+
break
3839
end
3940
end
4041
end

‎MobileSync.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22

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

‎SalesforceAnalytics.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22

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

‎SalesforceSDKCommon.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22

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

‎SalesforceSDKCore.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22

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

‎SmartStore.podspec‎

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

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

@@ -21,7 +21,7 @@ Pod::Spec.new do |s|
2121

2222
smartstore.dependency 'SalesforceSDKCore', "~>#{s.version}"
2323
smartstore.dependency 'FMDB/SQLCipher', '~> 2.7.10'
24-
smartstore.dependency 'SQLCipher', '~> 4.5.6'
24+
smartstore.dependency 'SQLCipher', '~> 4.5.7'
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'
2727
smartstore.prefix_header_contents = '#import "SFSDKSmartStoreLogger.h"', '#import <SalesforceSDKCore/SalesforceSDKConstants.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.0.0
1+
CURRENT_PROJECT_VERSION = 12.1.0

‎external/ThirdPartyDependencies/sqlcipher/Info.plist‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>AvailableLibraries</key>
6+
<array>
7+
<dict>
8+
<key>BinaryPath</key>
9+
<string>libsqlcipher-catalyst.a</string>
10+
<key>LibraryIdentifier</key>
11+
<string>ios-arm64_x86_64-maccatalyst</string>
12+
<key>LibraryPath</key>
13+
<string>libsqlcipher-catalyst.a</string>
14+
<key>SupportedArchitectures</key>
15+
<array>
16+
<string>arm64</string>
17+
<string>x86_64</string>
18+
</array>
19+
<key>SupportedPlatform</key>
20+
<string>ios</string>
21+
<key>SupportedPlatformVariant</key>
22+
<string>maccatalyst</string>
23+
</dict>
24+
<dict>
25+
<key>BinaryPath</key>
26+
<string>libsqlcipher-iphonesimulator.a</string>
27+
<key>LibraryIdentifier</key>
28+
<string>ios-arm64_x86_64-simulator</string>
29+
<key>LibraryPath</key>
30+
<string>libsqlcipher-iphonesimulator.a</string>
31+
<key>SupportedArchitectures</key>
32+
<array>
33+
<string>arm64</string>
34+
<string>x86_64</string>
35+
</array>
36+
<key>SupportedPlatform</key>
37+
<string>ios</string>
38+
<key>SupportedPlatformVariant</key>
39+
<string>simulator</string>
40+
</dict>
41+
<dict>
42+
<key>BinaryPath</key>
43+
<string>libsqlcipher-iphoneos.a</string>
44+
<key>LibraryIdentifier</key>
45+
<string>ios-arm64_arm64e</string>
46+
<key>LibraryPath</key>
47+
<string>libsqlcipher-iphoneos.a</string>
48+
<key>SupportedArchitectures</key>
49+
<array>
50+
<string>arm64</string>
51+
<string>arm64e</string>
52+
</array>
53+
<key>SupportedPlatform</key>
54+
<string>ios</string>
55+
</dict>
56+
</array>
57+
<key>CFBundlePackageType</key>
58+
<string>XFWK</string>
59+
<key>XCFrameworkFormatVersion</key>
60+
<string>1.0</string>
61+
</dict>
62+
</plist>

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
<array>
77
<dict>
88
<key>BinaryPath</key>
9-
<string>libsqlcipher-iphonesimulator.a</string>
9+
<string>libsqlcipher-catalyst.a</string>
1010
<key>LibraryIdentifier</key>
11-
<string>ios-arm64_x86_64-simulator</string>
11+
<string>ios-arm64_x86_64-maccatalyst</string>
1212
<key>LibraryPath</key>
13-
<string>libsqlcipher-iphonesimulator.a</string>
13+
<string>libsqlcipher-catalyst.a</string>
1414
<key>SupportedArchitectures</key>
1515
<array>
1616
<string>arm64</string>
@@ -19,15 +19,15 @@
1919
<key>SupportedPlatform</key>
2020
<string>ios</string>
2121
<key>SupportedPlatformVariant</key>
22-
<string>simulator</string>
22+
<string>maccatalyst</string>
2323
</dict>
2424
<dict>
2525
<key>BinaryPath</key>
26-
<string>libsqlcipher-catalyst.a</string>
26+
<string>libsqlcipher-iphonesimulator.a</string>
2727
<key>LibraryIdentifier</key>
28-
<string>ios-arm64_x86_64-maccatalyst</string>
28+
<string>ios-arm64_x86_64-simulator</string>
2929
<key>LibraryPath</key>
30-
<string>libsqlcipher-catalyst.a</string>
30+
<string>libsqlcipher-iphonesimulator.a</string>
3131
<key>SupportedArchitectures</key>
3232
<array>
3333
<string>arm64</string>
@@ -36,7 +36,7 @@
3636
<key>SupportedPlatform</key>
3737
<string>ios</string>
3838
<key>SupportedPlatformVariant</key>
39-
<string>maccatalyst</string>
39+
<string>simulator</string>
4040
</dict>
4141
<dict>
4242
<key>BinaryPath</key>

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

293 KB
Binary file not shown.

0 commit comments

Comments
 (0)