From 9036bc4fd19555d7d5628b3c26682f369a4fd5d4 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Fri, 11 Feb 2022 18:24:59 +0000 Subject: [PATCH] Android 2.7.1 --- package.json | 2 +- packages/app-mobile/android/app/build.gradle | 4 ++-- readme/changelog_android.md | 9 +++++++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index c7da4cca2a4..abeea5f7bd2 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "linter": "eslint --resolve-plugins-relative-to . --fix --quiet --ext .js --ext .jsx --ext .ts --ext .tsx", "postinstall": "gulp build", "publishAll": "git pull && yarn run buildParallel && lerna version --yes --no-private --no-git-tag-version && gulp completePublishAll", - "releaseAndroid": "yarn run buildParallel && export PATH=\"/usr/local/opt/openjdk@11/bin:$PATH\" && node packages/tools/release-android.js", + "releaseAndroid": "PATH=\"/usr/local/opt/openjdk@11/bin:$PATH\" node packages/tools/release-android.js", "releaseAndroidClean": "node packages/tools/release-android.js", "releaseCli": "node packages/tools/release-cli.js", "releaseClipper": "node packages/tools/release-clipper.js", diff --git a/packages/app-mobile/android/app/build.gradle b/packages/app-mobile/android/app/build.gradle index 5f8f70dc89d..aca79f34166 100644 --- a/packages/app-mobile/android/app/build.gradle +++ b/packages/app-mobile/android/app/build.gradle @@ -146,8 +146,8 @@ android { applicationId "net.cozic.joplin" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 2097665 - versionName "2.7.0" + versionCode 2097666 + versionName "2.7.1" ndk { abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64" } diff --git a/readme/changelog_android.md b/readme/changelog_android.md index 428caf9355d..f0a3e83fdcf 100644 --- a/readme/changelog_android.md +++ b/readme/changelog_android.md @@ -1,5 +1,14 @@ # Joplin Android app changelog +## [android-v2.7.1](https://github.com/laurent22/joplin/releases/tag/android-v2.7.1) (Pre-release) - 2022-02-11T18:16:28Z + +- New: Add additional time format HH.mm (#6086 by [@vincentjocodes](https://github.com/vincentjocodes)) +- Improved: Do no duplicate resources when duplicating a note (721d008) +- Improved: Make heading 4, 5 and 6 styling more consistent (fca5875) +- Improved: Show login prompt for OneDrive (#5933 by Jonathan Heard) +- Improved: Update Mermaid 8.13.5 -> 8.13.9 and Katex dependencies (#6039 by Helmut K. C. Tessarek) +- Fixed: Shared resource was not encrypted with correct encryption key (#6092) + ## [android-v2.6.9](https://github.com/laurent22/joplin/releases/tag/android-v2.6.9) - 2021-12-20T14:58:42Z - Fixed: Fixed issue where synchroniser would try to update a shared folder that is not longer accessible (667d642)