notarization script

.eslintignore

@@ -46,7 +46,6 @@ packages/app-mobile/ios
 packages/app-mobile/locales
 packages/app-mobile/node_modules
 packages/app-mobile/pluginAssets/
-packages/app-mobile/lib/rnInjectedJs/
 packages/lib/assets/
 packages/lib/rnInjectedJs/
 packages/lib/vendor/

.travis.yml

@@ -1,5 +1,5 @@
 # Only build tags (Doesn't work - doesn't build anything)
-if: tag IS present OR type = pull_request OR branch = dev
+if: tag IS present OR type = pull_request
 
 rvm: 2.3.3
 
@@ -15,30 +15,21 @@ branches:
 matrix:
   include:
     - os: osx
-      osx_image: xcode12
+      osx_image: xcode9.0
       language: node_js
-      node_js: "12"
-      cache:
-        npm: false
-      # Cache was disabled because when changing from node_js 10 to node_js 12
-      # it was still using build files from Node 10 when building SQLite which
-      # was making it fail. Might be ok to re-enable later on, although it doesn't
-      # make build that much faster.
-      #
-      # env:
-      #   - ELECTRON_CACHE=$HOME/.cache/electron
-      #   - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
+      node_js: "10"
+      env:
+        - ELECTRON_CACHE=$HOME/.cache/electron
+        - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
 
     - os: linux
       sudo: required
       dist: trusty
       language: node_js
-      node_js: "12"
-      cache:
-        npm: false
-      # env:
-      #   - ELECTRON_CACHE=$HOME/.cache/electron
-      #   - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
+      node_js: "10"
+      env:
+        - ELECTRON_CACHE=$HOME/.cache/electron
+        - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
 
 # cache:
 #   directories:
@@ -74,7 +65,7 @@ script:
     # Run test units.
     # Only do it for pull requests because Travis randomly fails to run them
     # and that would break the desktop release.
-    if [ "$TRAVIS_PULL_REQUEST" != "false" ] || [ "$TRAVIS_BRANCH" = "dev" ]; then
+    if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
       npm run test-ci
       testResult=$?
       if [ $testResult -ne 0 ]; then

packages/app-cli/package.json

