self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-11 18:24:43 +02:00
Code Issues Releases Activity

Android: Fixed AndroidX transition issue

Browse Source
This commit is contained in:
Laurent Cozic 2019-08-14 23:44:57 +02:00
parent ea16f6e0b1
commit ba5c636dda
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ReactNativeClient/android/app/build.gradle
View File

@ -94,8 +94,8 @@ android {
applicationId "net.cozic.joplin"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 2097533
versionName "1.0.297"
versionCode 2097534
versionName "1.0.298"
ndk {
abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
}

6
ReactNativeClient/package-lock.json generated
View File

@ -3763,6 +3763,12 @@
"merge-stream": "^1.0.1"
}
},
"jetifier": {
"version": "1.6.4",
"resolved": "https://registry.npmjs.org/jetifier/-/jetifier-1.6.4.tgz",
"integrity": "sha512-+f/4OLeqY8RAmXnonI1ffeY1DR8kMNJPhv5WMFehchf7U71cjMQVKkOz1n6asz6kfVoAqKNWJz1A/18i18AcXA==",
"dev": true
},
"js-tokens": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",

3
ReactNativeClient/package.json
View File

@ -6,7 +6,7 @@
"private": true,
"scripts": {
"start": "node node_modules/react-native/local-cli/cli.js start",
"postinstall": "node ../Tools/copycss.js && node ../Tools/buildReactNativeInjectedJs.js && cd .. && npm i"
"postinstall": "node ../Tools/copycss.js && node ../Tools/buildReactNativeInjectedJs.js && npx jetify && cd .. && npm i"
},
"dependencies": {
"@react-native-community/slider": "^1.1.3",
@ -80,6 +80,7 @@
"devDependencies": {
"@babel/core": "^7.4.5",
"@babel/runtime": "^7.4.5",
"jetifier": "^1.6.4",
"metro-react-native-babel-preset": "^0.54.1",
"react-test-renderer": "^16.8.3"
}