CLI v2.2.2

Releasing sub-packages
Cli: Fixed version command so that it does not require the keychain
2025-08-27 20:29:45 +02:00 · 2021-08-11 16:35:11 +01:00 · 2021-08-11 16:29:31 +01:00 · 2021-08-11 16:27:23 +01:00 · 2021-08-11 12:03:04 +01:00 · 2021-08-11 11:45:00 +01:00
64 changed files with 2505 additions and 8765 deletions
--- a/.eslintignore
+++ b/.eslintignore
@@ -1719,6 +1719,9 @@ packages/tools/release-ios.js.map
 packages/tools/release-server.d.ts
 packages/tools/release-server.js
 packages/tools/release-server.js.map
+packages/tools/setupNewRelease.d.ts
+packages/tools/setupNewRelease.js
+packages/tools/setupNewRelease.js.map
 packages/tools/tool-utils.d.ts
 packages/tools/tool-utils.js
 packages/tools/tool-utils.js.map
--- a/.gitignore
+++ b/.gitignore
@@ -1704,6 +1704,9 @@ packages/tools/release-ios.js.map
 packages/tools/release-server.d.ts
 packages/tools/release-server.js
 packages/tools/release-server.js.map
+packages/tools/setupNewRelease.d.ts
+packages/tools/setupNewRelease.js
+packages/tools/setupNewRelease.js.map
 packages/tools/tool-utils.d.ts
 packages/tools/tool-utils.js
 packages/tools/tool-utils.js.map
--- a/packages/app-cli/app/app.js
+++ b/packages/app-cli/app/app.js
@@ -402,8 +402,16 @@ class Application extends BaseApplication {
 		}
 	}

