From 7cfdf778de6b45320c3b7f88beb1011e3f6c21bd Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Sat, 15 Jun 2019 09:44:34 +0100 Subject: [PATCH] Android release v1.0.271 --- README.md | 2 +- ReactNativeClient/android/app/build.gradle | 4 +-- ReactNativeClient/package-lock.json | 41 ++++++++++++++++------ Tools/release-android.js | 24 ++++++------- 4 files changed, 45 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index ebe2e12399..d0019aa7f1 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.269/joplin-v1.0.269.apk) +Android | Get it on Google Play | or [Download APK File](https://github.com/laurent22/joplin-android/releases/download/android-v1.0.271/joplin-v1.0.271.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 54539ab0e3..f0d21dd1e3 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 2097505 - versionName "1.0.269" + versionCode 2097507 + versionName "1.0.271" ndk { abiFilters "armeabi-v7a", "x86" } diff --git a/ReactNativeClient/package-lock.json b/ReactNativeClient/package-lock.json index 7a4488bf3a..0ac2988ead 100644 --- a/ReactNativeClient/package-lock.json +++ b/ReactNativeClient/package-lock.json @@ -2702,7 +2702,8 @@ }, "ansi-regex": { "version": "2.1.1", - "bundled": true + "bundled": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -2720,11 +2721,13 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true + "bundled": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2737,15 +2740,18 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "concat-map": { "version": "0.0.1", - "bundled": true + "bundled": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -2848,7 +2854,8 @@ }, "inherits": { "version": "2.0.3", - "bundled": true + "bundled": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -2858,6 +2865,7 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -2870,17 +2878,20 @@ "minimatch": { "version": "3.0.4", "bundled": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true + "bundled": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -2897,6 +2908,7 @@ "mkdirp": { "version": "0.5.1", "bundled": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -2969,7 +2981,8 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true + "bundled": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -2979,6 +2992,7 @@ "once": { "version": "1.4.0", "bundled": true, + "optional": true, "requires": { "wrappy": "1" } @@ -3054,7 +3068,8 @@ }, "safe-buffer": { "version": "5.1.2", - "bundled": true + "bundled": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -3084,6 +3099,7 @@ "string-width": { "version": "1.0.2", "bundled": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -3101,6 +3117,7 @@ "strip-ansi": { "version": "3.0.1", "bundled": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -3139,11 +3156,13 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true + "bundled": true, + "optional": true }, "yallist": { "version": "3.0.3", - "bundled": true + "bundled": true, + "optional": true } } }, diff --git a/Tools/release-android.js b/Tools/release-android.js index 1b1aafd6a3..67181c07c2 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);