diff --git a/packages/app-cli/package.json b/packages/app-cli/package.json index fb9d0d8cd..6dd361151 100644 --- a/packages/app-cli/package.json +++ b/packages/app-cli/package.json @@ -33,7 +33,7 @@ ], "owner": "Laurent Cozic" }, - "version": "2.4.1", + "version": "2.5.0", "bin": { "joplin": "./main.js" }, @@ -41,8 +41,8 @@ "node": ">=10.0.0" }, "dependencies": { - "@joplin/lib": "~2.4", - "@joplin/renderer": "~2.4", + "@joplin/lib": "~2.5", + "@joplin/renderer": "~2.5", "aws-sdk": "^2.588.0", "chalk": "^4.1.0", "compare-version": "^0.1.2", @@ -66,7 +66,7 @@ "yargs-parser": "^7.0.0" }, "devDependencies": { - "@joplin/tools": "~2.4", + "@joplin/tools": "~2.5", "@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 27f584b43..3dd91eb18 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.4.0", + "version": "2.5.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-lock.json b/packages/app-desktop/package-lock.json index 1a0c19283..12ab99d3b 100644 --- a/packages/app-desktop/package-lock.json +++ b/packages/app-desktop/package-lock.json @@ -1,12 +1,12 @@ { "name": "@joplin/app-desktop", - "version": "2.4.8", + "version": "2.5.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@joplin/app-desktop", - "version": "2.4.8", + "version": "2.5.0", "license": "MIT", "dependencies": { "@fortawesome/fontawesome-free": "^5.13.0", diff --git a/packages/app-desktop/package.json b/packages/app-desktop/package.json index bf1b194fc..ea53c5872 100644 --- a/packages/app-desktop/package.json +++ b/packages/app-desktop/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/app-desktop", - "version": "2.4.8", + "version": "2.5.0", "description": "Joplin for Desktop", "main": "main.js", "private": true, @@ -93,7 +93,7 @@ }, "homepage": "https://github.com/laurent22/joplin#readme", "devDependencies": { - "@joplin/tools": "~2.4", + "@joplin/tools": "~2.5", "@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": "~2.4", - "@joplin/renderer": "~2.4", + "@joplin/lib": "~2.5", + "@joplin/renderer": "~2.5", "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 9df8e7e61..d434fe798 100644 --- a/packages/app-mobile/android/app/build.gradle +++ b/packages/app-mobile/android/app/build.gradle @@ -142,7 +142,7 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 2097650 - versionName "2.4.2" + versionName "2.5.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 67e9a0ded..3147c8895 100644 --- a/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj +++ b/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj @@ -492,7 +492,7 @@ INFOPLIST_FILE = Joplin/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 12.4.1; + MARKETING_VERSION = 12.5.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -519,7 +519,7 @@ INFOPLIST_FILE = Joplin/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 12.4.1; + MARKETING_VERSION = 12.5.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -666,7 +666,7 @@ INFOPLIST_FILE = ShareExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 12.4.1; + MARKETING_VERSION = 12.5.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension; @@ -697,7 +697,7 @@ INFOPLIST_FILE = ShareExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 12.4.1; + MARKETING_VERSION = 12.5.0; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/packages/app-mobile/ios/Podfile.lock b/packages/app-mobile/ios/Podfile.lock index 2e82642d7..6acb2f9e7 100644 --- a/packages/app-mobile/ios/Podfile.lock +++ b/packages/app-mobile/ios/Podfile.lock @@ -488,7 +488,7 @@ SPEC CHECKSUMS: boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de FBLazyVector: e686045572151edef46010a6f819ade377dfeb4b - FBReactNativeSpec: 6da2c8ff1ebe6b6cf4510fcca58c24c4d02b16fc + FBReactNativeSpec: 009b310a5134a345e702b4402de70b5ee2bb4832 glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62 JoplinCommonShareExtension: 270b4f8eb4e22828eeda433a04ed689fc1fd09b5 JoplinRNShareExtension: 7137e9787374e1b0797ecbef9103d1588d90e403 diff --git a/packages/generator-joplin/generators/app/templates/src/manifest.json b/packages/generator-joplin/generators/app/templates/src/manifest.json index 34ff30772..f1bf10c94 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.4", + "app_min_version": "2.5", "version": "1.0.0", "name": "<%= pluginName %>", "description": "<%= pluginDescription %>", diff --git a/packages/generator-joplin/package.json b/packages/generator-joplin/package.json index 0e784d27a..cd3549d1e 100644 --- a/packages/generator-joplin/package.json +++ b/packages/generator-joplin/package.json @@ -1,6 +1,6 @@ { "name": "generator-joplin", - "version": "2.4.0", + "version": "2.5.0", "description": "Scaffolds out a new Joplin plugin", "homepage": "https://github.com/laurent22/joplin/tree/dev/packages/generator-joplin", "author": { diff --git a/packages/lib/package-lock.json b/packages/lib/package-lock.json index 7615dfa45..6dde9e912 100644 --- a/packages/lib/package-lock.json +++ b/packages/lib/package-lock.json @@ -1,12 +1,12 @@ { "name": "@joplin/lib", - "version": "2.4.3", + "version": "2.5.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@joplin/lib", - "version": "2.4.1", + "version": "2.5.0", "license": "ISC", "dependencies": { "async-mutex": "^0.1.3", diff --git a/packages/lib/package.json b/packages/lib/package.json index ad59ae400..841f56aee 100644 --- a/packages/lib/package.json +++ b/packages/lib/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/lib", - "version": "2.4.3", + "version": "2.5.0", "description": "Joplin Core library", "author": "Laurent Cozic", "homepage": "", @@ -28,7 +28,7 @@ "dependencies": { "@joplin/fork-htmlparser2": "^4.1.36", "@joplin/fork-sax": "^1.2.40", - "@joplin/renderer": "^2.4.3", + "@joplin/renderer": "~2.5", "@joplin/turndown": "^4.0.58", "@joplin/turndown-plugin-gfm": "^1.0.40", "async-mutex": "^0.1.3", diff --git a/packages/plugin-repo-cli/package.json b/packages/plugin-repo-cli/package.json index 3eeb46916..5ca795a0f 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.4.3", + "version": "2.5.0", "description": "", "main": "index.js", "bin": { @@ -19,8 +19,8 @@ "author": "", "license": "MIT", "dependencies": { - "@joplin/lib": "^2.4.3", - "@joplin/tools": "^2.4.3", + "@joplin/lib": "~2.5", + "@joplin/tools": "~2.5", "fs-extra": "^9.0.1", "gh-release-assets": "^2.0.0", "node-fetch": "^2.6.1", diff --git a/packages/renderer/package-lock.json b/packages/renderer/package-lock.json index 31d5f15e8..d00737423 100644 --- a/packages/renderer/package-lock.json +++ b/packages/renderer/package-lock.json @@ -1,12 +1,12 @@ { "name": "@joplin/renderer", - "version": "2.4.3", + "version": "2.5.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@joplin/renderer", - "version": "2.4.1", + "version": "2.5.0", "license": "MIT", "dependencies": { "font-awesome-filetypes": "^2.1.0", diff --git a/packages/renderer/package.json b/packages/renderer/package.json index b57ac8bbc..34e3e6408 100644 --- a/packages/renderer/package.json +++ b/packages/renderer/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/renderer", - "version": "2.4.3", + "version": "2.5.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 20d77a487..dc602c9f0 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/server", - "version": "2.4.11", + "version": "2.5.0", "private": true, "scripts": { "start-dev": "nodemon --config nodemon.json --ext ts,js,mustache,css,tsx dist/app.js --env dev", @@ -20,8 +20,8 @@ }, "dependencies": { "@fortawesome/fontawesome-free": "^5.15.1", - "@joplin/lib": "~2.4", - "@joplin/renderer": "~2.4", + "@joplin/lib": "~2.5", + "@joplin/renderer": "~2.5", "@koa/cors": "^3.1.0", "@types/uuid": "^8.3.1", "bcryptjs": "^2.4.3", @@ -54,7 +54,7 @@ "zxcvbn": "^4.4.2" }, "devDependencies": { - "@joplin/tools": "~2.4", + "@joplin/tools": "~2.5", "@rmp135/sql-ts": "^1.7.0", "@types/fs-extra": "^8.0.0", "@types/jest": "^26.0.15", diff --git a/packages/tools/package.json b/packages/tools/package.json index 6d1638171..5f5282453 100644 --- a/packages/tools/package.json +++ b/packages/tools/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/tools", - "version": "2.4.3", + "version": "2.5.0", "description": "Various tools for Joplin", "main": "index.js", "author": "Laurent Cozic", @@ -20,8 +20,8 @@ }, "license": "MIT", "dependencies": { - "@joplin/lib": "^2.4.3", - "@joplin/renderer": "^2.4.3", + "@joplin/lib": "~2.5", + "@joplin/renderer": "~2.5", "execa": "^4.1.0", "fs-extra": "^4.0.3", "gettext-parser": "^1.3.0",