Merge branch 'dev' of github.com:forcedotcom/SalesforceMobileSDK-Android into revert-retain-client-builder

Author: brandonpage

libs/SmartStore/build.gradle.kts

@@ -15,7 +15,7 @@ dependencies {
     api(project(":libs:SalesforceSDK"))
     //noinspection GradleDependency -  Needs to line up with supported SQLCipher version.
     api("androidx.sqlite:sqlite:2.2.0")
-    api("net.zetetic:sqlcipher-android:4.6.0")
+    api("net.zetetic:sqlcipher-android:4.6.1")
     implementation("androidx.core:core-ktx:1.13.1")
     androidTestImplementation("androidx.test:runner:1.6.0")
     androidTestImplementation("androidx.test:rules:1.6.0")

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

@@ -116,7 +116,7 @@ public void testRuntimeSettings() {
 	 */
 	@Test
 	public void testSQLCipherVersion() {
-		Assert.assertEquals("Wrong sqlcipher version", "4.6.0 community", store.getSQLCipherVersion());
+		Assert.assertEquals("Wrong sqlcipher version", "4.6.1 community", store.getSQLCipherVersion());
 	}
 
 	/**