diff --git a/packages/app-mobile/android/app/build.gradle b/packages/app-mobile/android/app/build.gradle index 44f2cefa8..e5fdbdbfc 100644 --- a/packages/app-mobile/android/app/build.gradle +++ b/packages/app-mobile/android/app/build.gradle @@ -110,8 +110,8 @@ android { applicationId "net.cozic.joplin" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 2097712 - versionName "2.11.27" + versionCode 2097716 + versionName "2.11.31" // 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 8faf2a934..a6af2b6df 100644 --- a/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj +++ b/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj @@ -517,13 +517,13 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements; - CURRENT_PROJECT_VERSION = 92; + CURRENT_PROJECT_VERSION = 94; DEVELOPMENT_TEAM = A9BXAFS6CT; ENABLE_BITCODE = NO; INFOPLIST_FILE = Joplin/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 12.11.3; + MARKETING_VERSION = 12.11.5; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -546,12 +546,12 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements; - CURRENT_PROJECT_VERSION = 92; + CURRENT_PROJECT_VERSION = 94; DEVELOPMENT_TEAM = A9BXAFS6CT; INFOPLIST_FILE = Joplin/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 12.11.3; + MARKETING_VERSION = 12.11.5; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -698,14 +698,14 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 92; + CURRENT_PROJECT_VERSION = 94; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = A9BXAFS6CT; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = ShareExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 12.11.3; + MARKETING_VERSION = 12.11.5; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension; @@ -729,14 +729,14 @@ CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 92; + CURRENT_PROJECT_VERSION = 94; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = A9BXAFS6CT; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = ShareExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 12.11.3; + MARKETING_VERSION = 12.11.5; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/readme/changelog_android.md b/readme/changelog_android.md index b1512fdb5..4b7fafc91 100644 --- a/readme/changelog_android.md +++ b/readme/changelog_android.md @@ -1,5 +1,13 @@ # Joplin Android app changelog +## [android-v2.11.31](https://github.com/laurent22/joplin/releases/tag/android-v2.11.31) (Pre-release) - 2023-06-25T14:26:21Z + +- Improved: Upgrade E2EE encryption method to AES-256 (#7686) + +## [android-v2.11.30](https://github.com/laurent22/joplin/releases/tag/android-v2.11.30) (Pre-release) - 2023-06-20T15:21:15Z + +- New: Add support for Voice Typing for most languages (#8309) + ## [android-v2.11.27](https://github.com/laurent22/joplin/releases/tag/android-v2.11.27) (Pre-release) - 2023-06-10T15:58:58Z - Upgraded to React Native 0.71 diff --git a/readme/changelog_ios.md b/readme/changelog_ios.md index 48092d72c..852672940 100644 --- a/readme/changelog_ios.md +++ b/readme/changelog_ios.md @@ -1,5 +1,15 @@ # Joplin iOS app changelog +## [ios-v12.11.5](https://github.com/laurent22/joplin/releases/tag/ios-v12.11.5) - 2023-06-25T14:05:43Z + +- Improved: Auto-detect language on start (e48d55c) +- Improved: Updated packages @react-native-community/datetimepicker (v7), aws, buildTools, domutils (v3.1.0), react-native-document-picker (v8.2.1), react-native-reanimated (v3.1.0), react-native-safe-area-context (v4.5.3), tar (v6.1.15) +- Improved: Upgrade E2EE encryption method to AES-256 (#7686) +- Improved: When resetting the master password, also create a new master key with that password (e647775) +- Fixed: Allow certain HTML anchor tags (#8286) +- Fixed: Fix sharing data with the app (#8285) +- Fixed: Improve selection of active E2EE key (#8254) + ## [ios-v12.11.3](https://github.com/laurent22/joplin/releases/tag/ios-v12.11.3) - 2023-05-29T12:27:45Z - Improved: Implement parenting of notebooks (#7980) (#8193 by [@jcgurango](https://github.com/jcgurango)) diff --git a/yarn.lock b/yarn.lock index d5131bbf1..dbe98ac48 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1,6 +1,3 @@ -# This file is generated by running "yarn install" inside your project. -# Manual changes might be lost - proceed with caution! - __metadata: version: 6 cacheKey: 8 @@ -4434,9 +4431,9 @@ __metadata: react-native-vector-icons: 9.2.0 react-native-version-info: 1.1.1 react-native-vosk: 0.1.12 - react-native-webview: 12.4.0 + react-native-webview: 11.26.1 react-native-zip-archive: 6.0.9 - react-redux: 8.0.7 + react-redux: 7.2.9 redux: 4.2.1 rn-fetch-blob: 0.12.0 stream: 0.0.2