From fb165c87c3b3b179774c145a0f7dd4007af22119 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Mon, 1 Feb 2021 17:39:45 +0000 Subject: [PATCH 1/3] Mobile: Fix search --- packages/app-mobile/components/screens/search.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/app-mobile/components/screens/search.js b/packages/app-mobile/components/screens/search.js index ee228d78aa..94de65d15b 100644 --- a/packages/app-mobile/components/screens/search.js +++ b/packages/app-mobile/components/screens/search.js @@ -10,7 +10,7 @@ const { NoteItem } = require('../note-item.js'); const { BaseScreenComponent } = require('../base-screen.js'); const { themeStyle } = require('../global-style.js'); const DialogBox = require('react-native-dialogbox').default; -const SearchEngineUtils = require('@joplin/lib/services/searchengine/SearchEngineUtils'); +const SearchEngineUtils = require('@joplin/lib/services/searchengine/SearchEngineUtils').default; const SearchEngine = require('@joplin/lib/services/searchengine/SearchEngine').default; Icon.loadFont(); From 15d85f4ee4149f5b8bab667f3aa8c3cc0234870d Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Mon, 1 Feb 2021 17:44:46 +0000 Subject: [PATCH 2/3] Android release v1.7.3 --- README.md | 2 +- packages/app-mobile/android/app/build.gradle | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 2e74510d44..56cb867eda 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ Linux | Get it on Google Play | or download the APK file: [64-bit](https://github.com/laurent22/joplin-android/releases/download/android-v1.7.2/joplin-v1.7.2.apk) [32-bit](https://github.com/laurent22/joplin-android/releases/download/android-v1.7.2/joplin-v1.7.2-32bit.apk) +Android | Get it on Google Play | or download the APK file: [64-bit](https://github.com/laurent22/joplin-android/releases/download/android-v1.7.3/joplin-v1.7.3.apk) [32-bit](https://github.com/laurent22/joplin-android/releases/download/android-v1.7.3/joplin-v1.7.3-32bit.apk) iOS | Get it on the App Store | - ## Terminal application diff --git a/packages/app-mobile/android/app/build.gradle b/packages/app-mobile/android/app/build.gradle index 15dc5a8d19..b5b985d157 100644 --- a/packages/app-mobile/android/app/build.gradle +++ b/packages/app-mobile/android/app/build.gradle @@ -141,8 +141,8 @@ android { applicationId "net.cozic.joplin" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 2097623 - versionName "1.7.2" + versionCode 2097624 + versionName "1.7.3" ndk { abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64" } From 935b4dca0a02d0e3beaff9c636bb0bf633d4485b Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Mon, 1 Feb 2021 17:57:27 +0000 Subject: [PATCH 3/3] ios-v10.7.2 --- packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj b/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj index d578b67bc6..ef6ae86607 100644 --- a/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj +++ b/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj @@ -338,13 +338,13 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 62; + CURRENT_PROJECT_VERSION = 63; DEVELOPMENT_TEAM = A9BXAFS6CT; ENABLE_BITCODE = NO; INFOPLIST_FILE = Joplin/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 10.7.1; + MARKETING_VERSION = 10.7.2; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -365,12 +365,12 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 62; + CURRENT_PROJECT_VERSION = 63; DEVELOPMENT_TEAM = A9BXAFS6CT; INFOPLIST_FILE = Joplin/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 10.7.1; + MARKETING_VERSION = 10.7.2; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC",