From c6afbb69781b8862ea68ecb024f2dc0f9e35124a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Mon, 26 Nov 2018 10:55:55 +0100 Subject: [PATCH] Bump to v1.0.9. --- MiRCART-cordoba/config.xml | 2 +- MiRCART-cordoba/package-lock.json | 4 ++-- MiRCART-cordoba/package.json | 2 +- .../android/app/src/main/AndroidManifest.xml | 2 +- .../src/main/assets/www/assets/html/help.html | 2 +- .../assets/www/assets/shell/bump-version.sh | 2 +- .../main/assets/www/assets/text/LICENCE.MIT | 19 +++++++++++++++++++ .../www/assets/text/{LICENCE => LICENCE.asdf} | 0 .../app/src/main/assets/www/assets/text/TODO | 1 - .../app/src/main/assets/www/index.html | 2 +- .../android/app/src/main/res/xml/config.xml | 2 +- MiRCART-nw/package-lock.json | 2 +- MiRCART-nw/package.json | 2 +- assets/html/help.html | 2 +- assets/text/TODO | 1 - index.html | 2 +- 16 files changed, 32 insertions(+), 15 deletions(-) create mode 100644 MiRCART-cordoba/platforms/android/app/src/main/assets/www/assets/text/LICENCE.MIT rename MiRCART-cordoba/platforms/android/app/src/main/assets/www/assets/text/{LICENCE => LICENCE.asdf} (100%) diff --git a/MiRCART-cordoba/config.xml b/MiRCART-cordoba/config.xml index fe88b83..6f77ade 100644 --- a/MiRCART-cordoba/config.xml +++ b/MiRCART-cordoba/config.xml @@ -1,5 +1,5 @@ - + Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>, based on work by JOLLO NET NA diff --git a/MiRCART-cordoba/package-lock.json b/MiRCART-cordoba/package-lock.json index 48e3661..a96a6bc 100644 --- a/MiRCART-cordoba/package-lock.json +++ b/MiRCART-cordoba/package-lock.json @@ -1,6 +1,6 @@ { "name": "MiRCART-cordoba", - "version": "1.0.8", + "version": "1.0.9", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -127,7 +127,7 @@ } }, "inflight": { - "version": "1.0.8", + "version": "1.0.9", "bundled": true, "requires": { "once": "^1.3.0", diff --git a/MiRCART-cordoba/package.json b/MiRCART-cordoba/package.json index 7d6cfcd..fecc802 100644 --- a/MiRCART-cordoba/package.json +++ b/MiRCART-cordoba/package.json @@ -30,5 +30,5 @@ "scripts": { "test": "echo \"Error: no test specified\" && exit 1" }, - "version": "1.0.8" + "version": "1.0.9" } diff --git a/MiRCART-cordoba/platforms/android/app/src/main/AndroidManifest.xml b/MiRCART-cordoba/platforms/android/app/src/main/AndroidManifest.xml index 68deae1..c080244 100644 --- a/MiRCART-cordoba/platforms/android/app/src/main/AndroidManifest.xml +++ b/MiRCART-cordoba/platforms/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/MiRCART-cordoba/platforms/android/app/src/main/assets/www/assets/html/help.html b/MiRCART-cordoba/platforms/android/app/src/main/assets/www/assets/html/help.html index 0610185..ee38bea 100644 --- a/MiRCART-cordoba/platforms/android/app/src/main/assets/www/assets/html/help.html +++ b/MiRCART-cordoba/platforms/android/app/src/main/assets/www/assets/html/help.html @@ -7,7 +7,7 @@ - MiRCART v1.0.8 documentation + MiRCART v1.0.9 documentation diff --git a/MiRCART-cordoba/platforms/android/app/src/main/assets/www/assets/shell/bump-version.sh b/MiRCART-cordoba/platforms/android/app/src/main/assets/www/assets/shell/bump-version.sh index ebedfdc..c4429ca 100755 --- a/MiRCART-cordoba/platforms/android/app/src/main/assets/www/assets/shell/bump-version.sh +++ b/MiRCART-cordoba/platforms/android/app/src/main/assets/www/assets/shell/bump-version.sh @@ -50,7 +50,7 @@ main() { rc sed -i"" '/"version":/s/\("version":\s*\)"'"${_version_old}"'"/\1"'"${_version_new}"'"/' \ MiRCART-nw/package.json \ MiRCART-nw/package-lock.json; - rc sed -i"" '/[^<]\+ v/s/\(<title>[^<]\+ v\)'"${_version_old}"'\(<\)/\1'"${_version_new}"'\2/' \ + rc sed -i"" '/<title>[^<]\+ v/s/\(<title>[^<]\+ v\)'"${_version_old}"'\(.*<\)/\1'"${_version_new}"'\2/' \ index.html assets/html/help.html; rc rsync -aiLPv --delete \ MiRCART-cordoba/www/ \ diff --git a/MiRCART-cordoba/platforms/android/app/src/main/assets/www/assets/text/LICENCE.MIT b/MiRCART-cordoba/platforms/android/app/src/main/assets/www/assets/text/LICENCE.MIT new file mode 100644 index 0000000..7381187 --- /dev/null +++ b/MiRCART-cordoba/platforms/android/app/src/main/assets/www/assets/text/LICENCE.MIT @@ -0,0 +1,19 @@ +Copyright (c) 2018 Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/MiRCART-cordoba/platforms/android/app/src/main/assets/www/assets/text/LICENCE b/MiRCART-cordoba/platforms/android/app/src/main/assets/www/assets/text/LICENCE.asdf similarity index 100% rename from MiRCART-cordoba/platforms/android/app/src/main/assets/www/assets/text/LICENCE rename to MiRCART-cordoba/platforms/android/app/src/main/assets/www/assets/text/LICENCE.asdf diff --git a/MiRCART-cordoba/platforms/android/app/src/main/assets/www/assets/text/TODO b/MiRCART-cordoba/platforms/android/app/src/main/assets/www/assets/text/TODO index 4d4c7ef..ea6fa13 100644 --- a/MiRCART-cordoba/platforms/android/app/src/main/assets/www/assets/text/TODO +++ b/MiRCART-cordoba/platforms/android/app/src/main/assets/www/assets/text/TODO @@ -18,4 +18,3 @@ In progress: 7) always prompt on close window/exit/... 8) always prompt on new 9) save to text file @ standalone app -10) bump version to 1.0.8, deploy-all.sh, upblog releases to github diff --git a/MiRCART-cordoba/platforms/android/app/src/main/assets/www/index.html b/MiRCART-cordoba/platforms/android/app/src/main/assets/www/index.html index 4d41826..deb19d3 100644 --- a/MiRCART-cordoba/platforms/android/app/src/main/assets/www/index.html +++ b/MiRCART-cordoba/platforms/android/app/src/main/assets/www/index.html @@ -9,7 +9,7 @@ <link charset="utf-8" href="assets/css/sally.css" rel="stylesheet" type="text/css" /> <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" /> <meta content="width=device-width, maximum-scale=1.0, user-scalable=yes" name="viewport" /> - <title>MiRCART v1.0.8 + MiRCART v1.0.9 diff --git a/MiRCART-cordoba/platforms/android/app/src/main/res/xml/config.xml b/MiRCART-cordoba/platforms/android/app/src/main/res/xml/config.xml index 8dec8b7..fe3310c 100644 --- a/MiRCART-cordoba/platforms/android/app/src/main/res/xml/config.xml +++ b/MiRCART-cordoba/platforms/android/app/src/main/res/xml/config.xml @@ -1,5 +1,5 @@ - + diff --git a/MiRCART-nw/package-lock.json b/MiRCART-nw/package-lock.json index 22ae8bc..f44108e 100644 --- a/MiRCART-nw/package-lock.json +++ b/MiRCART-nw/package-lock.json @@ -1,5 +1,5 @@ { "name": "MiRCART", - "version": "1.0.8", + "version": "1.0.9", "lockfileVersion": 1 } diff --git a/MiRCART-nw/package.json b/MiRCART-nw/package.json index 8041710..b686791 100644 --- a/MiRCART-nw/package.json +++ b/MiRCART-nw/package.json @@ -18,7 +18,7 @@ "scripts": { "test": "echo \"Error: no test specified\" && exit 1" }, - "version": "1.0.8", + "version": "1.0.9", "window": { "title": "MiRCART (standalone NW app)", "toolbar": true, diff --git a/assets/html/help.html b/assets/html/help.html index 0610185..ee38bea 100644 --- a/assets/html/help.html +++ b/assets/html/help.html @@ -7,7 +7,7 @@ - MiRCART v1.0.8 documentation + MiRCART v1.0.9 documentation diff --git a/assets/text/TODO b/assets/text/TODO index 4d4c7ef..ea6fa13 100644 --- a/assets/text/TODO +++ b/assets/text/TODO @@ -18,4 +18,3 @@ In progress: 7) always prompt on close window/exit/... 8) always prompt on new 9) save to text file @ standalone app -10) bump version to 1.0.8, deploy-all.sh, upblog releases to github diff --git a/index.html b/index.html index 4d41826..deb19d3 100644 --- a/index.html +++ b/index.html @@ -9,7 +9,7 @@ - MiRCART v1.0.8 + MiRCART v1.0.9