Skip to content

Commit 395df46

Browse files
authored
Merge pull request #2563 from wmathurin/dev
Move to sqlcipher 4.5.7
2 parents 26703e0 + 3eda87b commit 395df46

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

.circleci/gitChangedLibs.rb

+4-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@
1919

2020
for prfile in prfiles
2121
path = prfile["filename"]
22-
for lib in libsTopoSorted
23-
if path.include? lib
24-
libsModified.add(lib)
22+
libsTopoSorted.each do |lib|
23+
if path.include?(lib)
24+
libsModified.merge(libsTopoSorted[libsTopoSorted.index(lib)..])
25+
break
2526
end
2627
end
2728
end

libs/SmartStore/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies {
1414
api(project(":libs:SalesforceSDK"))
1515
//noinspection GradleDependency - Needs to line up with supported SQLCipher version.
1616
api("androidx.sqlite:sqlite:2.2.0")
17-
api("net.zetetic:sqlcipher-android:4.5.6")
17+
api("net.zetetic:sqlcipher-android:4.5.7")
1818
implementation("androidx.core:core-ktx:1.12.0")
1919
androidTestImplementation("androidx.test:runner:1.5.2")
2020
androidTestImplementation("androidx.test:rules:1.5.0")

libs/test/SmartStoreTest/src/com/salesforce/androidsdk/smartstore/store/SmartStoreTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public void testRuntimeSettings() {
116116
*/
117117
@Test
118118
public void testSQLCipherVersion() {
119-
Assert.assertEquals("Wrong sqlcipher version", "4.5.6 community", store.getSQLCipherVersion());
119+
Assert.assertEquals("Wrong sqlcipher version", "4.5.7 community", store.getSQLCipherVersion());
120120
}
121121

122122
/**

0 commit comments

Comments
 (0)