Skip to content

Commit 8cb51ae

Browse files
committed
Moving to SQLCipher 4.10.0
1 parent e80d820 commit 8cb51ae

3 files changed

Lines changed: 83 additions & 3 deletions

File tree

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
Arguments:
2+
/opt/homebrew/Cellar/node/23.9.0/bin/node /Users/wmathurin/.yarn/bin/yarn.js install
3+
4+
PATH:
5+
/Users/wmathurin/.yarn/bin:/Users/wmathurin/.config/yarn/global/node_modules/.bin:/Users/wmathurin/.gem/ruby/3.2.2/bin:/Users/wmathurin/.rubies/ruby-3.2.2/lib/ruby/gems/3.2.0/bin:/Users/wmathurin/.rubies/ruby-3.2.2/bin:/Users/wmathurin/.rbenv/shims:/Users/wmathurin/Library/Android/sdk/ndk/26.1.10909125/toolchains/llvm/prebuilt/darwin-x86_64/bin:/Users/wmathurin/Library/Android/sdk/ndk/26.1.10909125/toolchains/arm-linux-androideabi-4.9/prebuilt/darwin-x86_64/bin:/usr/local/git/bin:/Users/wmathurin/.node/bin:/Users/wmathurin/.npm-packages/bin:/Users/wmathurin/Applications/scripts:/Users/wmathurin/.rbenv/shims:/opt/local/bin:/opt/local/sbin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/System/Cryptexes/App/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/local/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/appleinternal/bin:/Library/Apple/usr/bin:/usr/local/MacGPG2/bin:/usr/local/share/dotnet:~/.dotnet/tools:/Users/wmathurin/.cargo/bin:/Users/wmathurin/Library/Android/sdk/emulator:/Users/wmathurin/Library/Android/sdk/tools:/Users/wmathurin/Library/Android/sdk/platform-tools:/Users/wmathurin/.cache/lm-studio/bin
6+
7+
Yarn version:
8+
1.22.19
9+
10+
Node version:
11+
23.9.0
12+
13+
Platform:
14+
darwin arm64
15+
16+
Trace:
17+
SyntaxError: /Users/wmathurin/Development/github/wmathurin/SalesforceMobileSDK-Android/libs/SalesforceReact/package.json: Expected double-quoted property name in JSON at position 253 (line 11 column 1)
18+
at JSON.parse (<anonymous>)
19+
at /Users/wmathurin/.yarn/lib/cli.js:1629:59
20+
at Generator.next (<anonymous>)
21+
at step (/Users/wmathurin/.yarn/lib/cli.js:310:30)
22+
at /Users/wmathurin/.yarn/lib/cli.js:321:13
23+
24+
npm manifest:
25+
{
26+
"name": "SalesforceReact",
27+
"version": "13.1.0",
28+
"private": true,
29+
"scripts": {
30+
"start": "react-native start"
31+
},
32+
"dependencies": {
33+
"@babel/plugin-transform-private-property-in-object": "^7.24.7",
34+
"create-react-class": "^15.7.0",
35+
<<<<<<< HEAD
36+
"jsc-android": "^250231.0.0",
37+
"react": "19.0.0",
38+
=======
39+
"react": "19.1.0",
40+
>>>>>>> 5c9589df9b63f206e66f5ee27b49ef7dd040e197
41+
"react-native": "0.79.3",
42+
"react-native-force": "git+https://github.com/JohnsonEricAtSalesforce/SalesforceMobileSDK-ReactNative.git#feature/w-16556387_reactnative_android-upgrade-to-react-native-0.79"
43+
},
44+
"devDependencies": {
45+
"@babel/core": "^7.25.2",
46+
"@babel/preset-env": "^7.25.3",
47+
"@babel/runtime": "^7.25.0",
48+
"@react-native-community/cli": "18.0.0",
49+
"@react-native-community/cli-platform-android": "18.0.0",
50+
"@react-native-community/cli-platform-ios": "18.0.0",
51+
"@react-native/babel-preset": "0.79.3",
52+
"@react-native/eslint-config": "0.79.3",
53+
"@react-native/metro-config": "0.79.3",
54+
"@react-native/typescript-config": "0.79.3",
55+
"@types/jest": "^29.5.13",
56+
"@types/react": "^19.0.0",
57+
<<<<<<< HEAD
58+
"@types/react-test-renderer": "^19.0.0",
59+
"chai": "5.2.0",
60+
=======
61+
"@types/react-test-renderer": "^18.0.0",
62+
µπ "babel-jest": "^29.6.3",
63+
"chai": "4.4.1",
64+
>>>>>>> 5c9589df9b63f206e66f5ee27b49ef7dd040e197
65+
"eslint": "^8.19.0",
66+
"jest": "^29.6.3",
67+
"prettier": "2.8.8",
68+
"react-test-renderer": "18.2.0",
69+
"typescript": "5.0.4"
70+
},
71+
"engines": {
72+
"node": ">=18"
73+
}
74+
}
75+
76+
yarn manifest:
77+
No manifest
78+
79+
Lockfile:
80+
No lockfile

libs/SmartStore/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dependencies {
1313
api(project(":libs:SalesforceSDK"))
1414
//noinspection GradleDependency - Needs to line up with supported SQLCipher version.
1515
api("androidx.sqlite:sqlite:2.2.0")
16-
api("net.zetetic:sqlcipher-android:4.9.0")
16+
api("net.zetetic:sqlcipher-android:4.10.0")
1717
implementation("androidx.core:core-ktx:1.16.0")
1818
androidTestImplementation("androidx.test:runner:1.6.2")
1919
androidTestImplementation("androidx.test:rules:1.6.1")

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,15 +116,15 @@ public void testRuntimeSettings() {
116116
*/
117117
@Test
118118
public void testSQLCipherVersion() {
119-
Assert.assertEquals("Wrong sqlcipher version", "4.9.0 community", store.getSQLCipherVersion());
119+
Assert.assertEquals("Wrong sqlcipher version", "4.10.0 community", store.getSQLCipherVersion());
120120
}
121121

122122
/**
123123
* Checking sqlcipher provider version
124124
*/
125125
@Test
126126
public void testCipherProviderVersion() {
127-
Assert.assertEquals("Wrong sqlcipher provider version", "OpenSSL 3.0.16 11 Feb 2025", store.getCipherProviderVersion());
127+
Assert.assertEquals("Wrong sqlcipher provider version", "OpenSSL 3.0.17 1 Jul 2025", store.getCipherProviderVersion());
128128
}
129129

130130
/**

0 commit comments

Comments
 (0)