+	// We need this special case here because by the time the `version` command
+	// runs, the keychain has already been setup.
+	checkIfKeychainEnabled(argv) {
+		return argv.indexOf('version') < 0;
+	}
+
 	async start(argv) {
-		argv = await super.start(argv);
+		const keychainEnabled = this.checkIfKeychainEnabled(argv);
+
+		argv = await super.start(argv, { keychainEnabled });

 		cliUtils.setStdout(object => {
 			return this.stdout(object);
--- a/packages/app-cli/app/command-version.js
+++ b/packages/app-cli/app/command-version.js
@@ -1,6 +1,6 @@
 const { BaseCommand } = require('./base-command.js');
-const Setting = require('@joplin/lib/models/Setting').default;
 const { _ } = require('@joplin/lib/locale');
+const versionInfo = require('@joplin/lib/versionInfo').default;

 class Command extends BaseCommand {
 	usage() {
@@ -12,8 +12,7 @@ class Command extends BaseCommand {
 	}

 	async action() {
-		const p = require('./package.json');
-		this.stdout(_('%s %s (%s)', p.name, p.version, Setting.value('env')));
+		this.stdout(versionInfo(require('./package.json')).message);
 	}
 }

--- a/packages/app-cli/package-lock.json
+++ b/packages/app-cli/package-lock.json
--- a/packages/app-cli/package.json
+++ b/packages/app-cli/package.json
@@ -32,7 +32,7 @@
    ],
    "owner": "Laurent Cozic"
  },
-  "version": "2.2.1",
+  "version": "2.2.2",
  "bin": {
    "joplin": "./main.js"
  },
@@ -40,8 +40,9 @@
    "node": ">=10.0.0"
  },
  "dependencies": {
-    "@joplin/lib": "2.1",
-    "@joplin/renderer": "2.1",
+    "@joplin/lib": "~2.2",
+    "@joplin/renderer": "~2.2",
+    "aws-sdk": "^2.588.0",
    "chalk": "^4.1.0",
    "compare-version": "^0.1.2",
    "fs-extra": "^5.0.0",
@@ -64,7 +65,7 @@
    "yargs-parser": "^7.0.0"
  },
  "devDependencies": {
-    "@joplin/tools": "2.1",
+    "@joplin/tools": "~2.2",
    "@types/fs-extra": "^9.0.6",
    "@types/jest": "^26.0.15",
    "@types/node": "^14.14.6",
--- a/packages/app-cli/tests/support/plugins/dialog/src/index.ts
+++ b/packages/app-cli/tests/support/plugins/dialog/src/index.ts
@@ -40,23 +40,7 @@ joplin.plugins.register({
 		`);

 		const result3 = await dialogs.open(handle3);
-		console.info('Got result: ' + JSON.stringify(result3));		
-		
-
-		const handle4 = await dialogs.create('myDialog4');
-		await dialogs.setHtml(handle4, `
-		<h1>This dialog tests dynamic sizing</h1>
-		<h3>Resize the window and the dialog should resize accordingly</h3>
-		<p>
-			Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
-			Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
-			Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
-			Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum
-		</p>
-		`);
-		await (dialogs as any).setFitToContent(handle4, false);
-		await dialogs.open(handle4);
-
+		console.info('Got result: ' + JSON.stringify(result3));
 	},

 });
--- a/packages/app-desktop/gui/MainScreen/MainScreen.tsx
+++ b/packages/app-desktop/gui/MainScreen/MainScreen.tsx
@@ -782,7 +782,6 @@ class MainScreenComponent extends React.Component<Props, State> {
 				scripts={view.scripts}
 				pluginId={plugin.id}
 				buttons={view.buttons}
-				fitToContent={view.fitToContent}
 			/>);
 		}

--- a/packages/app-desktop/package-lock.json
+++ b/packages/app-desktop/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "@joplin/app-desktop",
-  "version": "2.2.6",
+  "version": "2.2.7",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/packages/app-desktop/package.json
+++ b/packages/app-desktop/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@joplin/app-desktop",
-  "version": "2.2.6",
+  "version": "2.2.7",
  "description": "Joplin for Desktop",
  "main": "main.js",
  "private": true,
@@ -93,7 +93,7 @@
  },
  "homepage": "https://github.com/laurent22/joplin#readme",
  "devDependencies": {
-    "@joplin/tools": "^1.0.9",
+    "@joplin/tools": "~2.2",
    "@testing-library/react-hooks": "^3.4.2",
    "@types/jest": "^26.0.15",
    "@types/node": "^14.14.6",
@@ -122,8 +122,8 @@
  },
  "dependencies": {
    "@fortawesome/fontawesome-free": "^5.13.0",
-    "@joplin/lib": "^1.0.9",
-    "@joplin/renderer": "^1.0.17",
+    "@joplin/lib": "~2.2",
+    "@joplin/renderer": "~2.2",
    "async-mutex": "^0.1.3",
    "codemirror": "^5.56.0",
    "color": "^3.1.2",
--- a/packages/app-desktop/services/plugins/UserWebview.tsx
+++ b/packages/app-desktop/services/plugins/UserWebview.tsx
@@ -31,8 +31,8 @@ export interface Props {
 const StyledFrame = styled.iframe`
 	padding: 0;
 	margin: 0;
-	width: ${(props: any) => props.fitToContent ? `${props.width}px` : '90vw'};
-	height: ${(props: any) => props.fitToContent ? `${props.height}px` : '80vh'};
+	width: ${(props: any) => props.fitToContent ? `${props.width}px` : '100%'};
+	height: ${(props: any) => props.fitToContent ? `${props.height}px` : '100%'};
 	border: none;
 	border-bottom: ${(props: Props) => props.borderBottom ? `1px solid ${props.theme.dividerColor}` : 'none'};
 `;
--- a/packages/app-desktop/services/plugins/UserWebviewDialog.tsx
+++ b/packages/app-desktop/services/plugins/UserWebviewDialog.tsx
@@ -9,7 +9,6 @@ const styled = require('styled-components').default;

 interface Props extends UserWebviewProps {
 	buttons: ButtonSpec[];
-	fitToContent: boolean;
 }

 const StyledRoot = styled.div`
@@ -114,7 +113,7 @@ export default function UserWebviewDialog(props: Props) {
 						viewId={props.viewId}
 						themeId={props.themeId}
 						borderBottom={false}
-						fitToContent={props.fitToContent}
+						fitToContent={true}
 						onSubmit={onSubmit}
 						onDismiss={onDismiss}
 						onReady={onReady}
--- a/packages/app-mobile/android/app/build.gradle
+++ b/packages/app-mobile/android/app/build.gradle
@@ -141,10 +141,10 @@ android {
        applicationId "net.cozic.joplin"
        minSdkVersion rootProject.ext.minSdkVersion
        targetSdkVersion rootProject.ext.targetSdkVersion
-		versionCode 2097642
-		versionName "2.2.3"
+		versionCode 2097644
+		versionName "2.2.5"
 		ndk {
-			abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
+			abiFilters "armeabi-v7a", "x86"
 		}
 		
        // https://github.com/react-native-community/react-native-camera/issues/2138
@@ -158,7 +158,7 @@ android {
            reset()
            enable enableSeparateBuildPerCPUArchitecture
            universalApk false  // If true, also generate a universal APK
-            include "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
+            include "armeabi-v7a", "x86"
        }
    }
    signingConfigs {
@@ -195,11 +195,12 @@ android {
        variant.outputs.each { output ->
            // For each separate APK per architecture, set a unique version code as described here:
            // https://developer.android.com/studio/build/configure-apk-splits.html
+            // Example: versionCode 1 will generate 1001 for armeabi-v7a, 1002 for x86, etc.
            def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4]
            def abi = output.getFilter(OutputFile.ABI)
            if (abi != null) {  // null for the universal-debug, universal-release variants
                output.versionCodeOverride =
-                        versionCodes.get(abi) * 1048576 + defaultConfig.versionCode
+                        defaultConfig.versionCode * 1000 + versionCodes.get(abi)
            }

        }
--- a/packages/app-mobile/android/app/src/debug/AndroidManifest.xml
+++ b/packages/app-mobile/android/app/src/debug/AndroidManifest.xml
@@ -4,5 +4,10 @@

    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>

-    <application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" />
+    <application
+        android:usesCleartextTraffic="true"
+        tools:targetApi="28"
+        tools:ignore="GoogleAppIndexingWarning">
+        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
+    </application>
 </manifest>
--- a/packages/app-mobile/android/app/src/main/AndroidManifest.xml
+++ b/packages/app-mobile/android/app/src/main/AndroidManifest.xml
@@ -58,8 +58,6 @@
 			</intent-filter>
 		</activity>

-		<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
-
 		<!-- SHARE EXTENSION -->
 		<activity
 			android:noHistory="true"
--- a/packages/app-mobile/android/app/src/main/res/values/styles.xml
+++ b/packages/app-mobile/android/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>

    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
        <!-- Customize your theme here. -->
        <item name="android:textColor">#000000</item>
    </style>
--- a/packages/app-mobile/android/build.gradle
+++ b/packages/app-mobile/android/build.gradle
@@ -2,17 +2,18 @@

 buildscript {
    ext {
-        buildToolsVersion = "29.0.2"
+        buildToolsVersion = "29.0.3"
        minSdkVersion = 21
        compileSdkVersion = 29
        targetSdkVersion = 29
+        ndkVersion = "20.1.5948944"
    }
    repositories {
        google()
        jcenter()
    }
    dependencies {
-        classpath("com.android.tools.build:gradle:3.5.3")
+        classpath("com.android.tools.build:gradle:4.1.0")
        // NOTE: Do not place your application dependencies here; they belong
        // in the individual module build.gradle files
    }
--- a/packages/app-mobile/android/gradle.properties
+++ b/packages/app-mobile/android/gradle.properties
@@ -26,4 +26,4 @@ android.useAndroidX=true
 android.enableJetifier=true

 # Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.54.0
+FLIPPER_VERSION=0.75.1
--- a/packages/app-mobile/android/gradle/wrapper/gradle-wrapper.properties
+++ b/packages/app-mobile/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/packages/app-mobile/index.js
+++ b/packages/app-mobile/index.js
@@ -6,10 +6,6 @@

 // So there's basically still a one way flux: React => SQLite => Redux => React

-// For aws-sdk-js-v3
-import 'react-native-get-random-values';
-import 'react-native-url-polyfill/auto';
-
 import { LogBox, AppRegistry } from 'react-native';
 const Root = require('./root').default;

--- a/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj
+++ b/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj
@@ -221,7 +221,6 @@
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
 				CBC8354E4CF5CF4E15F2FCDE /* [CP] Copy Pods Resources */,
 				AE82E4B42599FA3A0013551B /* Embed App Extensions */,
-				13E3B207347DBB838B02DAEA /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -347,24 +346,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		13E3B207347DBB838B02DAEA /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Joplin/Pods-Joplin-frameworks.sh",
-				"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Joplin/Pods-Joplin-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		335ACF4DE85695BEBB18D8A3 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
--- a/packages/app-mobile/ios/Joplin.xcodeproj/xcshareddata/xcschemes/Joplin.xcscheme
+++ b/packages/app-mobile/ios/Joplin.xcodeproj/xcshareddata/xcschemes/Joplin.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1210"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
--- a/packages/app-mobile/ios/Joplin/AppDelegate.m
+++ b/packages/app-mobile/ios/Joplin/AppDelegate.m
@@ -79,7 +79,11 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response
                                                   moduleName:@"Joplin"
                                            initialProperties:nil];

-  rootView.backgroundColor = [[UIColor alloc] initWithRed:1.0f green:1.0f blue:1.0f alpha:1];
+  if (@available(iOS 13.0, *)) {
+      rootView.backgroundColor = [UIColor systemBackgroundColor];
+  } else {
+      rootView.backgroundColor = [UIColor whiteColor];
+  }

  self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
  UIViewController *rootViewController = [UIViewController new];
--- a/packages/app-mobile/ios/Joplin/Info.plist
+++ b/packages/app-mobile/ios/Joplin/Info.plist
@@ -39,8 +39,6 @@
 	<true/>
 	<key>NSAppTransportSecurity</key>
 	<dict>
-		<key>NSAllowsArbitraryLoads</key>
-		<true/>
 		<key>NSExceptionDomains</key>
 		<dict>
 			<key>localhost</key>
--- a/packages/app-mobile/ios/Podfile
+++ b/packages/app-mobile/ios/Podfile
@@ -8,7 +8,11 @@ platform :ios, '10.0'
 target 'Joplin' do
  config = use_native_modules!

-  use_react_native!(:path => config["reactNativePath"])
+  use_react_native!(
+    :path => config[:reactNativePath],
+    # to enable hermes on iOS, change `false` to `true` and then install pods
+    :hermes_enabled => false
+  )
  
  pod 'RNVectorIcons', :path => '../node_modules/react-native-vector-icons'
  pod 'JoplinRNShareExtension', :path => 'ShareExtension'
@@ -16,12 +20,17 @@ target 'Joplin' do
  # Enables Flipper.
  #
  # Note that if you have use_frameworks! enabled, Flipper will not work and
-  # you should disable these next few lines.
+  # you should disable the next line.
+  # use_flipper!()
+  # post_install do |installer|
+  #   react_native_post_install(installer)
+  # end

-  use_flipper!({ 'Flipper-Folly' => '2.5.3', 'Flipper' => '0.87.0', 'Flipper-RSocket' => '1.3.1' })
-  post_install do |installer|
-    flipper_post_install(installer)
-  end
+  # RN 0.63:
+  # use_flipper!({ 'Flipper-Folly' => '2.5.3', 'Flipper' => '0.87.0', 'Flipper-RSocket' => '1.3.1' })
+  # post_install do |installer|
+  #   flipper_post_install(installer)
+  # end
 end

 target 'ShareExtension' do
--- a/packages/app-mobile/ios/Podfile.lock
+++ b/packages/app-mobile/ios/Podfile.lock
@@ -1,254 +1,212 @@
 PODS:
  - boost-for-react-native (1.63.0)
-  - CocoaAsyncSocket (7.6.5)
  - DoubleConversion (1.1.6)
-  - FBLazyVector (0.63.3)
-  - FBReactNativeSpec (0.63.3):
-    - Folly (= 2020.01.13.00)
-    - RCTRequired (= 0.63.3)
-    - RCTTypeSafety (= 0.63.3)
-    - React-Core (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - ReactCommon/turbomodule/core (= 0.63.3)
-  - Flipper (0.87.0):
-    - Flipper-Folly (~> 2.5)
-    - Flipper-RSocket (~> 1.3)
-  - Flipper-DoubleConversion (1.1.7)
-  - Flipper-Folly (2.5.3):
-    - boost-for-react-native
-    - Flipper-DoubleConversion
-    - Flipper-Glog
-    - libevent (~> 2.1.12)
-    - OpenSSL-Universal (= 1.1.180)
-  - Flipper-Glog (0.3.6)
-  - Flipper-PeerTalk (0.0.4)
-  - Flipper-RSocket (1.3.1):
-    - Flipper-Folly (~> 2.5)
-  - FlipperKit (0.87.0):
-    - FlipperKit/Core (= 0.87.0)
-  - FlipperKit/Core (0.87.0):
-    - Flipper (~> 0.87.0)
-    - FlipperKit/CppBridge
-    - FlipperKit/FBCxxFollyDynamicConvert
-    - FlipperKit/FBDefines
-    - FlipperKit/FKPortForwarding
-  - FlipperKit/CppBridge (0.87.0):
-    - Flipper (~> 0.87.0)
-  - FlipperKit/FBCxxFollyDynamicConvert (0.87.0):
-    - Flipper-Folly (~> 2.5)
-  - FlipperKit/FBDefines (0.87.0)
-  - FlipperKit/FKPortForwarding (0.87.0):
-    - CocoaAsyncSocket (~> 7.6)
-    - Flipper-PeerTalk (~> 0.0.4)
-  - FlipperKit/FlipperKitHighlightOverlay (0.87.0)
-  - FlipperKit/FlipperKitLayoutHelpers (0.87.0):
-    - FlipperKit/Core
-    - FlipperKit/FlipperKitHighlightOverlay
-    - FlipperKit/FlipperKitLayoutTextSearchable
-  - FlipperKit/FlipperKitLayoutIOSDescriptors (0.87.0):
-    - FlipperKit/Core
-    - FlipperKit/FlipperKitHighlightOverlay
-    - FlipperKit/FlipperKitLayoutHelpers
-    - YogaKit (~> 1.18)
-  - FlipperKit/FlipperKitLayoutPlugin (0.87.0):
-    - FlipperKit/Core
-    - FlipperKit/FlipperKitHighlightOverlay
-    - FlipperKit/FlipperKitLayoutHelpers
-    - FlipperKit/FlipperKitLayoutIOSDescriptors
-    - FlipperKit/FlipperKitLayoutTextSearchable
-    - YogaKit (~> 1.18)
-  - FlipperKit/FlipperKitLayoutTextSearchable (0.87.0)
-  - FlipperKit/FlipperKitNetworkPlugin (0.87.0):
-    - FlipperKit/Core
-  - FlipperKit/FlipperKitReactPlugin (0.87.0):
-    - FlipperKit/Core
-  - FlipperKit/FlipperKitUserDefaultsPlugin (0.87.0):
-    - FlipperKit/Core
-  - FlipperKit/SKIOSNetworkPlugin (0.87.0):
-    - FlipperKit/Core
-    - FlipperKit/FlipperKitNetworkPlugin
-  - Folly (2020.01.13.00):
-    - boost-for-react-native
-    - DoubleConversion
-    - Folly/Default (= 2020.01.13.00)
-    - glog
-  - Folly/Default (2020.01.13.00):
-    - boost-for-react-native
-    - DoubleConversion
-    - glog
+  - FBLazyVector (0.64.2)
+  - FBReactNativeSpec (0.64.2):
+    - RCT-Folly (= 2020.01.13.00)
+    - RCTRequired (= 0.64.2)
+    - RCTTypeSafety (= 0.64.2)
+    - React-Core (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - ReactCommon/turbomodule/core (= 0.64.2)
  - glog (0.3.5)
  - JoplinCommonShareExtension (1.0.0)
  - JoplinRNShareExtension (1.0.0):
    - JoplinCommonShareExtension
-    - React (= 0.63.3)
-  - libevent (2.1.12)
-  - OpenSSL-Universal (1.1.180)
-  - RCTRequired (0.63.3)
-  - RCTTypeSafety (0.63.3):
-    - FBLazyVector (= 0.63.3)
-    - Folly (= 2020.01.13.00)
-    - RCTRequired (= 0.63.3)
-    - React-Core (= 0.63.3)
-  - React (0.63.3):
-    - React-Core (= 0.63.3)
-    - React-Core/DevSupport (= 0.63.3)
-    - React-Core/RCTWebSocket (= 0.63.3)
-    - React-RCTActionSheet (= 0.63.3)
-    - React-RCTAnimation (= 0.63.3)
-    - React-RCTBlob (= 0.63.3)
-    - React-RCTImage (= 0.63.3)
-    - React-RCTLinking (= 0.63.3)
-    - React-RCTNetwork (= 0.63.3)
-    - React-RCTSettings (= 0.63.3)
-    - React-RCTText (= 0.63.3)
-    - React-RCTVibration (= 0.63.3)
-  - React-callinvoker (0.63.3)
-  - React-Core (0.63.3):
-    - Folly (= 2020.01.13.00)
+    - React (= 0.64.2)
+  - RCT-Folly (2020.01.13.00):
+    - boost-for-react-native
+    - DoubleConversion
    - glog
-    - React-Core/Default (= 0.63.3)
-    - React-cxxreact (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - React-jsiexecutor (= 0.63.3)
+    - RCT-Folly/Default (= 2020.01.13.00)
+  - RCT-Folly/Default (2020.01.13.00):
+    - boost-for-react-native
+    - DoubleConversion
+    - glog
+  - RCTRequired (0.64.2)
+  - RCTTypeSafety (0.64.2):
+    - FBLazyVector (= 0.64.2)
+    - RCT-Folly (= 2020.01.13.00)
+    - RCTRequired (= 0.64.2)
+    - React-Core (= 0.64.2)
+  - React (0.64.2):
+    - React-Core (= 0.64.2)
+    - React-Core/DevSupport (= 0.64.2)
+    - React-Core/RCTWebSocket (= 0.64.2)
+    - React-RCTActionSheet (= 0.64.2)
+    - React-RCTAnimation (= 0.64.2)
+    - React-RCTBlob (= 0.64.2)
+    - React-RCTImage (= 0.64.2)
+    - React-RCTLinking (= 0.64.2)
+    - React-RCTNetwork (= 0.64.2)
+    - React-RCTSettings (= 0.64.2)
+    - React-RCTText (= 0.64.2)
+    - React-RCTVibration (= 0.64.2)
+  - React-callinvoker (0.64.2)
+  - React-Core (0.64.2):
+    - glog
+    - RCT-Folly (= 2020.01.13.00)
+    - React-Core/Default (= 0.64.2)
+    - React-cxxreact (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-jsiexecutor (= 0.64.2)
+    - React-perflogger (= 0.64.2)
    - Yoga
-  - React-Core/CoreModulesHeaders (0.63.3):
-    - Folly (= 2020.01.13.00)
+  - React-Core/CoreModulesHeaders (0.64.2):
    - glog
+    - RCT-Folly (= 2020.01.13.00)
    - React-Core/Default
-    - React-cxxreact (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - React-jsiexecutor (= 0.63.3)
+    - React-cxxreact (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-jsiexecutor (= 0.64.2)
+    - React-perflogger (= 0.64.2)
    - Yoga
-  - React-Core/Default (0.63.3):
-    - Folly (= 2020.01.13.00)
+  - React-Core/Default (0.64.2):
    - glog
-    - React-cxxreact (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - React-jsiexecutor (= 0.63.3)
+    - RCT-Folly (= 2020.01.13.00)
+    - React-cxxreact (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-jsiexecutor (= 0.64.2)
+    - React-perflogger (= 0.64.2)
    - Yoga
-  - React-Core/DevSupport (0.63.3):
-    - Folly (= 2020.01.13.00)
+  - React-Core/DevSupport (0.64.2):
    - glog
-    - React-Core/Default (= 0.63.3)
-    - React-Core/RCTWebSocket (= 0.63.3)
-    - React-cxxreact (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - React-jsiexecutor (= 0.63.3)
-    - React-jsinspector (= 0.63.3)
+    - RCT-Folly (= 2020.01.13.00)
+    - React-Core/Default (= 0.64.2)
+    - React-Core/RCTWebSocket (= 0.64.2)
+    - React-cxxreact (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-jsiexecutor (= 0.64.2)
+    - React-jsinspector (= 0.64.2)
+    - React-perflogger (= 0.64.2)
    - Yoga
-  - React-Core/RCTActionSheetHeaders (0.63.3):
-    - Folly (= 2020.01.13.00)
+  - React-Core/RCTActionSheetHeaders (0.64.2):
    - glog
+    - RCT-Folly (= 2020.01.13.00)
    - React-Core/Default
-    - React-cxxreact (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - React-jsiexecutor (= 0.63.3)
+    - React-cxxreact (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-jsiexecutor (= 0.64.2)
+    - React-perflogger (= 0.64.2)
    - Yoga
-  - React-Core/RCTAnimationHeaders (0.63.3):
-    - Folly (= 2020.01.13.00)
+  - React-Core/RCTAnimationHeaders (0.64.2):
    - glog
+    - RCT-Folly (= 2020.01.13.00)
    - React-Core/Default
-    - React-cxxreact (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - React-jsiexecutor (= 0.63.3)
+    - React-cxxreact (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-jsiexecutor (= 0.64.2)
+    - React-perflogger (= 0.64.2)
    - Yoga
-  - React-Core/RCTBlobHeaders (0.63.3):
-    - Folly (= 2020.01.13.00)
+  - React-Core/RCTBlobHeaders (0.64.2):
    - glog
+    - RCT-Folly (= 2020.01.13.00)
    - React-Core/Default
-    - React-cxxreact (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - React-jsiexecutor (= 0.63.3)
+    - React-cxxreact (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-jsiexecutor (= 0.64.2)
+    - React-perflogger (= 0.64.2)
    - Yoga
-  - React-Core/RCTImageHeaders (0.63.3):
-    - Folly (= 2020.01.13.00)
+  - React-Core/RCTImageHeaders (0.64.2):
    - glog
+    - RCT-Folly (= 2020.01.13.00)
    - React-Core/Default
-    - React-cxxreact (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - React-jsiexecutor (= 0.63.3)
+    - React-cxxreact (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-jsiexecutor (= 0.64.2)
+    - React-perflogger (= 0.64.2)
    - Yoga
-  - React-Core/RCTLinkingHeaders (0.63.3):
-    - Folly (= 2020.01.13.00)
+  - React-Core/RCTLinkingHeaders (0.64.2):
    - glog
+    - RCT-Folly (= 2020.01.13.00)
    - React-Core/Default
-    - React-cxxreact (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - React-jsiexecutor (= 0.63.3)
+    - React-cxxreact (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-jsiexecutor (= 0.64.2)
+    - React-perflogger (= 0.64.2)
    - Yoga
-  - React-Core/RCTNetworkHeaders (0.63.3):
-    - Folly (= 2020.01.13.00)
+  - React-Core/RCTNetworkHeaders (0.64.2):
    - glog
+    - RCT-Folly (= 2020.01.13.00)
    - React-Core/Default
-    - React-cxxreact (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - React-jsiexecutor (= 0.63.3)
+    - React-cxxreact (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-jsiexecutor (= 0.64.2)
+    - React-perflogger (= 0.64.2)
    - Yoga
-  - React-Core/RCTSettingsHeaders (0.63.3):
-    - Folly (= 2020.01.13.00)
+  - React-Core/RCTSettingsHeaders (0.64.2):
    - glog
+    - RCT-Folly (= 2020.01.13.00)
    - React-Core/Default
-    - React-cxxreact (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - React-jsiexecutor (= 0.63.3)
+    - React-cxxreact (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-jsiexecutor (= 0.64.2)
+    - React-perflogger (= 0.64.2)
    - Yoga
-  - React-Core/RCTTextHeaders (0.63.3):
-    - Folly (= 2020.01.13.00)
+  - React-Core/RCTTextHeaders (0.64.2):
    - glog
+    - RCT-Folly (= 2020.01.13.00)
    - React-Core/Default
-    - React-cxxreact (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - React-jsiexecutor (= 0.63.3)
+    - React-cxxreact (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-jsiexecutor (= 0.64.2)
+    - React-perflogger (= 0.64.2)
    - Yoga
-  - React-Core/RCTVibrationHeaders (0.63.3):
-    - Folly (= 2020.01.13.00)
+  - React-Core/RCTVibrationHeaders (0.64.2):
    - glog
+    - RCT-Folly (= 2020.01.13.00)
    - React-Core/Default
-    - React-cxxreact (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - React-jsiexecutor (= 0.63.3)
+    - React-cxxreact (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-jsiexecutor (= 0.64.2)
+    - React-perflogger (= 0.64.2)
    - Yoga
-  - React-Core/RCTWebSocket (0.63.3):
-    - Folly (= 2020.01.13.00)
+  - React-Core/RCTWebSocket (0.64.2):
    - glog
-    - React-Core/Default (= 0.63.3)
-    - React-cxxreact (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - React-jsiexecutor (= 0.63.3)
+    - RCT-Folly (= 2020.01.13.00)
+    - React-Core/Default (= 0.64.2)
+    - React-cxxreact (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-jsiexecutor (= 0.64.2)
+    - React-perflogger (= 0.64.2)
    - Yoga
-  - React-CoreModules (0.63.3):
-    - FBReactNativeSpec (= 0.63.3)
-    - Folly (= 2020.01.13.00)
-    - RCTTypeSafety (= 0.63.3)
-    - React-Core/CoreModulesHeaders (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - React-RCTImage (= 0.63.3)
-    - ReactCommon/turbomodule/core (= 0.63.3)
-  - React-cxxreact (0.63.3):
+  - React-CoreModules (0.64.2):
+    - FBReactNativeSpec (= 0.64.2)
+    - RCT-Folly (= 2020.01.13.00)
+    - RCTTypeSafety (= 0.64.2)
+    - React-Core/CoreModulesHeaders (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-RCTImage (= 0.64.2)
+    - ReactCommon/turbomodule/core (= 0.64.2)
+  - React-cxxreact (0.64.2):
    - boost-for-react-native (= 1.63.0)
    - DoubleConversion
-    - Folly (= 2020.01.13.00)
    - glog
-    - React-callinvoker (= 0.63.3)
-    - React-jsinspector (= 0.63.3)
-  - React-jsi (0.63.3):
+    - RCT-Folly (= 2020.01.13.00)
+    - React-callinvoker (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-jsinspector (= 0.64.2)
+    - React-perflogger (= 0.64.2)
+    - React-runtimeexecutor (= 0.64.2)
+  - React-jsi (0.64.2):
    - boost-for-react-native (= 1.63.0)
    - DoubleConversion
-    - Folly (= 2020.01.13.00)
    - glog
-    - React-jsi/Default (= 0.63.3)
-  - React-jsi/Default (0.63.3):
+    - RCT-Folly (= 2020.01.13.00)
+    - React-jsi/Default (= 0.64.2)
+  - React-jsi/Default (0.64.2):
    - boost-for-react-native (= 1.63.0)
    - DoubleConversion
-    - Folly (= 2020.01.13.00)
    - glog
-  - React-jsiexecutor (0.63.3):
+    - RCT-Folly (= 2020.01.13.00)
+  - React-jsiexecutor (0.64.2):
    - DoubleConversion
-    - Folly (= 2020.01.13.00)
    - glog
-    - React-cxxreact (= 0.63.3)
-    - React-jsi (= 0.63.3)
-  - React-jsinspector (0.63.3)
+    - RCT-Folly (= 2020.01.13.00)
+    - React-cxxreact (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-perflogger (= 0.64.2)
+  - React-jsinspector (0.64.2)
  - react-native-alarm-notification (1.0.3):
    - React
  - react-native-camera (3.40.0):
@@ -263,8 +221,6 @@ PODS:
    - React-Core
  - react-native-geolocation (2.0.2):
    - React
-  - react-native-get-random-values (1.7.0):
-    - React-Core
  - react-native-image-picker (2.3.4):
    - React-Core
  - react-native-image-resizer (1.3.0):
@@ -279,66 +235,70 @@ PODS:
    - React-Core
  - react-native-webview (10.9.2):
    - React-Core
-  - React-RCTActionSheet (0.63.3):
-    - React-Core/RCTActionSheetHeaders (= 0.63.3)
-  - React-RCTAnimation (0.63.3):
-    - FBReactNativeSpec (= 0.63.3)
-    - Folly (= 2020.01.13.00)
-    - RCTTypeSafety (= 0.63.3)
-    - React-Core/RCTAnimationHeaders (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - ReactCommon/turbomodule/core (= 0.63.3)
-  - React-RCTBlob (0.63.3):
-    - FBReactNativeSpec (= 0.63.3)
-    - Folly (= 2020.01.13.00)
-    - React-Core/RCTBlobHeaders (= 0.63.3)
-    - React-Core/RCTWebSocket (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - React-RCTNetwork (= 0.63.3)
-    - ReactCommon/turbomodule/core (= 0.63.3)
-  - React-RCTImage (0.63.3):
-    - FBReactNativeSpec (= 0.63.3)
-    - Folly (= 2020.01.13.00)
-    - RCTTypeSafety (= 0.63.3)
-    - React-Core/RCTImageHeaders (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - React-RCTNetwork (= 0.63.3)
-    - ReactCommon/turbomodule/core (= 0.63.3)
-  - React-RCTLinking (0.63.3):
-    - FBReactNativeSpec (= 0.63.3)
-    - React-Core/RCTLinkingHeaders (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - ReactCommon/turbomodule/core (= 0.63.3)
-  - React-RCTNetwork (0.63.3):
-    - FBReactNativeSpec (= 0.63.3)
-    - Folly (= 2020.01.13.00)
-    - RCTTypeSafety (= 0.63.3)
-    - React-Core/RCTNetworkHeaders (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - ReactCommon/turbomodule/core (= 0.63.3)
-  - React-RCTSettings (0.63.3):
-    - FBReactNativeSpec (= 0.63.3)
-    - Folly (= 2020.01.13.00)
-    - RCTTypeSafety (= 0.63.3)
-    - React-Core/RCTSettingsHeaders (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - ReactCommon/turbomodule/core (= 0.63.3)
-  - React-RCTText (0.63.3):
-    - React-Core/RCTTextHeaders (= 0.63.3)
-  - React-RCTVibration (0.63.3):
-    - FBReactNativeSpec (= 0.63.3)
-    - Folly (= 2020.01.13.00)
-    - React-Core/RCTVibrationHeaders (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - ReactCommon/turbomodule/core (= 0.63.3)
-  - ReactCommon/turbomodule/core (0.63.3):
+  - React-perflogger (0.64.2)
+  - React-RCTActionSheet (0.64.2):
+    - React-Core/RCTActionSheetHeaders (= 0.64.2)
+  - React-RCTAnimation (0.64.2):
+    - FBReactNativeSpec (= 0.64.2)
+    - RCT-Folly (= 2020.01.13.00)
+    - RCTTypeSafety (= 0.64.2)
+    - React-Core/RCTAnimationHeaders (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - ReactCommon/turbomodule/core (= 0.64.2)
+  - React-RCTBlob (0.64.2):
+    - FBReactNativeSpec (= 0.64.2)
+    - RCT-Folly (= 2020.01.13.00)
+    - React-Core/RCTBlobHeaders (= 0.64.2)
+    - React-Core/RCTWebSocket (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-RCTNetwork (= 0.64.2)
+    - ReactCommon/turbomodule/core (= 0.64.2)
+  - React-RCTImage (0.64.2):
+    - FBReactNativeSpec (= 0.64.2)
+    - RCT-Folly (= 2020.01.13.00)
+    - RCTTypeSafety (= 0.64.2)
+    - React-Core/RCTImageHeaders (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-RCTNetwork (= 0.64.2)
+    - ReactCommon/turbomodule/core (= 0.64.2)
+  - React-RCTLinking (0.64.2):
+    - FBReactNativeSpec (= 0.64.2)
+    - React-Core/RCTLinkingHeaders (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - ReactCommon/turbomodule/core (= 0.64.2)
+  - React-RCTNetwork (0.64.2):
+    - FBReactNativeSpec (= 0.64.2)
+    - RCT-Folly (= 2020.01.13.00)
+    - RCTTypeSafety (= 0.64.2)
+    - React-Core/RCTNetworkHeaders (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - ReactCommon/turbomodule/core (= 0.64.2)
+  - React-RCTSettings (0.64.2):
+    - FBReactNativeSpec (= 0.64.2)
+    - RCT-Folly (= 2020.01.13.00)
+    - RCTTypeSafety (= 0.64.2)
+    - React-Core/RCTSettingsHeaders (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - ReactCommon/turbomodule/core (= 0.64.2)
+  - React-RCTText (0.64.2):
+    - React-Core/RCTTextHeaders (= 0.64.2)
+  - React-RCTVibration (0.64.2):
+    - FBReactNativeSpec (= 0.64.2)
+    - RCT-Folly (= 2020.01.13.00)
+    - React-Core/RCTVibrationHeaders (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - ReactCommon/turbomodule/core (= 0.64.2)
+  - React-runtimeexecutor (0.64.2):
+    - React-jsi (= 0.64.2)
+  - ReactCommon/turbomodule/core (0.64.2):
    - DoubleConversion
-    - Folly (= 2020.01.13.00)
    - glog
-    - React-callinvoker (= 0.63.3)
-    - React-Core (= 0.63.3)
-    - React-cxxreact (= 0.63.3)
-    - React-jsi (= 0.63.3)
+    - RCT-Folly (= 2020.01.13.00)
+    - React-callinvoker (= 0.64.2)
+    - React-Core (= 0.64.2)
+    - React-cxxreact (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-perflogger (= 0.64.2)
  - rn-fetch-blob (0.12.0):
    - React-Core
  - RNCClipboard (1.5.0):
@@ -360,36 +320,15 @@ PODS:
  - RNVectorIcons (7.1.0):
    - React
  - Yoga (1.14.0)
-  - YogaKit (1.18.1):
-    - Yoga (~> 1.14)

 DEPENDENCIES:
  - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
  - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
-  - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`)
-  - Flipper (= 0.87.0)
-  - Flipper-DoubleConversion (= 1.1.7)
-  - Flipper-Folly (= 2.5.3)
-  - Flipper-Glog (= 0.3.6)
-  - Flipper-PeerTalk (~> 0.0.4)
-  - Flipper-RSocket (= 1.3.1)
-  - FlipperKit (= 0.87.0)
-  - FlipperKit/Core (= 0.87.0)
-  - FlipperKit/CppBridge (= 0.87.0)
-  - FlipperKit/FBCxxFollyDynamicConvert (= 0.87.0)
-  - FlipperKit/FBDefines (= 0.87.0)
-  - FlipperKit/FKPortForwarding (= 0.87.0)
-  - FlipperKit/FlipperKitHighlightOverlay (= 0.87.0)
-  - FlipperKit/FlipperKitLayoutPlugin (= 0.87.0)
-  - FlipperKit/FlipperKitLayoutTextSearchable (= 0.87.0)
-  - FlipperKit/FlipperKitNetworkPlugin (= 0.87.0)
-  - FlipperKit/FlipperKitReactPlugin (= 0.87.0)
-  - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.87.0)
-  - FlipperKit/SKIOSNetworkPlugin (= 0.87.0)
-  - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
+  - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
  - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
  - JoplinCommonShareExtension (from `ShareExtension`)
  - JoplinRNShareExtension (from `ShareExtension`)
+  - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
  - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
  - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`)
  - React (from `../node_modules/react-native/`)
@@ -406,7 +345,6 @@ DEPENDENCIES:
  - react-native-camera (from `../node_modules/react-native-camera`)
  - react-native-document-picker (from `../node_modules/react-native-document-picker`)
  - "react-native-geolocation (from `../node_modules/@react-native-community/geolocation`)"
-  - react-native-get-random-values (from `../node_modules/react-native-get-random-values`)
  - react-native-image-picker (from `../node_modules/react-native-image-picker`)
  - react-native-image-resizer (from `../node_modules/react-native-image-resizer`)
  - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
@@ -414,6 +352,7 @@ DEPENDENCIES:
  - react-native-sqlite-storage (from `../node_modules/react-native-sqlite-storage`)
  - react-native-version-info (from `../node_modules/react-native-version-info`)
  - react-native-webview (from `../node_modules/react-native-webview`)
+  - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`)
  - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
  - React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`)
  - React-RCTBlob (from `../node_modules/react-native/Libraries/Blob`)
@@ -423,6 +362,7 @@ DEPENDENCIES:
  - React-RCTSettings (from `../node_modules/react-native/Libraries/Settings`)
  - React-RCTText (from `../node_modules/react-native/Libraries/Text`)
  - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`)
+  - React-runtimeexecutor (from `../node_modules/react-native/ReactCommon/runtimeexecutor`)
  - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
  - rn-fetch-blob (from `../node_modules/rn-fetch-blob`)
  - "RNCClipboard (from `../node_modules/@react-native-community/clipboard`)"
@@ -439,17 +379,6 @@ DEPENDENCIES:
 SPEC REPOS:
  trunk:
    - boost-for-react-native
-    - CocoaAsyncSocket
-    - Flipper
-    - Flipper-DoubleConversion
-    - Flipper-Folly
-    - Flipper-Glog
-    - Flipper-PeerTalk
-    - Flipper-RSocket
-    - FlipperKit
-    - libevent
-    - OpenSSL-Universal
-    - YogaKit

 EXTERNAL SOURCES:
  DoubleConversion:
@@ -457,15 +386,15 @@ EXTERNAL SOURCES:
  FBLazyVector:
    :path: "../node_modules/react-native/Libraries/FBLazyVector"
  FBReactNativeSpec:
-    :path: "../node_modules/react-native/Libraries/FBReactNativeSpec"
-  Folly:
-    :podspec: "../node_modules/react-native/third-party-podspecs/Folly.podspec"
+    :path: "../node_modules/react-native/React/FBReactNativeSpec"
  glog:
    :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec"
  JoplinCommonShareExtension:
    :path: ShareExtension
  JoplinRNShareExtension:
    :path: ShareExtension
+  RCT-Folly:
+    :podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec"
  RCTRequired:
    :path: "../node_modules/react-native/Libraries/RCTRequired"
  RCTTypeSafety:
@@ -494,8 +423,6 @@ EXTERNAL SOURCES:
    :path: "../node_modules/react-native-document-picker"
  react-native-geolocation:
    :path: "../node_modules/@react-native-community/geolocation"
-  react-native-get-random-values:
-    :path: "../node_modules/react-native-get-random-values"
  react-native-image-picker:
    :path: "../node_modules/react-native-image-picker"
  react-native-image-resizer:
@@ -510,6 +437,8 @@ EXTERNAL SOURCES:
    :path: "../node_modules/react-native-version-info"
  react-native-webview:
    :path: "../node_modules/react-native-webview"
+  React-perflogger:
+    :path: "../node_modules/react-native/ReactCommon/reactperflogger"
  React-RCTActionSheet:
    :path: "../node_modules/react-native/Libraries/ActionSheetIOS"
  React-RCTAnimation:
@@ -528,6 +457,8 @@ EXTERNAL SOURCES:
    :path: "../node_modules/react-native/Libraries/Text"
  React-RCTVibration:
    :path: "../node_modules/react-native/Libraries/Vibration"
+  React-runtimeexecutor:
+    :path: "../node_modules/react-native/ReactCommon/runtimeexecutor"
  ReactCommon:
    :path: "../node_modules/react-native/ReactCommon"
  rn-fetch-blob:
@@ -555,38 +486,27 @@ EXTERNAL SOURCES:

 SPEC CHECKSUMS:
  boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
-  CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
-  DoubleConversion: cde416483dac037923206447da6e1454df403714
-  FBLazyVector: 878b59e31113e289e275165efbe4b54fa614d43d
-  FBReactNativeSpec: 7da9338acfb98d4ef9e5536805a0704572d33c2f
-  Flipper: 1bd2db48dcc31e4b167b9a33ec1df01c2ded4893
-  Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
-  Flipper-Folly: 755929a4f851b2fb2c347d533a23f191b008554c
-  Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6
-  Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
-  Flipper-RSocket: 127954abe8b162fcaf68d2134d34dc2bd7076154
-  FlipperKit: 651f50a42eb95c01b3e89a60996dd6aded529eeb
-  Folly: b73c3869541e86821df3c387eb0af5f65addfab4
-  glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
+  DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
+  FBLazyVector: e686045572151edef46010a6f819ade377dfeb4b
+  FBReactNativeSpec: d2f54de51f69366bd1f5c1fb9270698dce678f8d
+  glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62
  JoplinCommonShareExtension: 270b4f8eb4e22828eeda433a04ed689fc1fd09b5
-  JoplinRNShareExtension: 89e042edc89e290bc88955fe3ac7f1aaea97cbc8
-  libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
-  OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
-  RCTRequired: 48884c74035a0b5b76dbb7a998bd93bcfc5f2047
-  RCTTypeSafety: edf4b618033c2f1c5b7bc3d90d8e085ed95ba2ab
-  React: f36e90f3ceb976546e97df3403e37d226f79d0e3
-  React-callinvoker: 18874f621eb96625df7a24a7dc8d6e07391affcd
-  React-Core: ac3d816b8e3493970153f4aaf0cff18af0bb95e6
-  React-CoreModules: 4016d3a4e518bcfc4f5a51252b5a05692ca6f0e1
-  React-cxxreact: ffc9129013b87cb36cf3f30a86695a3c397b0f99
-  React-jsi: df07aa95b39c5be3e41199921509bfa929ed2b9d
-  React-jsiexecutor: b56c03e61c0dd5f5801255f2160a815f4a53d451
-  React-jsinspector: 8e68ffbfe23880d3ee9bafa8be2777f60b25cbe2
+  JoplinRNShareExtension: 7137e9787374e1b0797ecbef9103d1588d90e403
+  RCT-Folly: ec7a233ccc97cc556cf7237f0db1ff65b986f27c
+  RCTRequired: 6d3e854f0e7260a648badd0d44fc364bc9da9728
+  RCTTypeSafety: c1f31d19349c6b53085766359caac425926fafaa
+  React: bda6b6d7ae912de97d7a61aa5c160db24aa2ad69
+  React-callinvoker: 9840ea7e8e88ed73d438edb725574820b29b5baa
+  React-Core: b5e385da7ce5f16a220fc60fd0749eae2c6120f0
+  React-CoreModules: 17071a4e2c5239b01585f4aa8070141168ab298f
+  React-cxxreact: 9be7b6340ed9f7c53e53deca7779f07cd66525ba
+  React-jsi: 67747b9722f6dab2ffe15b011bcf6b3f2c3f1427
+  React-jsiexecutor: 80c46bd381fd06e418e0d4f53672dc1d1945c4c3
+  React-jsinspector: cc614ec18a9ca96fd275100c16d74d62ee11f0ae
  react-native-alarm-notification: 466e4ad56fbd948ecac26e657f292dca8bf483d5
  react-native-camera: 5c1fbfecf63b802b8ca4a71c60d30a71550fb348
  react-native-document-picker: b3e78a8f7fef98b5cb069f20fc35797d55e68e28
  react-native-geolocation: cbd9d6bd06bac411eed2671810f454d4908484a8
-  react-native-get-random-values: 237bffb1c7e05fb142092681531810a29ba53015
  react-native-image-picker: 32d1ad2c0024ca36161ae0d5c2117e2d6c441f11
  react-native-image-resizer: b53bf95ad880100e20262687e41f76fdbc9df255
  react-native-netinfo: 34f4d7a42f49157f3b45c14217d256bce7dc9682
@@ -594,16 +514,18 @@ SPEC CHECKSUMS:
  react-native-sqlite-storage: ce71689c5a73b79390a1ab213555ae80979a5dc7
  react-native-version-info: 64f0f0bf3da6316298f9cd6085d50ba3a992d0c7
  react-native-webview: c51f73be304c61d359ec3e7c5e4e8f2c977fd360
-  React-RCTActionSheet: 53ea72699698b0b47a6421cb1c8b4ab215a774aa
-  React-RCTAnimation: 1befece0b5183c22ae01b966f5583f42e69a83c2
-  React-RCTBlob: 0b284339cbe4b15705a05e2313a51c6d8b51fa40
-  React-RCTImage: d1756599ebd4dc2cb19d1682fe67c6b976658387
-  React-RCTLinking: 9af0a51c6d6a4dd1674daadafffc6d03033a6d18
-  React-RCTNetwork: 332c83929cc5eae0b3bbca4add1d668e1fc18bda
-  React-RCTSettings: d6953772cfd55f2c68ad72b7ef29efc7ec49f773
-  React-RCTText: 65a6de06a7389098ce24340d1d3556015c38f746
-  React-RCTVibration: 8e9fb25724a0805107fc1acc9075e26f814df454
-  ReactCommon: 4167844018c9ed375cc01a843e9ee564399e53c3
+  React-perflogger: 25373e382fed75ce768a443822f07098a15ab737
+  React-RCTActionSheet: af7796ba49ffe4ca92e7277a5d992d37203f7da5
+  React-RCTAnimation: 6a2e76ab50c6f25b428d81b76a5a45351c4d77aa
+  React-RCTBlob: 02a2887023e0eed99391b6445b2e23a2a6f9226d
+  React-RCTImage: ce5bf8e7438f2286d9b646a05d6ab11f38b0323d
+  React-RCTLinking: ccd20742de14e020cb5f99d5c7e0bf0383aefbd9
+  React-RCTNetwork: dfb9d089ab0753e5e5f55fc4b1210858f7245647
+  React-RCTSettings: b14aef2d83699e48b410fb7c3ba5b66cd3291ae2
+  React-RCTText: 41a2e952dd9adc5caf6fb68ed46b275194d5da5f
+  React-RCTVibration: 24600e3b1aaa77126989bc58b6747509a1ba14f3
+  React-runtimeexecutor: a9904c6d0218fb9f8b19d6dd88607225927668f9
+  ReactCommon: 149906e01aa51142707a10665185db879898e966
  rn-fetch-blob: f065bb7ab7fb48dd002629f8bdcb0336602d3cba
  RNCClipboard: 8f9f12fabf3c06e976f19f87a62c89e28dfedfca
  RNCPushNotificationIOS: 20c4403b2ef8732297ea81e22f66c41bed7aaedf
@@ -614,9 +536,8 @@ SPEC CHECKSUMS:
  RNSecureRandom: 1f19ad1492f7ed416b8fc79e92216a1f73f13a4c
  RNShare: 9cdd23357981cf4dee275eb79239e860dccc0faf
  RNVectorIcons: bc69e6a278b14842063605de32bec61f0b251a59
-  Yoga: 7d13633d129fd179e01b8953d38d47be90db185a
-  YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
+  Yoga: 575c581c63e0d35c9a83f4b46d01d63abc1100ac

-PODFILE CHECKSUM: 69242fd72097f61a013d3163f74d28eb02847824
+PODFILE CHECKSUM: 6aeb91c381b1a03c0c8c78b2f504699bd569b7e3

 COCOAPODS: 1.10.1
--- a/packages/app-mobile/ios/ShareExtension/JoplinRNShareExtension.podspec
+++ b/packages/app-mobile/ios/ShareExtension/JoplinRNShareExtension.podspec
@@ -9,6 +9,6 @@ Pod::Spec.new do |spec|
  spec.platform     = :ios, "9.0"
  spec.source       = { :path => "." }
  spec.source_files = "Source/RNShareExtension/**/*.{h,m}"
-  spec.dependency     "React", "0.63.3"
+  spec.dependency     "React", "0.64.2"
  spec.dependency     "JoplinCommonShareExtension"
 end
--- a/packages/app-mobile/metro.config.js
+++ b/packages/app-mobile/metro.config.js
@@ -21,7 +21,7 @@ module.exports = {
 		getTransformOptions: async () => ({
 			transform: {
 				experimentalImportSupport: false,
-				inlineRequires: false,
+				inlineRequires: true,
 			},
 		}),
 	},
--- a/packages/app-mobile/package-lock.json
+++ b/packages/app-mobile/package-lock.json
--- a/packages/app-mobile/package.json
+++ b/packages/app-mobile/package.json
@@ -30,8 +30,8 @@
    "md5": "^2.2.1",
    "prop-types": "^15.6.0",
    "punycode": "^2.1.1",
-    "react": "16.13.1",
-    "react-native": "0.63.3",
+    "react": "17.0.1",
+    "react-native": "0.64.2",
    "react-native-action-button": "^2.8.5",
    "react-native-camera": "^3.40.0",
    "react-native-dialogbox": "^0.6.10",
@@ -39,7 +39,6 @@
    "react-native-dropdownalert": "^3.1.2",
    "react-native-file-viewer": "^2.1.4",
    "react-native-fs": "^2.16.6",
-    "react-native-get-random-values": "^1.7.0",
    "react-native-image-picker": "^2.3.4",
    "react-native-image-resizer": "^1.3.0",
    "react-native-modal-datetime-picker": "^9.0.0",
@@ -50,7 +49,6 @@
    "react-native-share": "^5.1.5",
    "react-native-side-menu": "^1.1.3",
    "react-native-sqlite-storage": "^5.0.0",
-    "react-native-url-polyfill": "^1.3.0",
    "react-native-vector-icons": "^7.1.0",
    "react-native-version-info": "^1.1.0",
    "react-native-webview": "^10.9.2",
@@ -61,12 +59,11 @@
    "stream-browserify": "^3.0.0",
    "string-natural-compare": "^2.0.2",
    "timers": "^0.1.1",
-    "url": "^0.11.0",
    "valid-url": "^1.0.9"
  },
  "devDependencies": {
-    "@babel/core": "^7.11.6",
-    "@babel/runtime": "^7.11.2",
+    "@babel/core": "^7.12.9",
+    "@babel/runtime": "^7.12.5",
    "@codemirror/highlight": "^0.18.4",
    "@codemirror/history": "^0.18.1",
    "@codemirror/lang-markdown": "^0.18.4",
@@ -82,7 +79,7 @@
    "fs-extra": "^8.1.0",
    "gulp": "^4.0.2",
    "jetifier": "^1.6.5",
-    "metro-react-native-babel-preset": "^0.63.0",
+    "metro-react-native-babel-preset": "^0.64.0",
    "nodemon": "^2.0.12",
    "rollup": "^2.53.1",
    "typescript": "^4.0.5",
--- a/packages/app-mobile/utils/fs-driver-rn.ts
+++ b/packages/app-mobile/utils/fs-driver-rn.ts
@@ -1,6 +1,8 @@
 import FsDriverBase from '@joplin/lib/fs-driver-base';
 const RNFetchBlob = require('rn-fetch-blob').default;
 const RNFS = require('react-native-fs');
+const { Writable } = require('stream-browserify');
+const { Buffer } = require('buffer');

 export default class FsDriverRN extends FsDriverBase {
 	public appendFileSync() {
@@ -24,6 +26,27 @@ export default class FsDriverRN extends FsDriverBase {
 		return await this.unlink(path);
 	}

+	public writeBinaryFile(path: string, content: any) {
+		const buffer = Buffer.from(content);
+		return RNFetchBlob.fs.writeStream(path, 'base64').then((stream: any) => {
+			const fileStream = new Writable({
+				write(chunk: any, _encoding: any, callback: Function) {
+					this.stream.write(chunk.toString('base64'));
+					callback();
+				},
+				final(callback: Function) {
+					this.stream.close();
+					callback();
+				},
+			});
+			// using options.construct is not implemented in readable-stream so lets
+			// pass the stream from RNFetchBlob to the Writable instance here
+			fileStream.stream = stream;
+			fileStream.write(buffer);
+			fileStream.end();
+		});
+	}
+
 	// Returns a format compatible with Node.js format
 	private rnfsStatToStd_(stat: any, path: string) {
 		return {
--- a/packages/fork-htmlparser2/package-lock.json
+++ b/packages/fork-htmlparser2/package-lock.json
@@ -1,6 +1,6 @@
 {
    "name": "@joplin/fork-htmlparser2",
-    "version": "4.1.30",
+    "version": "4.1.32",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
--- a/packages/fork-htmlparser2/package.json
+++ b/packages/fork-htmlparser2/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@joplin/fork-htmlparser2",
  "description": "Fast & forgiving HTML/XML/RSS parser",
-  "version": "4.1.30",
+  "version": "4.1.32",
  "author": "Felix Boehm <me@feedic.com>",
  "publishConfig": {
    "access": "public"
--- a/packages/fork-sax/package-lock.json
+++ b/packages/fork-sax/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "@joplin/fork-sax",
-  "version": "1.2.34",
+  "version": "1.2.36",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/packages/fork-sax/package.json
+++ b/packages/fork-sax/package.json
@@ -2,7 +2,7 @@
  "name": "@joplin/fork-sax",
  "description": "An evented streaming XML parser in JavaScript",
  "author": "Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me/)",
-  "version": "1.2.34",
+  "version": "1.2.36",
  "main": "lib/sax.js",
  "publishConfig": {
    "access": "public"
--- a/packages/generator-joplin/package.json
+++ b/packages/generator-joplin/package.json
@@ -34,4 +34,4 @@
  "repository": "https://github.com/laurent22/generator-joplin",
  "license": "MIT",
  "private": true
-}
+}
--- a/packages/lib/BaseApplication.ts
+++ b/packages/lib/BaseApplication.ts
@@ -4,6 +4,7 @@ import shim from './shim';
 import BaseService from './services/BaseService';
 import reducer, { setStore } from './reducer';
 import KeychainServiceDriver from './services/keychain/KeychainServiceDriver.node';
+import KeychainServiceDriverDummy from './services/keychain/KeychainServiceDriver.dummy';
 import { _, setLocale } from './locale';
 import KvStore from './services/KvStore';
 import SyncTargetJoplinServer from './SyncTargetJoplinServer';
@@ -55,6 +56,10 @@ const appLogger: LoggerWrapper = Logger.create('App');
 // const ntpClient = require('./vendor/ntp-client');
 // ntpClient.dgram = require('dgram');

+interface StartOptions {
+	keychainEnabled?: boolean;
+}
+
 export default class BaseApplication {

 	private eventEmitter_: any;
@@ -655,7 +660,12 @@ export default class BaseApplication {
 		return toSystemSlashes(output, 'linux');
 	}

-	async start(argv: string[]): Promise<any> {
+	async start(argv: string[], options: StartOptions = null): Promise<any> {
+		options = {
+			keychainEnabled: true,
+			...options,
+		};
+
 		const startFlags = await this.handleStartFlags_(argv);

 		argv = startFlags.argv;
@@ -744,7 +754,7 @@ export default class BaseApplication {
 		reg.setDb(this.database_);
 		BaseModel.setDb(this.database_);

-		await loadKeychainServiceAndSettings(KeychainServiceDriver);
+		await loadKeychainServiceAndSettings(options.keychainEnabled ? KeychainServiceDriver : KeychainServiceDriverDummy);
 		await handleSyncStartupOperation();

 		appLogger.info(`Client ID: ${Setting.value('clientId')}`);
--- a/packages/lib/SyncTargetAmazonS3.js
+++ b/packages/lib/SyncTargetAmazonS3.js
@@ -4,7 +4,7 @@ const Setting = require('./models/Setting').default;
 const { FileApi } = require('./file-api.js');
 const Synchronizer = require('./Synchronizer').default;
 const { FileApiDriverAmazonS3 } = require('./file-api-driver-amazon-s3.js');
-const { S3Client, HeadBucketCommand } = require('@aws-sdk/client-s3');
+const S3 = require('aws-sdk/clients/s3');

 class SyncTargetAmazonS3 extends BaseSyncTarget {
 	static id() {
@@ -38,14 +38,10 @@ class SyncTargetAmazonS3 extends BaseSyncTarget {

 	s3AuthParameters() {
 		return {
-			// We need to set a region. See https://github.com/aws/aws-sdk-js-v3/issues/1845#issuecomment-754832210
-			region: 'us-east-1',
-			credentials: {
-				accessKeyId: Setting.value('sync.8.username'),
-				secretAccessKey: Setting.value('sync.8.password'),
-			},
-			UseArnRegion: true, // override the request region with the region inferred from requested resource's ARN
-			forcePathStyle: true,
+			accessKeyId: Setting.value('sync.8.username'),
+			secretAccessKey: Setting.value('sync.8.password'),
+			s3UseArnRegion: true, // override the request region with the region inferred from requested resource's ARN
+			s3ForcePathStyle: true,
 			endpoint: Setting.value('sync.8.url'),
 		};
 	}
@@ -53,31 +49,20 @@ class SyncTargetAmazonS3 extends BaseSyncTarget {
 	api() {
 		if (this.api_) return this.api_;

-		this.api_ = new S3Client(this.s3AuthParameters());
-
-		// There is a bug with auto skew correction in aws-sdk-js-v3
-		// and this attempts to remove the skew correction for all calls.
-		// There are some additional spots in the app where we reset this
-		// to zero as well as it appears the skew logic gets triggered
-		// which makes "RequestTimeTooSkewed" errors...
-		// See https://github.com/aws/aws-sdk-js-v3/issues/2208
-		this.api_.config.systemClockOffset = 0;
+		this.api_ = new S3(this.s3AuthParameters());
 		return this.api_;
 	}

 	static async newFileApi_(syncTargetId, options) {
 		const apiOptions = {
-			region: 'us-east-1',
-			credentials: {
-				accessKeyId: options.username(),
-				secretAccessKey: options.password(),
-			},
-			UseArnRegion: true, // override the request region with the region inferred from requested resource's ARN
-			forcePathStyle: true,
+			accessKeyId: options.username(),
+			secretAccessKey: options.password(),
+			s3UseArnRegion: true,
+			s3ForcePathStyle: true,
 			endpoint: options.url(),
 		};

-		const api = new S3Client(apiOptions);
+		const api = new S3(apiOptions);
 		const driver = new FileApiDriverAmazonS3(api, SyncTargetAmazonS3.s3BucketName());
 		const fileApi = new FileApi('', driver);
 		fileApi.setSyncTargetId(syncTargetId);
@@ -95,14 +80,12 @@ class SyncTargetAmazonS3 extends BaseSyncTarget {

 		try {
 			const headBucketReq = new Promise((resolve, reject) => {
-				fileApi.driver().api().send(
-
-					new HeadBucketCommand({
-						Bucket: options.path(),
-					}),(err, response) => {
-						if (err) reject(err);
-						else resolve(response);
-					});
+				fileApi.driver().api().headBucket({
+					Bucket: options.path(),
+				},(err, response) => {
+					if (err) reject(err);
+					else resolve(response);
+				});
 			});
 			const result = await headBucketReq;
 			if (!result) throw new Error(`AWS S3 bucket not found: ${SyncTargetAmazonS3.s3BucketName()}`);
--- a/packages/lib/components/shared/config-shared.js
+++ b/packages/lib/components/shared/config-shared.js
@@ -85,6 +85,7 @@ shared.saveSettings = function(comp) {
 	for (const key in comp.state.settings) {
 		if (!comp.state.settings.hasOwnProperty(key)) continue;
 		if (comp.state.changedSettingKeys.indexOf(key) < 0) continue;
+		console.info('Saving', key, comp.state.settings[key]);
 		Setting.setValue(key, comp.state.settings[key]);
 	}

--- a/packages/lib/file-api-driver-amazon-s3.js
+++ b/packages/lib/file-api-driver-amazon-s3.js
@@ -3,8 +3,6 @@ const { basename } = require('./path-utils');
 const shim = require('./shim').default;
 const JoplinError = require('./JoplinError').default;
 const { Buffer } = require('buffer');
-const { GetObjectCommand, ListObjectsV2Command, HeadObjectCommand, PutObjectCommand, DeleteObjectCommand, DeleteObjectsCommand, CopyObjectCommand } = require('@aws-sdk/client-s3');
-const { getSignedUrl } = require('@aws-sdk/s3-request-presigner');

 const S3_MAX_DELETES = 1000;

@@ -28,33 +26,31 @@ class FileApiDriverAmazonS3 {
 	}

 	hasErrorCode_(error, errorCode) {
-		if (!error || typeof error.name !== 'string') return false;
-		return error.name.indexOf(errorCode) >= 0;
+		if (!error || typeof error.code !== 'string') return false;
+		return error.code.indexOf(errorCode) >= 0;
 	}

-	// Because of the way AWS-SDK-v3 works for getting data from a bucket we will
-	// use a pre-signed URL to avoid https://github.com/aws/aws-sdk-js-v3/issues/1877
-	async s3GenerateGetURL(key) {
-		const signedUrl = await getSignedUrl(this.api(), new GetObjectCommand({
-			Bucket: this.s3_bucket_,
-			Key: key,
-		}), {
-			expiresIn: 3600,
-		});
-		return signedUrl;
-	}
-
-	// We've now moved to aws-sdk-v3 and this note is outdated, but explains the promise structure.
 	// Need to make a custom promise, built-in promise is broken: https://github.com/aws/aws-sdk-js/issues/1436
-	// TODO: Re-factor to https://github.com/aws/aws-sdk-js-v3/tree/main/clients/client-s3#asyncawait
+	async s3GetObject(key) {
+		return new Promise((resolve, reject) => {
+			this.api().getObject({
+				Bucket: this.s3_bucket_,
+				Key: key,
+			}, (err, response) => {
+				if (err) reject(err);
+				else resolve(response);
+			});
+		});
+	}
+
 	async s3ListObjects(key, cursor) {
 		return new Promise((resolve, reject) => {
-			this.api().send(new ListObjectsV2Command({
+			this.api().listObjectsV2({
 				Bucket: this.s3_bucket_,
 				Prefix: key,
 				Delimiter: '/',
 				ContinuationToken: cursor,
-			}), (err, response) => {
+			}, (err, response) => {
 				if (err) reject(err);
 				else resolve(response);
 			});
@@ -63,10 +59,10 @@ class FileApiDriverAmazonS3 {

 	async s3HeadObject(key) {
 		return new Promise((resolve, reject) => {
-			this.api().send(new HeadObjectCommand({
+			this.api().headObject({
 				Bucket: this.s3_bucket_,
 				Key: key,
-			}), (err, response) => {
+			}, (err, response) => {
 				if (err) reject(err);
 				else resolve(response);
 			});
@@ -75,11 +71,11 @@ class FileApiDriverAmazonS3 {

 	async s3PutObject(key, body) {
 		return new Promise((resolve, reject) => {
-			this.api().send(new PutObjectCommand({
+			this.api().putObject({
 				Bucket: this.s3_bucket_,
 				Key: key,
 				Body: body,
-			}), (err, response) => {
+			}, (err, response) => {
 				if (err) reject(err);
 				else resolve(response);
 			});
@@ -91,12 +87,12 @@ class FileApiDriverAmazonS3 {
 		const body = await shim.fsDriver().readFile(path, 'base64');
 		const fileStat = await shim.fsDriver().stat(path);
 		return new Promise((resolve, reject) => {
-			this.api().send(new PutObjectCommand({
+			this.api().putObject({
 				Bucket: this.s3_bucket_,
 				Key: key,
 				Body: Buffer.from(body, 'base64'),
 				ContentLength: `${fileStat.size}`,
-			}), (err, response) => {
+			}, (err, response) => {
 				if (err) reject(err);
 				else resolve(response);
 			});
@@ -105,10 +101,10 @@ class FileApiDriverAmazonS3 {

 	async s3DeleteObject(key) {
 		return new Promise((resolve, reject) => {
-			this.api().send(new DeleteObjectCommand({
+			this.api().deleteObject({
 				Bucket: this.s3_bucket_,
 				Key: key,
-			}),
+			},
 			(err, response) => {
 				if (err) {
 					console.log(err.code);
@@ -122,10 +118,10 @@ class FileApiDriverAmazonS3 {
 	// Assumes key is formatted, like `{Key: 's3 path'}`
 	async s3DeleteObjects(keys) {
 		return new Promise((resolve, reject) => {
-			this.api().send(new DeleteObjectsCommand({
+			this.api().deleteObjects({
 				Bucket: this.s3_bucket_,
 				Delete: { Objects: keys },
-			}),
+			},
 			(err, response) => {
 				if (err) {
 					console.log(err.code);
@@ -192,20 +188,8 @@ class FileApiDriverAmazonS3 {
 			prefixPath = `${prefixPath}/`;
 		}

-		// There is a bug/quirk of aws-sdk-js-v3 which causes the
-		// S3Client systemClockOffset to be wildly inaccurate. This
-		// effectively removes the offset and sets it to system time.
-		// See https://github.com/aws/aws-sdk-js-v3/issues/2208 for more.
-		// If the user's time actaully off, then this should correctly
-		// result in a RequestTimeTooSkewed error from s3ListObjects.
-		this.api().config.systemClockOffset = 0;
-
 		let response = await this.s3ListObjects(prefixPath);

-		// In aws-sdk-js-v3 if there are no contents it no longer returns
-		// an empty array. This creates an Empty array to pass onward.
-		if (response.Contents === undefined) response.Contents = [];
-
 		let output = this.metadataToStats_(response.Contents, prefixPath);

 		while (response.IsTruncated) {
@@ -228,17 +212,31 @@ class FileApiDriverAmazonS3 {

 		try {
 			let output = null;
-			let response = null;
-
-			const s3Url = await this.s3GenerateGetURL(remotePath);
+			const response = await this.s3GetObject(remotePath);
+			output = response.Body;

 			if (options.target === 'file') {
-				output = await shim.fetchBlob(s3Url, options);
+				const filePath = options.path;
+				if (!filePath) throw new Error('get: target options.path is missing');
+
+				// TODO: check if this ever hits on RN
+				await shim.fsDriver().writeBinaryFile(filePath, output);
+				return {
+					ok: true,
+					path: filePath,
+					text: () => {
+						return response.statusMessage;
+					},
+					json: () => {
+						return { message: `${response.statusCode}: ${response.statusMessage}` };
+					},
+					status: response.statusCode,
+					headers: response.headers,
+				};
 			}

 			if (responseFormat === 'text') {
-				response = await shim.fetch(s3Url, options);
-				output = await response.text();
+				output = output.toString();
 			}

 			return output;
@@ -312,11 +310,11 @@ class FileApiDriverAmazonS3 {

 	async move(oldPath, newPath) {
 		const req = new Promise((resolve, reject) => {
-			this.api().send(new CopyObjectCommand({
+			this.api().copyObject({
 				Bucket: this.s3_bucket_,
 				CopySource: this.makePath_(oldPath),
 				Key: newPath,
-			}),(err, response) => {
+			},(err, response) => {
 				if (err) reject(err);
 				else resolve(response);
 			});
@@ -342,10 +340,10 @@ class FileApiDriverAmazonS3 {
 	async clearRoot() {
 		const listRecursive = async (cursor) => {
 			return new Promise((resolve, reject) => {
-				return this.api().send(new ListObjectsV2Command({
+				return this.api().listObjectsV2({
 					Bucket: this.s3_bucket_,
 					ContinuationToken: cursor,
-				}), (err, response) => {
+				}, (err, response) => {
 					if (err) reject(err);
 					else resolve(response);
 				});
@@ -353,9 +351,6 @@ class FileApiDriverAmazonS3 {
 		};

 		let response = await listRecursive();
-		// In aws-sdk-js-v3 if there are no contents it no longer returns
-		// an empty array. This creates an Empty array to pass onward.
-		if (response.Contents === undefined) response.Contents = [];
 		let keys = response.Contents.map((content) => content.Key);

 		while (response.IsTruncated) {
--- a/packages/lib/fs-driver-dummy.js
+++ b/packages/lib/fs-driver-dummy.js
@@ -1,6 +1,7 @@
 class FsDriverDummy {
 	constructor() {}
 	appendFileSync() {}
+	writeBinaryFile() {}
 	readFile() {}
 }

--- a/packages/lib/fs-driver-node.ts
+++ b/packages/lib/fs-driver-node.ts
@@ -26,6 +26,16 @@ export default class FsDriverNode extends FsDriverBase {
 		}
 	}

+	public async writeBinaryFile(path: string, content: any) {
+		try {
+			// let buffer = new Buffer(content);
+			const buffer = Buffer.from(content);
+			return await fs.writeFile(path, buffer);
+		} catch (error) {
+			throw this.fsErrorToJsError_(error, path);
+		}
+	}
+
 	public async writeFile(path: string, string: string, encoding: string = 'base64') {
 		try {
 			if (encoding === 'buffer') {
--- a/packages/lib/models/Resource.ts
+++ b/packages/lib/models/Resource.ts
@@ -245,6 +245,10 @@ export default class Resource extends BaseItem {
 		return this.fsDriver().readFile(this.fullPath(resource), 'Buffer');
 	}

+	static setContent(resource: ResourceEntity, content: any) {
+		return this.fsDriver().writeBinaryFile(this.fullPath(resource), content);
+	}
+
 	static isResourceUrl(url: string) {
 		return url && url.length === 34 && url[0] === ':' && url[1] === '/';
 	}
--- a/packages/lib/package-lock.json
+++ b/packages/lib/package-lock.json
--- a/packages/lib/package.json
+++ b/packages/lib/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@joplin/lib",
-  "version": "2.2.2",
+  "version": "2.2.4",
  "description": "Joplin Core library",
  "author": "Laurent Cozic",
  "homepage": "",
@@ -25,14 +25,13 @@
    "typescript": "^4.0.5"
  },
  "dependencies": {
-    "@aws-sdk/client-s3": "^3.22.0",
-    "@aws-sdk/s3-request-presigner": "^3.23.0",
-    "@joplin/fork-htmlparser2": "^4.1.30",
-    "@joplin/fork-sax": "^1.2.34",
-    "@joplin/renderer": "^1.8.2",
-    "@joplin/turndown": "^4.0.52",
-    "@joplin/turndown-plugin-gfm": "^1.0.34",
+    "@joplin/fork-htmlparser2": "^4.1.32",
+    "@joplin/fork-sax": "^1.2.36",
+    "@joplin/renderer": "^2.2.4",
+    "@joplin/turndown": "^4.0.54",
+    "@joplin/turndown-plugin-gfm": "^1.0.36",
    "async-mutex": "^0.1.3",
+    "aws-sdk": "^2.588.0",
    "base-64": "^0.1.0",
    "base64-stream": "^1.0.0",
    "builtin-modules": "^3.1.0",
--- a/packages/lib/services/plugins/WebviewController.ts
+++ b/packages/lib/services/plugins/WebviewController.ts
@@ -58,7 +58,6 @@ export default class WebviewController extends ViewController {
 				scripts: [],
 				opened: false,
 				buttons: null,
-				fitToContent: true,
 			},
 		});
 	}
@@ -174,11 +173,4 @@ export default class WebviewController extends ViewController {
 		this.setStoreProp('buttons', buttons);
 	}

-	public get fitToContent(): boolean {
-		return this.storeView.fitToContent;
-	}
-
-	public set fitToContent(fitToContent: boolean) {
-		this.setStoreProp('fitToContent', fitToContent);
-	}
 }
--- a/packages/lib/services/plugins/api/JoplinViewsDialogs.ts
+++ b/packages/lib/services/plugins/api/JoplinViewsDialogs.ts
@@ -98,13 +98,4 @@ export default class JoplinViewsDialogs {
 		return this.controller(handle).open();
 	}

-	/**
-	 * Toggle on whether to fit the dialog size to the content or not.
-	 * When set to false, the dialog stretches to fill the application
-	 * window.
-	 * @default true
-	 */
-	public async setFitToContent(handle: ViewHandle, status: boolean) {
-		return this.controller(handle).fitToContent = status;
-	}
 }
--- a/packages/lib/testing/test-utils.ts
+++ b/packages/lib/testing/test-utils.ts
@@ -55,7 +55,7 @@ import SyncTargetJoplinCloud from '../SyncTargetJoplinCloud';
 import KeychainService from '../services/keychain/KeychainService';
 import { loadKeychainServiceAndSettings } from '../services/SettingUtils';
 const md5 = require('md5');
-const { S3Client } = require('@aws-sdk/client-s3');
+const S3 = require('aws-sdk/clients/s3');
 const { Dirnames } = require('../services/synchronizer/utils/types');

 // Each suite has its own separate data and temp directory so that multiple
@@ -569,16 +569,10 @@ async function initFileApi() {
 		const appDir = await api.appDirectory();
 		fileApi = new FileApi(appDir, new FileApiDriverOneDrive(api));
 	} else if (syncTargetId_ == SyncTargetRegistry.nameToId('amazon_s3')) {
-
-		// We make sure for S3 tests run in band because tests
-		// share the same directory which will cause locking errors.
-
-		mustRunInBand();
-
 		const amazonS3CredsPath = `${oldTestDir}/support/amazon-s3-auth.json`;
 		const amazonS3Creds = require(amazonS3CredsPath);
 		if (!amazonS3Creds || !amazonS3Creds.accessKeyId) throw new Error(`AWS auth JSON missing in ${amazonS3CredsPath} format should be: { "accessKeyId": "", "secretAccessKey": "", "bucket": "mybucket"}`);
-		const api = new S3Client({ region: 'us-east-1', accessKeyId: amazonS3Creds.accessKeyId, secretAccessKey: amazonS3Creds.secretAccessKey, s3UseArnRegion: true });
+		const api = new S3({ accessKeyId: amazonS3Creds.accessKeyId, secretAccessKey: amazonS3Creds.secretAccessKey, s3UseArnRegion: true });
 		fileApi = new FileApi('', new FileApiDriverAmazonS3(api, amazonS3Creds.bucket));
 	} else if (syncTargetId_ == SyncTargetRegistry.nameToId('joplinServer')) {
 		mustRunInBand();
--- a/packages/plugin-repo-cli/package-lock.json
+++ b/packages/plugin-repo-cli/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "@joplin/plugin-repo-cli",
-	"version": "2.2.2",
+	"version": "2.2.4",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
--- a/packages/plugin-repo-cli/package.json
+++ b/packages/plugin-repo-cli/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@joplin/plugin-repo-cli",
-  "version": "2.2.2",
+  "version": "2.2.4",
  "description": "",
  "main": "index.js",
  "bin": {
@@ -18,8 +18,8 @@
  "author": "",
  "license": "MIT",
  "dependencies": {
-    "@joplin/lib": "^1.8.2",
-    "@joplin/tools": "^1.8.2",
+    "@joplin/lib": "^2.2.4",
+    "@joplin/tools": "^2.2.4",
    "fs-extra": "^9.0.1",
    "gh-release-assets": "^2.0.0",
    "node-fetch": "^2.6.1",
--- a/packages/renderer/package-lock.json
+++ b/packages/renderer/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "@joplin/renderer",
-  "version": "2.2.2",
+  "version": "2.2.4",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/packages/renderer/package.json
+++ b/packages/renderer/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@joplin/renderer",
-  "version": "2.2.2",
+  "version": "2.2.4",
  "description": "The Joplin note renderer, used the mobile and desktop application",
  "repository": "https://github.com/laurent22/joplin/tree/dev/packages/renderer",
  "main": "index.js",
@@ -24,7 +24,7 @@
    "typescript": "^4.0.5"
  },
  "dependencies": {
-    "@joplin/fork-htmlparser2": "^4.1.30",
+    "@joplin/fork-htmlparser2": "^4.1.32",
    "font-awesome-filetypes": "^2.1.0",
    "fs-extra": "^8.1.0",
    "highlight.js": "^10.2.1",
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -18,8 +18,8 @@
  },
  "dependencies": {
    "@fortawesome/fontawesome-free": "^5.15.1",
-    "@joplin/lib": "^1.0.9",
-    "@joplin/renderer": "^1.7.4",
+    "@joplin/lib": "~2.2",
+    "@joplin/renderer": "~2.2",
    "@koa/cors": "^3.1.0",
    "bcryptjs": "^2.4.3",
    "bulma": "^0.9.1",
@@ -49,7 +49,7 @@
    "zxcvbn": "^4.4.2"
  },
  "devDependencies": {
-    "@joplin/tools": "^1.0.9",
+    "@joplin/tools": "~2.2",
    "@rmp135/sql-ts": "^1.7.0",
    "@types/fs-extra": "^8.0.0",
    "@types/jest": "^26.0.15",
--- a/packages/server/src/migrations/20210809222118_email_key_fix.ts
+++ b/packages/server/src/migrations/20210809222118_email_key_fix.ts
@@ -0,0 +1,12 @@
+import { Knex } from 'knex';
+import { DbConnection } from '../db';
+
+export async function up(db: DbConnection): Promise<any> {
+	await db.schema.alterTable('emails', function(table: Knex.CreateTableBuilder) {
+		table.dropUnique(['recipient_email', 'key']);
+	});
+}
+
+export async function down(_db: DbConnection): Promise<any> {
+
+}
--- a/packages/tools/package-lock.json
+++ b/packages/tools/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "@joplin/tools",
-  "version": "2.2.2",
+  "version": "2.2.4",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/packages/tools/package.json
+++ b/packages/tools/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@joplin/tools",
-  "version": "2.2.2",
+  "version": "2.2.4",
  "description": "Various tools for Joplin",
  "main": "index.js",
  "author": "Laurent Cozic",
@@ -18,7 +18,7 @@
  },
  "license": "MIT",
  "dependencies": {
-    "@joplin/lib": "^1.8.2",
+    "@joplin/lib": "^2.2.4",
    "execa": "^4.1.0",
    "fs-extra": "^4.0.3",
    "gettext-parser": "^1.3.0",
--- a/packages/tools/setupNewRelease.js
+++ b/packages/tools/setupNewRelease.js
@@ -1,98 +0,0 @@
-const fs = require('fs-extra');
-const path = require('path');
-
-const rootDir = path.dirname(path.dirname(__dirname));
-
-async function updatePackageVersion(packageFilePath, majorMinorVersion) {
-	const contentText = await fs.readFile(packageFilePath, 'utf8');
-	const content = JSON.parse(contentText);
-
-	if (content.version.indexOf(majorMinorVersion) === 0) return;
-
-	content.version = `${majorMinorVersion}.0`;
-	await fs.writeFile(packageFilePath, `${JSON.stringify(content, null, 2)}\n`, 'utf8');
-}
-
-async function updateGradleVersion(filePath, majorMinorVersion) {
-	const contentText = await fs.readFile(filePath, 'utf8');
-
-	const newContent = contentText.replace(/(versionName\s+")(\d+?\.\d+?)(\.\d+")/, function(match, prefix, version, suffix) {
-		if (version === majorMinorVersion) return prefix + version + suffix;
-		return `${prefix + majorMinorVersion}.0"`;
-	});
-
-	if (newContent === contentText) return;
-
-	await fs.writeFile(filePath, newContent, 'utf8');
-}
-
-async function updateCodeProjVersion(filePath, majorMinorVersion) {
-	const contentText = await fs.readFile(filePath, 'utf8');
-
-	// MARKETING_VERSION = 10.1.0;
-	const newContent = contentText.replace(/(MARKETING_VERSION = )(\d+\.\d+)(\.\d+;)/g, function(match, prefix, version, suffix) {
-		if (version === majorMinorVersion) return prefix + version + suffix;
-		return `${prefix + majorMinorVersion}.0;`;
-	});
-
-	if (newContent === contentText) return;
-
-	await fs.writeFile(filePath, newContent, 'utf8');
-}
-
-async function updateClipperManifestVersion(manifestPath, majorMinorVersion) {
-	const manifestText = await fs.readFile(manifestPath, 'utf8');
-	const manifest = JSON.parse(manifestText);
-	const versionText = manifest.version;
-
-	if (versionText.indexOf(majorMinorVersion) === 0) return;
-
-	manifest.version = `${majorMinorVersion}.0`;
-	await fs.writeFile(manifestPath, JSON.stringify(manifest, null, 4));
-}
-
-async function updatePluginGeneratorTemplateVersion(manifestPath, majorMinorVersion) {
-	const manifestText = await fs.readFile(manifestPath, 'utf8');
-	const manifest = JSON.parse(manifestText);
-	manifest.app_min_version = majorMinorVersion;
-	await fs.writeFile(manifestPath, JSON.stringify(manifest, null, '\t'));
-}
-
-// Need this hack to transform x.y.z into 1x.y.z due to some mistake
-// on one of the release and the App Store won't allow decreasing
-// the major version number.
-function iosVersionHack(majorMinorVersion) {
-	const p = majorMinorVersion.split('.');
-	p[0] = `1${p[0]}`;
-	return p.join('.');
-}
-
-async function main() {
-	const argv = require('yargs').parserConfiguration({
-		'parse-numbers': false,
-	}).argv;
-
-	if (!argv._ || !argv._.length) throw new Error('Please specify the major.minor version, eg. 1.2');
-
-	const majorMinorVersion = argv._[0];
-
-	await updatePackageVersion(`${rootDir}/packages/app-desktop/package.json`, majorMinorVersion);
-	await updatePackageVersion(`${rootDir}/packages/app-cli/package.json`, majorMinorVersion);
-	await updatePackageVersion(`${rootDir}/packages/generator-joplin/package.json`, majorMinorVersion);
-	await updatePackageVersion(`${rootDir}/packages/server/package.json`, majorMinorVersion);
-	await updatePackageVersion(`${rootDir}/packages/plugin-repo-cli/package.json`, majorMinorVersion);
-	await updatePackageVersion(`${rootDir}/packages/lib/package.json`, majorMinorVersion);
-	await updatePackageVersion(`${rootDir}/packages/renderer/package.json`, majorMinorVersion);
-	await updatePackageVersion(`${rootDir}/packages/tools/package.json`, majorMinorVersion);
-	await updateGradleVersion(`${rootDir}/packages/app-mobile/android/app/build.gradle`, majorMinorVersion);
-	await updateCodeProjVersion(`${rootDir}/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj`, iosVersionHack(majorMinorVersion));
-	await updateClipperManifestVersion(`${rootDir}/packages/app-clipper/manifest.json`, majorMinorVersion);
-	await updatePluginGeneratorTemplateVersion(`${rootDir}/packages/generator-joplin/generators/app/templates/src/manifest.json`, majorMinorVersion);
-
-	console.info('Version numbers have been updated. Consider running `npm i` to update the lock files');
-}
-
-main().catch((error) => {
-	console.error('Fatal error:', error);
-	process.exit(1);
-});
--- a/packages/tools/setupNewRelease.ts
+++ b/packages/tools/setupNewRelease.ts
@@ -0,0 +1,143 @@
+import * as fs from 'fs-extra';
+import * as path from 'path';
+
+const rootDir = path.dirname(path.dirname(__dirname));
+
+interface Options {
+	updateVersion: boolean;
+	updateDependenciesVersion: boolean;
+}
+
+interface PackageJson {
+	version: string;
+	dependencies: Record<string, string>;
+	devDependencies: Record<string, string>;
+}
+
+function isJoplinPackage(name: string): boolean {
+	if (!name.startsWith('@joplin/')) return false;
+	if (['@joplin/turndown', '@joplin/turndown-plugin-gfm'].includes(name)) return false;
+	return !name.startsWith('@joplin/fork-');
+}
+
+async function updatePackageVersion(packageFilePath: string, majorMinorVersion: string, options: Options) {
+	const contentText = await fs.readFile(packageFilePath, 'utf8');
+	const content: PackageJson = JSON.parse(contentText);
+
+	if (options.updateVersion) {
+		// If it's not already set
+		if (content.version.indexOf(majorMinorVersion) !== 0) {
+			content.version = `${majorMinorVersion}.0`;
+		}
+	}
+
+	if (options.updateDependenciesVersion) {
+		for (const [name] of Object.entries(content.dependencies)) {
+			if (isJoplinPackage(name)) {
+				content.dependencies[name] = `~${majorMinorVersion}`;
+			}
+		}
+
+		for (const [name] of Object.entries(content.devDependencies)) {
+			if (isJoplinPackage(name)) {
+				content.devDependencies[name] = `~${majorMinorVersion}`;
+			}
+		}
+	}
+
+	await fs.writeFile(packageFilePath, `${JSON.stringify(content, null, 2)}\n`, 'utf8');
+}
+
+async function updateGradleVersion(filePath: string, majorMinorVersion: string) {
+	const contentText = await fs.readFile(filePath, 'utf8');
+
+	const newContent = contentText.replace(/(versionName\s+")(\d+?\.\d+?)(\.\d+")/, function(_match, prefix, version, suffix) {
+		if (version === majorMinorVersion) return prefix + version + suffix;
+		return `${prefix + majorMinorVersion}.0"`;
+	});
+
+	if (newContent === contentText) return;
+
+	await fs.writeFile(filePath, newContent, 'utf8');
+}
+
+async function updateCodeProjVersion(filePath: string, majorMinorVersion: string) {
+	const contentText = await fs.readFile(filePath, 'utf8');
+
+	// MARKETING_VERSION = 10.1.0;
+	const newContent = contentText.replace(/(MARKETING_VERSION = )(\d+\.\d+)(\.\d+;)/g, function(_match, prefix, version, suffix) {
+		if (version === majorMinorVersion) return prefix + version + suffix;
+		return `${prefix + majorMinorVersion}.0;`;
+	});
+
+	if (newContent === contentText) return;
+
+	await fs.writeFile(filePath, newContent, 'utf8');
+}
+
+async function updateClipperManifestVersion(manifestPath: string, majorMinorVersion: string) {
+	const manifestText = await fs.readFile(manifestPath, 'utf8');
+	const manifest = JSON.parse(manifestText);
+	const versionText = manifest.version;
+
+	if (versionText.indexOf(majorMinorVersion) === 0) return;
+
+	manifest.version = `${majorMinorVersion}.0`;
+	await fs.writeFile(manifestPath, JSON.stringify(manifest, null, 4));
+}
+
+async function updatePluginGeneratorTemplateVersion(manifestPath: string, majorMinorVersion: string) {
+	const manifestText = await fs.readFile(manifestPath, 'utf8');
+	const manifest = JSON.parse(manifestText);
+	manifest.app_min_version = majorMinorVersion;
+	await fs.writeFile(manifestPath, JSON.stringify(manifest, null, '\t'));
+}
+
+// Need this hack to transform x.y.z into 1x.y.z due to some mistake
+// on one of the release and the App Store won't allow decreasing
+// the major version number.
+function iosVersionHack(majorMinorVersion: string) {
+	const p = majorMinorVersion.split('.');
+	p[0] = `1${p[0]}`;
+	return p.join('.');
+}
+
+async function main() {
+	const argv: any = require('yargs').parserConfiguration({
+		'parse-numbers': false,
+	}).argv;
+
+	if (!argv._ || !argv._.length) throw new Error('Please specify the major.minor version, eg. 1.2');
+
+	const majorMinorVersion = argv._[0];
+
+	const options: Options = {
+		updateVersion: argv.updateVersion !== '0',
+		updateDependenciesVersion: argv.updateDependenciesVersion !== '0',
+	};
+
+	if (!options.updateDependenciesVersion && !options.updateVersion) throw new Error('Nothing to do!');
+
+	await updatePackageVersion(`${rootDir}/packages/app-desktop/package.json`, majorMinorVersion, options);
+	await updatePackageVersion(`${rootDir}/packages/app-cli/package.json`, majorMinorVersion, options);
+	await updatePackageVersion(`${rootDir}/packages/generator-joplin/package.json`, majorMinorVersion, options);
+	await updatePackageVersion(`${rootDir}/packages/server/package.json`, majorMinorVersion, options);
+	await updatePackageVersion(`${rootDir}/packages/plugin-repo-cli/package.json`, majorMinorVersion, options);
+	await updatePackageVersion(`${rootDir}/packages/lib/package.json`, majorMinorVersion, options);
+	await updatePackageVersion(`${rootDir}/packages/renderer/package.json`, majorMinorVersion, options);
+	await updatePackageVersion(`${rootDir}/packages/tools/package.json`, majorMinorVersion, options);
+
+	if (options.updateVersion) {
+		await updateGradleVersion(`${rootDir}/packages/app-mobile/android/app/build.gradle`, majorMinorVersion);
+		await updateCodeProjVersion(`${rootDir}/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj`, iosVersionHack(majorMinorVersion));
+		await updateClipperManifestVersion(`${rootDir}/packages/app-clipper/manifest.json`, majorMinorVersion);
+		await updatePluginGeneratorTemplateVersion(`${rootDir}/packages/generator-joplin/generators/app/templates/src/manifest.json`, majorMinorVersion);
+	}
+
+	console.info('Version numbers have been updated. Consider running `npm i` to update the lock files');
+}
+
+main().catch((error) => {
+	console.error('Fatal error:', error);
+	process.exit(1);
+});
--- a/packages/turndown-plugin-gfm/package-lock.json
+++ b/packages/turndown-plugin-gfm/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "@joplin/turndown-plugin-gfm",
-  "version": "1.0.34",
+  "version": "1.0.36",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/packages/turndown-plugin-gfm/package.json
+++ b/packages/turndown-plugin-gfm/package.json
@@ -4,7 +4,7 @@
  "publishConfig": {
    "access": "public"
  },
-  "version": "1.0.34",
+  "version": "1.0.36",
  "author": "Dom Christie",
  "main": "lib/turndown-plugin-gfm.cjs.js",
  "devDependencies": {
--- a/packages/turndown/package-lock.json
+++ b/packages/turndown/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "@joplin/turndown",
-  "version": "4.0.52",
+  "version": "4.0.54",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/packages/turndown/package.json
+++ b/packages/turndown/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@joplin/turndown",
  "description": "A library that converts HTML to Markdown",
-  "version": "4.0.52",
+  "version": "4.0.54",
  "author": "Dom Christie",
  "main": "lib/turndown.cjs.js",
  "publishConfig": {
--- a/readme/changelog_android.md
+++ b/readme/changelog_android.md
@@ -1,5 +1,11 @@
 # Joplin Android app changelog

+## [android-v2.2.5](https://github.com/laurent22/joplin/releases/tag/android-v2.2.5) (Pre-release) - 2021-08-11T10:54:38Z
+
+- Revert "Plugins: Add ability to make dialogs fit the application window (#5219)" as it breaks several plugin webviews.
+- Revert "Resolves #4810, Resolves #4610: Fix AWS S3 sync error and upgrade framework to v3 (#5212)" due to incompatibility with some AWS providers.
+- Improved: Upgraded React Native to v0.64 (afb7e1a)
+
 ## [android-v2.2.3](https://github.com/laurent22/joplin/releases/tag/android-v2.2.3) (Pre-release) - 2021-08-09T18:48:29Z

 - Improved: Ensure that timestamps are not changed when sharing or unsharing a note (cafaa9c)
--- a/readme/changelog_cli.md
+++ b/readme/changelog_cli.md
@@ -1,5 +1,9 @@
 # Joplin terminal app changelog

+## [cli-v2.2.2](https://github.com/laurent22/joplin/releases/tag/cli-v2.2.2) - 2021-08-11T15:34:56Z
+
+- Fixed: Fixed version command so that it does not require the keychain (15766d1)
+
 ## [cli-v2.2.1](https://github.com/laurent22/joplin/releases/tag/cli-v2.2.1) - 2021-08-10T10:21:09Z

 - Improved: Ensure that timestamps are not changed when sharing or unsharing a note (cafaa9c)
Author	SHA1	Message	Date
Laurent Cozic	252d65ebe1	CLI v2.2.2	2021-08-11 16:35:11 +01:00
Laurent Cozic	9ae2f07bd3	Releasing sub-packages	2021-08-11 16:29:31 +01:00
Laurent Cozic	15766d18f5	Cli: Fixed version command so that it does not require the keychain	2021-08-11 16:27:23 +01:00
Laurent Cozic	8108af4e74	Android 2.2.5	2021-08-11 12:03:04 +01:00
Laurent Cozic	5526e5ca71	Android release v2.2.5	2021-08-11 11:45:00 +01:00
Laurent Cozic	6d1a2e2e1d	Desktop release v2.2.7	2021-08-11 11:26:03 +01:00
Laurent Cozic	70cdaa3a22	Revert "Plugins: Add ability to make dialogs fit the application window (#5219 )" This reverts commit `c89037b4a2`. Ref: https://github.com/laurent22/joplin/pull/5219#issuecomment-896702259	2021-08-11 11:25:14 +01:00
Laurent Cozic	6927335330	Revert: All: Resolves #4810 , Resolves #4610 : Fix AWS S3 sync error and upgrade framework to v3 (#5212 ) Revert commit `d2e2866995` Ref: https://github.com/laurent22/joplin/issues/5287	2021-08-11 11:24:01 +01:00
Laurent Cozic	a3b37ca59d	Merge branch 'release-2.2' into dev	2021-08-10 16:56:26 +01:00
Laurent Cozic	895dd813df	Releasing sub-packages	2021-08-10 15:45:08 +01:00
Laurent Cozic	b90ec3af1e	Tools: Update version numbers of sub-packages	2021-08-10 15:41:54 +01:00
Laurent Cozic	2ccbc87435	Tools: Also update dependency version numbers when creating a new release	2021-08-10 15:38:05 +01:00
Laurent Cozic	11bd3d9e1f	Merge branch 'release-2.2' into dev	2021-08-10 12:09:46 +01:00
Laurent Cozic	6359c9ca98	Server: Fix regression	2021-08-09 22:22:31 +01:00
Laurent Cozic	afb7e1a157	Mobile: Upgraded React Native to v0.64	2021-08-09 21:45:41 +01:00