Electron release v1.2.2

ElectronClient/gui/ConfigScreen/ConfigScreen.tsx

@@ -526,7 +526,7 @@ class ConfigScreenComponent extends React.Component<any, any> {
 			const label = [md.label()];
 			if (md.unitLabel) label.push(`(${md.unitLabel()})`);
 
-			const inputStyle = Object.assign({}, textInputBaseStyle);
+			const inputStyle:any = Object.assign({}, textInputBaseStyle);
 
 			return (
 				<div key={key} style={rowStyle}>

ElectronClient/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "Joplin",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

ElectronClient/package.json

@@ -1,6 +1,6 @@
 {
   "name": "Joplin",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Joplin for Desktop",
   "main": "main.js",
   "scripts": {

Tools/release-android.js

@@ -151,7 +151,9 @@ async function createRelease(name, tagName, version) {
 async function main() {
 	const argv = require('yargs').argv;
 
-	const isPreRelease = !!argv.prerelease;
+	if (!['release', 'prerelease'].includes(argv.type)) throw new Error('Must specify release type. Either --type=release or --type=prerelease');
+
+	const isPreRelease = argv.type === 'prerelease';
 
 	if (isPreRelease) console.info('Creating pre-release');
 	console.info('Updating version numbers in build.gradle...');