Browse Source

Fixes https://github.com/lesspass/lesspass/issues/467

Install Jetifier tool to migrate support-library-dependent libraries to rely on the equivalent AndroidX package.
pull/478/head
Guillaume Vincent 5 years ago
parent
commit
3e7d66abae
8 changed files with 786 additions and 767 deletions
  1. +1
    -0
      bin/tag
  2. +4
    -4
      mobile/android/app/src/main/java/com/lesspass/android/MainActivity.java
  3. +1
    -1
      mobile/android/build.gradle
  4. +2
    -0
      mobile/android/gradle.properties
  5. +9
    -7
      mobile/package.json
  6. +1
    -1
      mobile/src/settings/SettingsScreen.js
  7. +3
    -0
      mobile/src/version.json
  8. +765
    -754
      mobile/yarn.lock

+ 1
- 0
bin/tag View File

@@ -43,6 +43,7 @@ function replace_versions_in_files {
sed -i "s/\"version\": \"${1}\"/\"version\": \"${2}\"/g" package.json
sed -i "s/__version__ = \"${1}\"/__version__ = \"${2}\"/g" cli/lesspass/version.py
sed -i "s/\"version\": \"${1}\"/\"version\": \"${2}\"/g" mobile/package.json
sed -i "s/\"version\": \"${1}\"/\"version\": \"${2}\"/g" mobile/src/version.json
sed -i "s/\"version\": \"${1}\"/\"version\": \"${2}\"/g" packages/lesspass/package.json
sed -i "s/\"lesspass-entropy\": \"${1}\"/\"lesspass-entropy\": \"${2}\"/g" packages/lesspass/package.json
sed -i "s/\"lesspass-fingerprint\": \"${1}\"/\"lesspass-fingerprint\": \"${2}\"/g" packages/lesspass/package.json


+ 4
- 4
mobile/android/app/src/main/java/com/lesspass/android/MainActivity.java View File

@@ -14,10 +14,10 @@ public class MainActivity extends ReactActivity {
@Override
protected ReactActivityDelegate createReactActivityDelegate() {
return new ReactActivityDelegate(this, getMainComponentName()) {
@Override
protected ReactRootView createRootView() {
return new RNGestureHandlerEnabledRootView(MainActivity.this);
}
@Override
protected ReactRootView createRootView() {
return new RNGestureHandlerEnabledRootView(MainActivity.this);
}
};
}
}

+ 1
- 1
mobile/android/build.gradle View File

@@ -28,7 +28,7 @@ allprojects {

ext {
buildToolsVersion = "28.0.3"
minSdkVersion = 16
minSdkVersion = 21
compileSdkVersion = 28
targetSdkVersion = 28
supportLibVersion = "28.0.0"


+ 2
- 0
mobile/android/gradle.properties View File

@@ -16,3 +16,5 @@
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
android.useAndroidX=true
android.enableJetifier=true

+ 9
- 7
mobile/package.json View File

@@ -10,7 +10,8 @@
},
"scripts": {
"start": "node node_modules/react-native/local-cli/cli.js start",
"test": "jest"
"test": "jest",
"postinstall": "jetify"
},
"dependencies": {
"axios": "0.19.0",
@@ -18,20 +19,20 @@
"fuse.js": "^3.4.4",
"lesspass-fingerprint": "latest",
"lesspass-render-password": "latest",
"lodash": "^4.17.11",
"lodash": "^4.17.15",
"memoize-one": "^5.0.4",
"react": "^16.8.6",
"react-native": "^0.60.3",
"react-native": "^0.60.5",
"react-native-gesture-handler": "^1.1.0",
"react-native-keychain": "^3.1.1",
"react-native-paper": "^2.15.2",
"react-native-touch-id": "^4.4.1",
"react-native-vector-icons": "^6.4.2",
"react-navigation": "^3.6.1",
"react-navigation-material-bottom-tabs": "1.0.0",
"react-navigation": "^4.0.0",
"react-navigation-material-bottom-tabs": "^1.1.1",
"react-redux": "^7.0.1",
"redux": "^4.0.1",
"redux-persist": "5.10.0",
"redux-persist": "^6.0.0",
"redux-thunk": "2.3.0"
},
"devDependencies": {
@@ -39,7 +40,8 @@
"@babel/runtime": "^7.4.3",
"babel-jest": "^24.7.1",
"jest": "^24.7.1",
"metro-react-native-babel-preset": "^0.55.0",
"jetifier": "^1.6.4",
"metro-react-native-babel-preset": "^0.56.0",
"react-test-renderer": "^16.8.6"
},
"jest": {


+ 1
- 1
mobile/src/settings/SettingsScreen.js View File

@@ -10,7 +10,7 @@ import TextInputModal from "./TextInputModal";
import Switch from "../ui/Switch";
import KeepMasterPasswordOption from "./KeepMasterPasswordOption";
import Theme from "../ui/Theme";
import { version } from "../../package.json";
import { version } from "../version.json";

export class SettingsScreen extends Component {
constructor(props) {


+ 3
- 0
mobile/src/version.json View File

@@ -0,0 +1,3 @@
{
"version": "9.0.0"
}

+ 765
- 754
mobile/yarn.lock
File diff suppressed because it is too large
View File


Loading…
Cancel
Save