Skip to content

Commit

Permalink
various updates for Android
Browse files Browse the repository at this point in the history
  • Loading branch information
XilinJia committed Mar 14, 2024
1 parent c27e8af commit b88929b
Show file tree
Hide file tree
Showing 21 changed files with 4,030 additions and 4,201 deletions.
672 changes: 336 additions & 336 deletions .yarn/releases/yarn-4.0.2.cjs → .yarn/releases/yarn-4.1.1.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ nmHoistingLimits: workspaces

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.0.2.cjs
yarnPath: .yarn/releases/yarn-4.1.1.cjs
19 changes: 6 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,21 +60,14 @@ As this is a fork from Joplin with substantial new development, it's imaginable

## Change logs

### Version 2.15.0

This is a major updates based on massive technical enhancements.
* Large and broad dependencies updates
* Code quality enhancements
* Converted many JavaScript codes to TypeScript
* Converted most CJS syntax to ESM
* Replaced many usage of 'any'
* Clarified many signatures of functions and interfaces
* Ensured strict type and null safety checking
* Fixed a major problems in editor and local files sync related to Android 11 and newer

### Version 2.15.1

Fixed sidebar display issue on desktop
* on desktop, fixed sidebar display issue
* on Android:
* removed fingerprint function due to security vulnerability of the dependency
* migrated to the well maintained library react-native-vision-camera for camera functions
* set newArchEnabled=false as some dependencies don't support fabric yet
* fixed "text must be in <Text>" bug

### Prior versions:
[Desktop](readme/about/changelog/desktop.md)
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"node-gyp": "10.0.1",
"nodemon": "3.0.3"
},
"packageManager": "yarn@4.0.2",
"packageManager": "yarn@4.1.1",
"resolutions": {
"[email protected]": "patch:app-builder-lib@npm%3A24.4.0#./.yarn/patches/app-builder-lib-npm-24.4.0-05322ff057.patch"
}
Expand Down
12 changes: 6 additions & 6 deletions packages/app-mobile/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -112,14 +112,14 @@ android {
applicationId "ac.mdiq.xilinota"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 2097727
versionName "2.15.0"
versionCode 2097728
versionName "2.15.1"
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'
// missingDimensionStrategy 'react-native-camera', 'general'

// Needed to fix: The number of method references in a .dex file cannot exceed 64K
multiDexEnabled true
Expand Down Expand Up @@ -212,9 +212,9 @@ android {
dependencies {
// This removes proprietary bits to enable inclusion in F-Droid
// https://gitlab.com/fdroid/rfp/-/issues/434#note_443458711
implementation (project(':react-native-camera')){
exclude group: 'com.google.android.gms', module: 'play-services-vision'
}
// implementation (project(':react-native-camera')){
// exclude group: 'com.google.android.gms', module: 'play-services-vision'
// }

// implementation fileTree(dir: "libs", include: ["*.jar"])

Expand Down
201 changes: 0 additions & 201 deletions packages/app-mobile/android/app/build.gradle.bak

This file was deleted.

7 changes: 4 additions & 3 deletions packages/app-mobile/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,12 @@ allprojects {
// https://search.maven.org/artifact/com.alphacephei/vosk-android/0.3.46/aar
maven { url "https://maven.apache.org" }

maven {
// fingerprint is disabled
// maven {
// Required by react-native-fingerprint-scanner
// https://github.com/hieuvp/react-native-fingerprint-scanner/issues/192
url "https://maven.aliyun.com/repository/jcenter"
}
// url "https://maven.aliyun.com/repository/jcenter"
// }

// Also required for react-native-vosk?
maven { url "https://maven.google.com" }
Expand Down
2 changes: 1 addition & 1 deletion packages/app-mobile/android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
# your application. You should enable this flag either if you want
# to write custom TurboModules/Fabric components OR use libraries that
# are providing them.
newArchEnabled=true
newArchEnabled=false

# Use this property to enable or disable the Hermes JS engine.
# If set to false, you will be using JSC instead.
Expand Down
Loading

0 comments on commit b88929b

Please sign in to comment.