From 075e55c0777b41881a7a4ff278365a5b62a9202c Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Sat, 15 Jun 2019 01:23:12 +0100 Subject: [PATCH] Android release v1.0.269 --- README.md | 2 +- ReactNativeClient/android/app/build.gradle | 4 +- ReactNativeClient/android/build.gradle | 20 ++++----- ReactNativeClient/package-lock.json | 47 +++++++--------------- ReactNativeClient/package.json | 2 +- Tools/release-android.js | 24 +++++------ docs/index.html | 2 +- 7 files changed, 41 insertions(+), 60 deletions(-) diff --git a/README.md b/README.md index 0af3e52ba..ebe2e1239 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Linux | Get it on Google Play | or [Download APK File](https://github.com/laurent22/joplin-android/releases/download/android-v1.0.261/joplin-v1.0.261.apk) +Android | Get it on Google Play | or [Download APK File](https://github.com/laurent22/joplin-android/releases/download/android-v1.0.269/joplin-v1.0.269.apk) iOS | Get it on the App Store | - ## Terminal application diff --git a/ReactNativeClient/android/app/build.gradle b/ReactNativeClient/android/app/build.gradle index 19f439b72..54539ab0e 100644 --- a/ReactNativeClient/android/app/build.gradle +++ b/ReactNativeClient/android/app/build.gradle @@ -94,8 +94,8 @@ android { applicationId "net.cozic.joplin" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 2097497 - versionName "1.0.261" + versionCode 2097505 + versionName "1.0.269" ndk { abiFilters "armeabi-v7a", "x86" } diff --git a/ReactNativeClient/android/build.gradle b/ReactNativeClient/android/build.gradle index d418a552f..c788fba00 100644 --- a/ReactNativeClient/android/build.gradle +++ b/ReactNativeClient/android/build.gradle @@ -41,14 +41,14 @@ allprojects { // TODO: Maybe remove this (forgot why it was needed - probably to make some module work) -// subprojects { -// afterEvaluate {project -> -// if (project.hasProperty("android")) { -// android { -// compileSdkVersion 28 -// buildToolsVersion "28.0.3" -// } -// } -// } -// } +subprojects { + afterEvaluate {project -> + if (project.hasProperty("android")) { + android { + compileSdkVersion 28 + buildToolsVersion "28.0.3" + } + } + } +} diff --git a/ReactNativeClient/package-lock.json b/ReactNativeClient/package-lock.json index cbde00d9e..7a4488bf3 100644 --- a/ReactNativeClient/package-lock.json +++ b/ReactNativeClient/package-lock.json @@ -2702,8 +2702,7 @@ }, "ansi-regex": { "version": "2.1.1", - "bundled": true, - "optional": true + "bundled": true }, "aproba": { "version": "1.2.0", @@ -2721,13 +2720,11 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true, - "optional": true + "bundled": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2740,18 +2737,15 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "concat-map": { "version": "0.0.1", - "bundled": true, - "optional": true + "bundled": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "core-util-is": { "version": "1.0.2", @@ -2854,8 +2848,7 @@ }, "inherits": { "version": "2.0.3", - "bundled": true, - "optional": true + "bundled": true }, "ini": { "version": "1.3.5", @@ -2865,7 +2858,6 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -2878,20 +2870,17 @@ "minimatch": { "version": "3.0.4", "bundled": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true, - "optional": true + "bundled": true }, "minipass": { "version": "2.3.5", "bundled": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -2908,7 +2897,6 @@ "mkdirp": { "version": "0.5.1", "bundled": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -2981,8 +2969,7 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true, - "optional": true + "bundled": true }, "object-assign": { "version": "4.1.1", @@ -2992,7 +2979,6 @@ "once": { "version": "1.4.0", "bundled": true, - "optional": true, "requires": { "wrappy": "1" } @@ -3068,8 +3054,7 @@ }, "safe-buffer": { "version": "5.1.2", - "bundled": true, - "optional": true + "bundled": true }, "safer-buffer": { "version": "2.1.2", @@ -3099,7 +3084,6 @@ "string-width": { "version": "1.0.2", "bundled": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -3117,7 +3101,6 @@ "strip-ansi": { "version": "3.0.1", "bundled": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -3156,13 +3139,11 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true, - "optional": true + "bundled": true }, "yallist": { "version": "3.0.3", - "bundled": true, - "optional": true + "bundled": true } } }, @@ -5581,9 +5562,9 @@ } }, "react-native-file-viewer": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/react-native-file-viewer/-/react-native-file-viewer-1.0.5.tgz", - "integrity": "sha512-/5lwmVPliEOIJMoRby9tb1s9VPxUH1ru7BfdCKxZAwZI5LoOY1qHZuUMtCHAlIKLH1DHu8fhjleJuXbRHaCuLQ==" + "version": "1.0.15", + "resolved": "https://registry.npmjs.org/react-native-file-viewer/-/react-native-file-viewer-1.0.15.tgz", + "integrity": "sha512-XrJaY8iAH35sPOq00fzJ9Wo8co84mUElp4IILVpbt6U2fPQ52f9FKJmBrpSOAyP1gZvLaxieH1mreoOq/rSenw==" }, "react-native-fs": { "version": "2.11.17", diff --git a/ReactNativeClient/package.json b/ReactNativeClient/package.json index 3f0be768f..d7791cd15 100644 --- a/ReactNativeClient/package.json +++ b/ReactNativeClient/package.json @@ -47,7 +47,7 @@ "react-native-dialogbox": "^0.6.10", "react-native-document-picker": "^2.3.0", "react-native-dropdownalert": "^3.1.2", - "react-native-file-viewer": "^1.0.5", + "react-native-file-viewer": "^1.0.15", "react-native-fs": "^2.11.17", "react-native-image-picker": "^0.26.7", "react-native-image-resizer": "^1.0.0", diff --git a/Tools/release-android.js b/Tools/release-android.js index 67181c07c..1b1aafd6a 100644 --- a/Tools/release-android.js +++ b/Tools/release-android.js @@ -64,19 +64,19 @@ async function main() { console.info('Building APK file v' + version + '...'); let restoreDir = null; - let apkBuildCmd = 'assembleRelease -PbuildDir=build'; // --console plain - if (await fileExists('/mnt/c/Windows/System32/cmd.exe')) { - apkBuildCmd = '/mnt/c/Windows/System32/cmd.exe /c "cd ReactNativeClient\\android && gradlew.bat ' + apkBuildCmd + '"'; - } else { - process.chdir(rnDir + '/android'); - apkBuildCmd = './gradlew ' + apkBuildCmd; - restoreDir = rootDir; - } + // let apkBuildCmd = 'assembleRelease -PbuildDir=build'; // --console plain + // if (await fileExists('/mnt/c/Windows/System32/cmd.exe')) { + // apkBuildCmd = '/mnt/c/Windows/System32/cmd.exe /c "cd ReactNativeClient\\android && gradlew.bat ' + apkBuildCmd + '"'; + // } else { + // process.chdir(rnDir + '/android'); + // apkBuildCmd = './gradlew ' + apkBuildCmd; + // restoreDir = rootDir; + // } - // const output = await execCommand('/mnt/c/Windows/System32/cmd.exe /c "cd ReactNativeClient\\android && gradlew.bat assembleRelease -PbuildDir=build --console plain"'); - console.info(apkBuildCmd); - const output = await execCommand(apkBuildCmd); - console.info(output); + // // const output = await execCommand('/mnt/c/Windows/System32/cmd.exe /c "cd ReactNativeClient\\android && gradlew.bat assembleRelease -PbuildDir=build --console plain"'); + // console.info(apkBuildCmd); + // const output = await execCommand(apkBuildCmd); + // console.info(output); if (restoreDir) process.chdir(restoreDir); diff --git a/docs/index.html b/docs/index.html index 871c91af8..f17890a42 100644 --- a/docs/index.html +++ b/docs/index.html @@ -317,7 +317,7 @@ Android Get it on Google Play -or Download APK File +or Download APK File iOS