From 4e2d36648e926d20ba34682e058c8f03c8769720 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Tue, 22 Aug 2023 14:08:03 +0100 Subject: [PATCH 1/2] Android: Only include "armeabi-v7a", "x86", "arm64-v8a", "x86_64" in APK --- packages/app-mobile/android/app/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/app-mobile/android/app/build.gradle b/packages/app-mobile/android/app/build.gradle index ffa7ba6dec..21ce336dfd 100644 --- a/packages/app-mobile/android/app/build.gradle +++ b/packages/app-mobile/android/app/build.gradle @@ -112,9 +112,9 @@ android { targetSdkVersion rootProject.ext.targetSdkVersion versionCode 2097718 versionName "2.12.1" - // ndk { - // abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64" - // } + ndk { + abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64" + } // https://github.com/react-native-community/react-native-camera/issues/2138 missingDimensionStrategy 'react-native-camera', 'general' From 5855748e069b706e5fda621c114e3551b0646eee Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Tue, 22 Aug 2023 14:53:46 +0100 Subject: [PATCH 2/2] Android 2.12.2 --- packages/app-mobile/android/app/build.gradle | 4 ++-- readme/changelog_android.md | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/app-mobile/android/app/build.gradle b/packages/app-mobile/android/app/build.gradle index 21ce336dfd..02d09ac065 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 2097718 - versionName "2.12.1" + versionCode 2097719 + versionName "2.12.2" ndk { abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64" } diff --git a/readme/changelog_android.md b/readme/changelog_android.md index a580e8ea19..61ace4d0d8 100644 --- a/readme/changelog_android.md +++ b/readme/changelog_android.md @@ -1,5 +1,9 @@ # Joplin Android app changelog +## [android-v2.12.2](https://github.com/laurent22/joplin/releases/tag/android-v2.12.2) (Pre-release) - 2023-08-22T13:15:18Z + +- Improved: Only include "armeabi-v7a", "x86", "arm64-v8a", "x86_64" in APK (4e2d366) + ## [android-v2.12.1](https://github.com/laurent22/joplin/releases/tag/android-v2.12.1) (Pre-release) - 2023-08-19T22:32:39Z - New: Add JEX export (#8428 by Henry Heino)