@@ -5,9 +5,9 @@
   "author": "Laurent Cozic",
   "private": true,
   "scripts": {
-    "test": "jest --config=jest.config.js --bail --forceExit",
-    "test-one": "jest --verbose=false --config=jest.config.js --bail --forceExit",
-    "test-ci": "jest --config=jest.config.js --forceExit",
+    "test": "jest --config=jest.config.js --runInBand --bail --forceExit",
+    "test-one": "jest --verbose=false --config=jest.config.js --runInBand --bail --forceExit",
+    "test-ci": "jest --config=jest.config.js --runInBand --forceExit",
     "build": "gulp build",
     "start": "gulp build -L && node \"build/main.js\" --stack-trace-enabled --log-level debug --env dev",
     "tsc": "node node_modules/typescript/bin/tsc --project tsconfig.json",
@@ -31,7 +31,7 @@
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "1.5.0",
+  "version": "1.4.9",
   "bin": {
     "joplin": "./main.js"
   },

packages/app-cli/tests/test-utils.js

@@ -53,13 +53,6 @@ const S3 = require('aws-sdk/clients/s3');
 const { Dirnames } = require('@joplin/lib/services/synchronizer/utils/types');
 const sharp = require('sharp');
 
-// Each suite has its own separate data and temp directory so that multiple
-// suites can be run at the same time. suiteName is what is used to
-// differentiate between suite and it is currently set to a random string
-// (Ideally it would be something like the filename currently being executed by
-// Jest, to make debugging easier, but it's not clear how to get this info).
-const suiteName_ = uuid.createNano();
-
 const databases_ = [];
 let synchronizers_ = [];
 const synchronizerContexts_ = {};
@@ -96,11 +89,10 @@ EncryptionService.fsDriver_ = fsDriver;
 FileApiDriverLocal.fsDriver_ = fsDriver;
 
 const logDir = `${__dirname}/../tests/logs`;
-const baseTempDir = `${__dirname}/../tests/tmp/${suiteName_}`;
-const dataDir = `${__dirname}/data/${suiteName_}`;
+const baseTempDir = `${__dirname}/../tests/tmp`;
 fs.mkdirpSync(logDir, 0o755);
 fs.mkdirpSync(baseTempDir, 0o755);
-fs.mkdirpSync(dataDir);
+fs.mkdirpSync(`${__dirname}/data`);
 
 SyncTargetRegistry.addClass(SyncTargetMemory);
 SyncTargetRegistry.addClass(SyncTargetFilesystem);
@@ -147,12 +139,12 @@ const syncDir = `${__dirname}/../tests/sync`;
 
 const dbLogger = new Logger();
 dbLogger.addTarget('console');
-// dbLogger.addTarget('file', { path: `${logDir}/log.txt` });
+dbLogger.addTarget('file', { path: `${logDir}/log.txt` });
 dbLogger.setLevel(Logger.LEVEL_WARN);
 
 const logger = new Logger();
 logger.addTarget('console');
-// logger.addTarget('file', { path: `${logDir}/log.txt` });
+logger.addTarget('file', { path: `${logDir}/log.txt` });
 logger.setLevel(Logger.LEVEL_WARN); // Set to DEBUG to display sync process in console
 
 Logger.initializeGlobalLogger(logger);
@@ -277,7 +269,7 @@ async function setupDatabase(id = null, options = null) {
 		return;
 	}
 
-	const filePath = `${dataDir}/test-${id}.sqlite`;
+	const filePath = `${__dirname}/data/test-${id}.sqlite`;
 
 	try {
 		await fs.unlink(filePath);
@@ -300,15 +292,15 @@ function resourceDirName(id = null) {
 
 function resourceDir(id = null) {
 	if (id === null) id = currentClient_;
-	return `${dataDir}/${resourceDirName(id)}`;
+	return `${__dirname}/data/${resourceDirName(id)}`;
 }
 
 function pluginDir(id = null) {
 	if (id === null) id = currentClient_;
-	return `${dataDir}/plugins-${id}`;
+	return `${__dirname}/data/plugins-${id}`;
 }
 
-async function setupDatabaseAndSynchronizer(id, options = null) {
+async function setupDatabaseAndSynchronizer(id = null, options = null) {
 	if (id === null) id = currentClient_;
 
 	BaseService.logger_ = logger;

packages/app-clipper/manifest.json

@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "Joplin Web Clipper [DEV]",
-    "version": "1.5.0",
+    "version": "1.4.3",
     "description": "Capture and save web pages and screenshots from your browser to Joplin.",
     "homepage_url": "https://joplinapp.org",
     "content_security_policy": "script-src 'self'; object-src 'self'",

packages/app-desktop/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@joplin/app-desktop",
-  "version": "1.5.3",
+  "version": "1.4.18",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

packages/app-desktop/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joplin/app-desktop",
-  "version": "1.5.3",
+  "version": "1.4.19",
   "description": "Joplin for Desktop",
   "main": "main.js",
   "private": true,

packages/app-desktop/tools/notarizeMacApp.js

@@ -5,13 +5,6 @@ const electron_notarize = require('electron-notarize');
 module.exports = async function(params) {
 	if (process.platform !== 'darwin') return;
 
-	console.info('Checking if notarization should be done...');
-
-	if (!process.env.TRAVIS || !process.env.TRAVIS_TAG) {
-		console.info(`Either not running in CI or not processing a tag - skipping notarization. process.env.TRAVIS = ${process.env.TRAVIS}; process.env.TRAVIS_TAG = ${process.env.TRAVIS}`);
-		return;
-	}
-
 	if (!process.env.APPLE_ID || !process.env.APPLE_ID_PASSWORD) {
 		console.warn('Environment variables APPLE_ID and APPLE_ID_PASSWORD not found - notarization will NOT be done.');
 		return;

packages/app-mobile/android/app/build.gradle

@@ -139,7 +139,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
 		versionCode 2097613
-		versionName "1.5.0"
+		versionName "1.4.11"
 		ndk {
 			abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
 		}

packages/app-mobile/android/app/src/main/AndroidManifest.xml

@@ -18,11 +18,6 @@
 	<uses-feature android:name="android.hardware.camera" android:required="false" />
 	<uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
 
-	<!--
-		Android 10 introduced new "scoped storage" mechanism.
-		Apps targeting Android 10 (sdk 29) can no longer freely access arbitrary paths on the shared storage.
-		The attribute "requestLegacyExternalStorage" below allows to opt out of this restriction.
-	-->
 	<application
 		android:name=".MainApplication"
 		android:label="@string/app_name"
@@ -30,7 +25,6 @@
 		android:roundIcon="@mipmap/ic_launcher_round"
 		android:allowBackup="false"
 		android:networkSecurityConfig="@xml/network_security_config"
-		android:requestLegacyExternalStorage="true"
 		android:theme="@style/AppTheme">
 
 		<!-- RN-NOTIFICATION -->

packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj

@@ -344,7 +344,7 @@
 				INFOPLIST_FILE = Joplin/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 10.5.0;
+				MARKETING_VERSION = 10.4.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -370,7 +370,7 @@
 				INFOPLIST_FILE = Joplin/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 10.5.0;
+				MARKETING_VERSION = 10.4.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

packages/generator-joplin/generators/app/templates/src/manifest.json

@@ -1,7 +1,7 @@
 {
 	"manifest_version": 1,
 	"id": "<%= pluginId %>",
-	"app_min_version": "1.5",
+	"app_min_version": "1.4",
 	"version": "1.0.0",
 	"name": "<%= pluginName %>",
 	"description": "<%= pluginDescription %>",

packages/generator-joplin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-joplin",
-  "version": "1.5.0",
+  "version": "1.4.5",
   "description": "Scaffolds out a new Joplin plugin",
   "homepage": "https://joplinapp.org",
   "author": {

packages/lib/file-api-driver-amazon-s3.js

@@ -2,7 +2,6 @@ const { basicDelta } = require('./file-api');
 const { basename } = require('./path-utils');
 const shim = require('./shim').default;
 const JoplinError = require('./JoplinError');
-const { Buffer } = require('buffer');
 
 const S3_MAX_DELETES = 1000;
 
@@ -84,14 +83,12 @@ class FileApiDriverAmazonS3 {
 
 	async s3UploadFileFrom(path, key) {
 		if (!shim.fsDriver().exists(path)) throw new Error('s3UploadFileFrom: file does not exist');
-		const body = await shim.fsDriver().readFile(path, 'base64');
-		const fileStat = await shim.fsDriver().stat(path);
+		const body = await shim.fsDriver().readFile(path, 'Buffer');
 		return new Promise((resolve, reject) => {
-			this.api().putObject({
+			this.api().upload({
 				Bucket: this.s3_bucket_,
 				Key: key,
-				Body: Buffer.from(body, 'base64'),
-				ContentLength: `${fileStat.size}`,
+				Body: body,
 			}, (err, response) => {
 				if (err) reject(err);
 				else resolve(response);

packages/tools/git-changelog.js

@@ -99,7 +99,7 @@ function filterLogs(logs, platform) {
 		if (platform === 'android' && prefix.indexOf('android') >= 0) addIt = true;
 		if (platform === 'ios' && prefix.indexOf('ios') >= 0) addIt = true;
 		if (platform === 'desktop' && prefix.indexOf('desktop') >= 0) addIt = true;
-		if (platform === 'desktop' && (prefix.indexOf('desktop') >= 0 || prefix.indexOf('api') >= 0 || prefix.indexOf('plugins') >= 0 || prefix.indexOf('macos') >= 0)) addIt = true;
+		if (platform === 'desktop' && (prefix.indexOf('desktop') >= 0 || prefix.indexOf('api') >= 0 || prefix.indexOf('plugins') >= 0)) addIt = true;
 		if (platform === 'cli' && prefix.indexOf('cli') >= 0) addIt = true;
 		if (platform === 'clipper' && prefix.indexOf('clipper') >= 0) addIt = true;