diff --git a/.github/workflows/version-bump.yml b/.github/workflows/version-bump.yml index a7e0ca56b..c8d9932ce 100644 --- a/.github/workflows/version-bump.yml +++ b/.github/workflows/version-bump.yml @@ -6,6 +6,7 @@ on: jobs: Build: + if: contains(github.event.head_commit.message, 'chore(release)') == false runs-on: ubuntu-latest steps: - name: Checkout code diff --git a/.yarn/cache/react-native-keychain-https-9e5d841816-a8a1484446.zip b/.yarn/cache/react-native-keychain-https-9e5d841816-a8a1484446.zip new file mode 100644 index 000000000..efd13f261 Binary files /dev/null and b/.yarn/cache/react-native-keychain-https-9e5d841816-a8a1484446.zip differ diff --git a/.yarn/cache/react-native-keychain-npm-8.0.0-22c1f5c020-cbab1cef85.zip b/.yarn/cache/react-native-keychain-npm-8.0.0-22c1f5c020-cbab1cef85.zip deleted file mode 100644 index 1b32bc549..000000000 Binary files a/.yarn/cache/react-native-keychain-npm-8.0.0-22c1f5c020-cbab1cef85.zip and /dev/null differ diff --git a/package.json b/package.json index ca4545b53..adf5f7590 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,8 @@ "prepare": "husky install", "reset": "find . -type dir -name node_modules | xargs rm -rf && rm -rf yarn.lock", "release:prod": "lerna version --conventional-commits --yes -m \"chore(release): publish\"", - "release:beta": "lerna version --conventional-prerelease --conventional-commits --yes -m \"chore(release): publish\"" + "release:beta": "lerna version --conventional-prerelease --conventional-commits --yes -m \"chore(release): publish\"", + "version": "yarn install --no-immutable && git add yarn.lock" }, "resolutions": { "@types/styled-components/@types/react": "17.0.2", diff --git a/packages/mobile/package.json b/packages/mobile/package.json index 46e44dbd5..9b6c6aca5 100644 --- a/packages/mobile/package.json +++ b/packages/mobile/package.json @@ -56,7 +56,7 @@ "react-native-fs": "^2.19.0", "react-native-gesture-handler": "2.3.2", "react-native-image-picker": "^4.7.3", - "react-native-keychain": "8.0.0", + "react-native-keychain": "standardnotes/react-native-keychain#d277d360494cbd02be4accb4a360772a8e0e97b6", "react-native-mail": "standardnotes/react-native-mail#fd26119e67a2ffc5eaa95a9c17049743e39ce2d3", "react-native-privacy-snapshot": "standardnotes/react-native-privacy-snapshot#653e904c90fc6f2b578da59138f2bfe5d7f942fe", "react-native-reanimated": "^2.8.0", diff --git a/packages/mobile/patches/react-native-keychain+8.0.0.patch b/packages/mobile/patches/react-native-keychain+8.0.0.patch deleted file mode 100644 index 6fc0ff9b5..000000000 --- a/packages/mobile/patches/react-native-keychain+8.0.0.patch +++ /dev/null @@ -1,21 +0,0 @@ -Fixes Android on launch performance issue -https://github.com/oblador/react-native-keychain/issues/314#issuecomment-736640077 - -diff --git a/android/src/main/java/com/oblador/keychain/KeychainModule.java b/android/src/main/java/com/oblador/keychain/KeychainModule.java -index 6ca68cb..a600f38 100644 ---- a/android/src/main/java/com/oblador/keychain/KeychainModule.java -+++ b/android/src/main/java/com/oblador/keychain/KeychainModule.java -@@ -140,13 +140,7 @@ public class KeychainModule extends ReactContextBaseJavaModule { - super(reactContext); - prefsStorage = new PrefsStorage(reactContext); - -- addCipherStorageToMap(new CipherStorageFacebookConceal(reactContext)); - addCipherStorageToMap(new CipherStorageKeystoreAesCbc()); -- -- // we have a references to newer api that will fail load of app classes in old androids OS -- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { -- addCipherStorageToMap(new CipherStorageKeystoreRsaEcb()); -- } - } - - /** Allow initialization in chain. */ diff --git a/yarn.lock b/yarn.lock index ea5cbcc1b..21e174b4c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5312,7 +5312,7 @@ __metadata: react-native-fs: ^2.19.0 react-native-gesture-handler: 2.3.2 react-native-image-picker: ^4.7.3 - react-native-keychain: 8.0.0 + react-native-keychain: "standardnotes/react-native-keychain#d277d360494cbd02be4accb4a360772a8e0e97b6" react-native-mail: "standardnotes/react-native-mail#fd26119e67a2ffc5eaa95a9c17049743e39ce2d3" react-native-monorepo-tools: ^1.1.4 react-native-pager-view: ^5.4.15 @@ -23121,10 +23121,10 @@ __metadata: languageName: node linkType: hard -"react-native-keychain@npm:8.0.0": +"react-native-keychain@standardnotes/react-native-keychain#d277d360494cbd02be4accb4a360772a8e0e97b6": version: 8.0.0 - resolution: "react-native-keychain@npm:8.0.0" - checksum: cbab1cef8565743072f919663068727df20fc0ef5edd53b0aa96fac74c11fcd0daa197968b06cabed4f1b3f8e5e5ae73b6db8543ed9adbecc13662c38958c9ce + resolution: "react-native-keychain@https://github.com/standardnotes/react-native-keychain.git#commit=d277d360494cbd02be4accb4a360772a8e0e97b6" + checksum: a8a1484446a24db4f90bc72ba7b22a4637cc4f75421f9b3c30b22bfe753c2c349a165dc848cb0ed4508f64f96e5d2220e41aae57647629d9a70aff933152e8df languageName: node linkType: hard