From c94a98b8413f9e093821410fc0368f209d4a674e Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Tue, 12 Apr 2022 15:30:37 +0100 Subject: [PATCH] Chore: Setup new release 2.8 --- packages/app-cli/package.json | 8 ++-- packages/app-clipper/manifest.json | 2 +- packages/app-desktop/package.json | 8 ++-- packages/app-mobile/android/app/build.gradle | 2 +- .../ios/Joplin.xcodeproj/project.pbxproj | 8 ++-- .../app/templates/src/manifest.json | 2 +- packages/generator-joplin/package.json | 2 +- packages/htmlpack/package.json | 2 +- packages/lib/package.json | 6 +-- packages/plugin-repo-cli/package.json | 6 +-- packages/renderer/package.json | 2 +- packages/server/package.json | 8 ++-- packages/tools/package.json | 6 +-- yarn.lock | 38 +++++++++---------- 14 files changed, 50 insertions(+), 50 deletions(-) diff --git a/packages/app-cli/package.json b/packages/app-cli/package.json index 144c031ccd..094306017a 100644 --- a/packages/app-cli/package.json +++ b/packages/app-cli/package.json @@ -33,14 +33,14 @@ ], "owner": "Laurent Cozic" }, - "version": "2.7.0", + "version": "2.8.0", "bin": "./main.js", "engines": { "node": ">=10.0.0" }, "dependencies": { - "@joplin/lib": "~2.7", - "@joplin/renderer": "~2.7", + "@joplin/lib": "~2.8", + "@joplin/renderer": "~2.8", "aws-sdk": "^2.588.0", "chalk": "^4.1.0", "compare-version": "^0.1.2", @@ -67,7 +67,7 @@ "yargs-parser": "^7.0.0" }, "devDependencies": { - "@joplin/tools": "~2.7", + "@joplin/tools": "~2.8", "@types/fs-extra": "^9.0.6", "@types/jest": "^26.0.15", "@types/node": "^14.14.6", diff --git a/packages/app-clipper/manifest.json b/packages/app-clipper/manifest.json index 1533d1647d..c0a756d4c2 100644 --- a/packages/app-clipper/manifest.json +++ b/packages/app-clipper/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "Joplin Web Clipper [DEV]", - "version": "2.7.0", + "version": "2.8.0", "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'", diff --git a/packages/app-desktop/package.json b/packages/app-desktop/package.json index 55e86e68a6..61f7ab0417 100644 --- a/packages/app-desktop/package.json +++ b/packages/app-desktop/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/app-desktop", - "version": "2.7.15", + "version": "2.8.0", "description": "Joplin for Desktop", "main": "main.js", "private": true, @@ -105,7 +105,7 @@ }, "homepage": "https://github.com/laurent22/joplin#readme", "devDependencies": { - "@joplin/tools": "~2.7", + "@joplin/tools": "~2.8", "@testing-library/react-hooks": "^3.4.2", "@types/jest": "^26.0.15", "@types/node": "^14.14.6", @@ -138,8 +138,8 @@ "@electron/remote": "^2.0.1", "@fortawesome/fontawesome-free": "^5.13.0", "@joeattardi/emoji-button": "^4.6.0", - "@joplin/lib": "~2.7", - "@joplin/renderer": "~2.7", + "@joplin/lib": "~2.8", + "@joplin/renderer": "~2.8", "async-mutex": "^0.1.3", "codemirror": "^5.56.0", "color": "^3.1.2", diff --git a/packages/app-mobile/android/app/build.gradle b/packages/app-mobile/android/app/build.gradle index 4a56dc9596..9d3d761f21 100644 --- a/packages/app-mobile/android/app/build.gradle +++ b/packages/app-mobile/android/app/build.gradle @@ -147,7 +147,7 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 2097667 - versionName "2.7.2" + versionName "2.8.0" ndk { abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64" } diff --git a/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj b/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj index e65affefe1..59503e5bdf 100644 --- a/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj +++ b/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj @@ -498,7 +498,7 @@ INFOPLIST_FILE = Joplin/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 12.7.1; + MARKETING_VERSION = 12.8.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -526,7 +526,7 @@ INFOPLIST_FILE = Joplin/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 12.7.1; + MARKETING_VERSION = 12.8.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -674,7 +674,7 @@ INFOPLIST_FILE = ShareExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 12.7.1; + MARKETING_VERSION = 12.8.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension; @@ -705,7 +705,7 @@ INFOPLIST_FILE = ShareExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 12.7.1; + MARKETING_VERSION = 12.8.0; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/packages/generator-joplin/generators/app/templates/src/manifest.json b/packages/generator-joplin/generators/app/templates/src/manifest.json index 0253e97dff..4817fc0254 100644 --- a/packages/generator-joplin/generators/app/templates/src/manifest.json +++ b/packages/generator-joplin/generators/app/templates/src/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 1, "id": "<%= pluginId %>", - "app_min_version": "2.7", + "app_min_version": "2.8", "version": "1.0.0", "name": "<%= pluginName %>", "description": "<%= pluginDescription %>", diff --git a/packages/generator-joplin/package.json b/packages/generator-joplin/package.json index f07992aabc..2110d8f695 100644 --- a/packages/generator-joplin/package.json +++ b/packages/generator-joplin/package.json @@ -1,6 +1,6 @@ { "name": "generator-joplin", - "version": "2.7.3", + "version": "2.8.0", "description": "Scaffolds out a new Joplin plugin", "homepage": "https://github.com/laurent22/joplin/tree/dev/packages/generator-joplin", "author": { diff --git a/packages/htmlpack/package.json b/packages/htmlpack/package.json index 6625ad0cbb..fb984a192e 100644 --- a/packages/htmlpack/package.json +++ b/packages/htmlpack/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/htmlpack", - "version": "2.7.0", + "version": "2.8.0", "description": "Pack an HTML file and all its linked resources into a single HTML file", "main": "dist/index.js", "types": "src/index.ts", diff --git a/packages/lib/package.json b/packages/lib/package.json index 45af67cfc3..654cbe235c 100644 --- a/packages/lib/package.json +++ b/packages/lib/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/lib", - "version": "2.7.0", + "version": "2.8.0", "description": "Joplin Core library", "author": "Laurent Cozic", "homepage": "", @@ -33,8 +33,8 @@ "@joplin/fork-htmlparser2": "^4.1.39", "@joplin/fork-sax": "^1.2.43", "@joplin/fork-uslug": "^1.0.4", - "@joplin/htmlpack": "~2.7", - "@joplin/renderer": "~2.7", + "@joplin/htmlpack": "~2.8", + "@joplin/renderer": "~2.8", "@joplin/turndown": "^4.0.61", "@joplin/turndown-plugin-gfm": "^1.0.43", "@types/nanoid": "^3.0.0", diff --git a/packages/plugin-repo-cli/package.json b/packages/plugin-repo-cli/package.json index a77f52d866..b3618f66f4 100644 --- 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.7.0", + "version": "2.8.0", "description": "", "main": "index.js", "bin": "./dist/index.js", @@ -18,8 +18,8 @@ "author": "", "license": "MIT", "dependencies": { - "@joplin/lib": "~2.7", - "@joplin/tools": "~2.7", + "@joplin/lib": "~2.8", + "@joplin/tools": "~2.8", "fs-extra": "^9.0.1", "gh-release-assets": "^2.0.0", "node-fetch": "^2.6.1", diff --git a/packages/renderer/package.json b/packages/renderer/package.json index 877398b288..2034d64036 100644 --- a/packages/renderer/package.json +++ b/packages/renderer/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/renderer", - "version": "2.7.0", + "version": "2.8.0", "description": "The Joplin note renderer, used the mobile and desktop application", "repository": "https://github.com/laurent22/joplin/tree/dev/packages/renderer", "main": "index.js", diff --git a/packages/server/package.json b/packages/server/package.json index df18cf5a82..84fbce35df 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/server", - "version": "2.7.4", + "version": "2.8.0", "private": true, "scripts": { "start-dev": "yarn run build && JOPLIN_IS_TESTING=1 nodemon --config nodemon.json --ext ts,js,mustache,css,tsx dist/app.js --env dev", @@ -23,8 +23,8 @@ "dependencies": { "@aws-sdk/client-s3": "^3.40.0", "@fortawesome/fontawesome-free": "^5.15.1", - "@joplin/lib": "~2.7", - "@joplin/renderer": "~2.7", + "@joplin/lib": "~2.8", + "@joplin/renderer": "~2.8", "@koa/cors": "^3.1.0", "@types/uuid": "^8.3.1", "bcryptjs": "^2.4.3", @@ -58,7 +58,7 @@ "zxcvbn": "^4.4.2" }, "devDependencies": { - "@joplin/tools": "~2.7", + "@joplin/tools": "~2.8", "@rmp135/sql-ts": "^1.12.1", "@types/fs-extra": "^8.0.0", "@types/jest": "^26.0.15", diff --git a/packages/tools/package.json b/packages/tools/package.json index c2c8f22409..5f6d989d4e 100644 --- a/packages/tools/package.json +++ b/packages/tools/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/tools", - "version": "2.7.0", + "version": "2.8.0", "description": "Various tools for Joplin", "main": "index.js", "author": "Laurent Cozic", @@ -20,8 +20,8 @@ }, "license": "MIT", "dependencies": { - "@joplin/lib": "~2.7", - "@joplin/renderer": "~2.7", + "@joplin/lib": "~2.8", + "@joplin/renderer": "~2.8", "@types/node-fetch": "1.6.9", "dayjs": "^1.10.7", "execa": "^4.1.0", diff --git a/yarn.lock b/yarn.lock index 968f160c92..a0f72fddfb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2896,9 +2896,9 @@ __metadata: "@electron/remote": ^2.0.1 "@fortawesome/fontawesome-free": ^5.13.0 "@joeattardi/emoji-button": ^4.6.0 - "@joplin/lib": ~2.7 - "@joplin/renderer": ~2.7 - "@joplin/tools": ~2.7 + "@joplin/lib": ~2.8 + "@joplin/renderer": ~2.8 + "@joplin/tools": ~2.8 "@testing-library/react-hooks": ^3.4.2 "@types/jest": ^26.0.15 "@types/node": ^14.14.6 @@ -3089,7 +3089,7 @@ __metadata: languageName: unknown linkType: soft -"@joplin/htmlpack@^2.6.1, @joplin/htmlpack@workspace:packages/htmlpack, @joplin/htmlpack@~2.7": +"@joplin/htmlpack@^2.6.1, @joplin/htmlpack@workspace:packages/htmlpack, @joplin/htmlpack@~2.8": version: 0.0.0-use.local resolution: "@joplin/htmlpack@workspace:packages/htmlpack" dependencies: @@ -3102,7 +3102,7 @@ __metadata: languageName: unknown linkType: soft -"@joplin/lib@^2.6.3, @joplin/lib@workspace:packages/lib, @joplin/lib@~2.7": +"@joplin/lib@^2.6.3, @joplin/lib@workspace:packages/lib, @joplin/lib@~2.8": version: 0.0.0-use.local resolution: "@joplin/lib@workspace:packages/lib" dependencies: @@ -3111,8 +3111,8 @@ __metadata: "@joplin/fork-htmlparser2": ^4.1.39 "@joplin/fork-sax": ^1.2.43 "@joplin/fork-uslug": ^1.0.4 - "@joplin/htmlpack": ~2.7 - "@joplin/renderer": ~2.7 + "@joplin/htmlpack": ~2.8 + "@joplin/renderer": ~2.8 "@joplin/turndown": ^4.0.61 "@joplin/turndown-plugin-gfm": ^1.0.43 "@types/fs-extra": ^9.0.6 @@ -3257,8 +3257,8 @@ __metadata: version: 0.0.0-use.local resolution: "@joplin/plugin-repo-cli@workspace:packages/plugin-repo-cli" dependencies: - "@joplin/lib": ~2.7 - "@joplin/tools": ~2.7 + "@joplin/lib": ~2.8 + "@joplin/tools": ~2.8 "@types/fs-extra": ^9.0.6 "@types/jest": ^26.0.15 "@types/node": ^14.14.6 @@ -3283,7 +3283,7 @@ __metadata: languageName: unknown linkType: soft -"@joplin/renderer@^2.6.3, @joplin/renderer@workspace:packages/renderer, @joplin/renderer@~2.7": +"@joplin/renderer@^2.6.3, @joplin/renderer@workspace:packages/renderer, @joplin/renderer@~2.8": version: 0.0.0-use.local resolution: "@joplin/renderer@workspace:packages/renderer" dependencies: @@ -3354,9 +3354,9 @@ __metadata: dependencies: "@aws-sdk/client-s3": ^3.40.0 "@fortawesome/fontawesome-free": ^5.15.1 - "@joplin/lib": ~2.7 - "@joplin/renderer": ~2.7 - "@joplin/tools": ~2.7 + "@joplin/lib": ~2.8 + "@joplin/renderer": ~2.8 + "@joplin/tools": ~2.8 "@koa/cors": ^3.1.0 "@rmp135/sql-ts": ^1.12.1 "@types/fs-extra": ^8.0.0 @@ -3434,12 +3434,12 @@ __metadata: languageName: node linkType: hard -"@joplin/tools@workspace:packages/tools, @joplin/tools@~2.7": +"@joplin/tools@workspace:packages/tools, @joplin/tools@~2.8": version: 0.0.0-use.local resolution: "@joplin/tools@workspace:packages/tools" dependencies: - "@joplin/lib": ~2.7 - "@joplin/renderer": ~2.7 + "@joplin/lib": ~2.8 + "@joplin/renderer": ~2.8 "@rmp135/sql-ts": ^1.6.0 "@types/fs-extra": ^9.0.6 "@types/jest": ^26.0.15 @@ -18644,9 +18644,9 @@ __metadata: version: 0.0.0-use.local resolution: "joplin@workspace:packages/app-cli" dependencies: - "@joplin/lib": ~2.7 - "@joplin/renderer": ~2.7 - "@joplin/tools": ~2.7 + "@joplin/lib": ~2.8 + "@joplin/renderer": ~2.8 + "@joplin/tools": ~2.8 "@types/fs-extra": ^9.0.6 "@types/jest": ^26.0.15 "@types/node": ^14.14.6