From bafe7ba2f22504ec69d4bcaa79a1e1407a84b64d Mon Sep 17 00:00:00 2001 From: Andreas Gassmann Date: Fri, 6 Dec 2019 10:27:58 +0100 Subject: [PATCH 1/3] fix(android): use api level 28 --- build/android/Dockerfile | 2 +- config.xml | 8 +- package-lock.json | 293 +++++++++++---------------------------- package.json | 10 +- 4 files changed, 90 insertions(+), 223 deletions(-) diff --git a/build/android/Dockerfile b/build/android/Dockerfile index 3bd1ea7e..3b64385c 100644 --- a/build/android/Dockerfile +++ b/build/android/Dockerfile @@ -8,7 +8,7 @@ RUN apt-get update -y && apt-get install -y \ libcairo2-dev # android build tools version -RUN ["/opt/tools/android-accept-licenses.sh", "android update sdk --all --no-ui --filter build-tools-26.0.2,android-27"] +RUN ["/opt/tools/android-accept-licenses.sh", "android update sdk --all --no-ui --filter build-tools-28.0.3,android-28"] # create app directory RUN mkdir /app diff --git a/config.xml b/config.xml index 276f6cea..fe951718 100644 --- a/config.xml +++ b/config.xml @@ -114,11 +114,11 @@ - - + + - + @@ -152,5 +152,5 @@ - + diff --git a/package-lock.json b/package-lock.json index d1288d8c..0e57d89d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2477,6 +2477,21 @@ "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", "dev": true }, + "android-versions": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.5.0.tgz", + "integrity": "sha512-/GWUAqa2OJNlDF5VGSe3SR1QMHEPXxx54Ur56r0qQC0H9FlBr7kyBF2SgVEhzFCPbrW4UcYgVuWrq/2Ty3QvXg==", + "requires": { + "semver": "^5.4.1" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + } + } + }, "angular2-uuid": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/angular2-uuid/-/angular2-uuid-1.1.1.tgz", @@ -2595,6 +2610,11 @@ "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==", "dev": true }, + "array-ify": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz", + "integrity": "sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4=" + }, "array-union": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", @@ -3747,6 +3767,15 @@ "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", "dev": true }, + "compare-func": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-1.3.2.tgz", + "integrity": "sha1-md0LpFfh+bxyKxLAjsM+6rMfpkg=", + "requires": { + "array-ify": "^1.0.0", + "dot-prop": "^3.0.0" + } + }, "component-emitter": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", @@ -3973,222 +4002,33 @@ } }, "cordova-android": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-7.1.4.tgz", - "integrity": "sha512-Rtvu002I83uzfVyCsE6p2krFKVHt9TSAqZUATes+zH+o9cdxYGrLHY+PKCQo4SLCdSMdrkIHCDnQPTYTp/d7+g==", - "requires": { - "abbrev": "*", - "android-versions": "1.4.0", - "ansi": "*", - "balanced-match": "*", - "base64-js": "1.2.0", - "big-integer": "1.6.32", - "bplist-parser": "*", - "brace-expansion": "*", - "concat-map": "*", - "cordova-common": "2.2.5", - "cordova-registry-mapper": "*", - "elementtree": "0.1.6", - "glob": "5.0.15", - "inflight": "*", - "inherits": "*", - "minimatch": "*", - "nopt": "3.0.1", - "once": "*", - "path-is-absolute": "1.0.1", - "plist": "2.1.0", - "properties-parser": "0.2.3", - "q": "1.4.1", - "sax": "0.3.5", - "semver": "5.5.0", - "shelljs": "0.5.3", - "underscore": "*", - "unorm": "*", - "wrappy": "*", - "xmlbuilder": "8.2.2", - "xmldom": "*" - }, - "dependencies": { - "abbrev": { - "version": "1.1.1", - "bundled": true - }, - "android-versions": { - "version": "1.4.0", - "bundled": true, - "requires": { - "semver": "^5.4.1" - } - }, - "ansi": { - "version": "0.3.1", - "bundled": true - }, - "balanced-match": { - "version": "1.0.0", - "bundled": true - }, - "base64-js": { - "version": "1.2.0", - "bundled": true - }, - "big-integer": { - "version": "1.6.32", - "bundled": true - }, - "bplist-parser": { - "version": "0.1.1", - "bundled": true, - "requires": { - "big-integer": "^1.6.7" - } - }, - "brace-expansion": { - "version": "1.1.11", - "bundled": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "concat-map": { - "version": "0.0.1", - "bundled": true - }, - "cordova-common": { - "version": "2.2.5", - "bundled": true, - "requires": { - "ansi": "^0.3.1", - "bplist-parser": "^0.1.0", - "cordova-registry-mapper": "^1.1.8", - "elementtree": "0.1.6", - "glob": "^5.0.13", - "minimatch": "^3.0.0", - "plist": "^2.1.0", - "q": "^1.4.1", - "shelljs": "^0.5.3", - "underscore": "^1.8.3", - "unorm": "^1.3.3" - } - }, - "cordova-registry-mapper": { - "version": "1.1.15", - "bundled": true - }, - "elementtree": { - "version": "0.1.6", - "bundled": true, - "requires": { - "sax": "0.3.5" - } - }, - "glob": { - "version": "5.0.15", - "bundled": true, - "requires": { - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "2 || 3", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.3", - "bundled": true - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "nopt": { - "version": "3.0.1", - "bundled": true, - "requires": { - "abbrev": "1" - } - }, - "once": { - "version": "1.4.0", - "bundled": true, - "requires": { - "wrappy": "1" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true - }, - "plist": { - "version": "2.1.0", - "bundled": true, - "requires": { - "base64-js": "1.2.0", - "xmlbuilder": "8.2.2", - "xmldom": "0.1.x" - } - }, - "properties-parser": { - "version": "0.2.3", - "bundled": true - }, - "q": { - "version": "1.4.1", - "bundled": true - }, - "sax": { - "version": "0.3.5", - "bundled": true - }, - "semver": { - "version": "5.5.0", - "bundled": true - }, - "shelljs": { - "version": "0.5.3", - "bundled": true - }, - "underscore": { - "version": "1.9.1", - "bundled": true - }, - "unorm": { - "version": "1.4.1", - "bundled": true - }, - "wrappy": { - "version": "1.0.2", - "bundled": true - }, - "xmlbuilder": { - "version": "8.2.2", - "bundled": true - }, - "xmldom": { - "version": "0.1.27", - "bundled": true - } + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-8.1.0.tgz", + "integrity": "sha512-eAY6g9q3raJ4P03wNdSWC5MOW1EfxoomWNXsPhi7T6Q9yAqmxqn0sLEUjLL1Ib0LCH3nKQWBXdxapQ5LgbHu+g==", + "requires": { + "android-versions": "^1.4.0", + "compare-func": "^1.3.2", + "cordova-common": "^3.2.0", + "nopt": "^4.0.1", + "properties-parser": "^0.3.1", + "q": "^1.5.1", + "shelljs": "^0.5.3" } }, "cordova-android-support-gradle-release": { - "version": "1.4.7", - "resolved": "https://registry.npmjs.org/cordova-android-support-gradle-release/-/cordova-android-support-gradle-release-1.4.7.tgz", - "integrity": "sha512-3hDS3mBjSAEzKM4gZBze8G02/aNQgcww1CyUneuYPOYvleTPk3Q4OYkjmHHuE4FEgr4v9EY6j6bJqoX9pMZHgg==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/cordova-android-support-gradle-release/-/cordova-android-support-gradle-release-3.0.1.tgz", + "integrity": "sha512-RSW55DkSckmqhX/kjj+a1YeVdy7s/AtlZn6Qa5XMQmmA4Iogq+IF2jvInZqzCF19DbI5YE95AP7VDbRk+DdDRw==", "requires": { - "semver": "5.1.0", - "xml2js": "~0.4.19" + "q": "^1.4.1", + "semver": "5.6.0" + }, + "dependencies": { + "semver": { + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", + "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==" + } } }, "cordova-clipboard": { @@ -4883,6 +4723,14 @@ "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==", "dev": true }, + "dot-prop": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz", + "integrity": "sha1-G3CK8JSknJoOfbyteQq6U52sEXc=", + "requires": { + "is-obj": "^1.0.0" + } + }, "download": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/download/-/download-7.0.0.tgz", @@ -6733,6 +6581,11 @@ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true }, + "is-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", + "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=" + }, "is-object": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz", @@ -8741,6 +8594,14 @@ } } }, + "properties-parser": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/properties-parser/-/properties-parser-0.3.1.tgz", + "integrity": "sha1-ExbpU5/7/ZOEXjabIRAiq9R4dxo=", + "requires": { + "string.prototype.codepointat": "^0.2.0" + } + }, "proto-list": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", @@ -9460,7 +9321,8 @@ "semver": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz", - "integrity": "sha1-hfLPhVBGXE3wAM99hvawVBBqueU=" + "integrity": "sha1-hfLPhVBGXE3wAM99hvawVBBqueU=", + "dev": true }, "semver-intersect": { "version": "1.4.0", @@ -10257,6 +10119,11 @@ } } }, + "string.prototype.codepointat": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz", + "integrity": "sha512-2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg==" + }, "string.prototype.trim": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz", diff --git a/package.json b/package.json index 9352d3d6..02628bb5 100644 --- a/package.json +++ b/package.json @@ -56,8 +56,8 @@ "bignumber.js": "^9.0.0", "bip39": "^2.4.0", "com.lampa.startapp": "6.1.6", - "cordova-android": "7.1.4", - "cordova-android-support-gradle-release": "1.4.7", + "cordova-android": "8.1.0", + "cordova-android-support-gradle-release": "3.0.1", "cordova-clipboard": "1.2.1", "cordova-ios": "5.0.1", "cordova-plugin-add-swift-support": "1.7.2", @@ -181,10 +181,10 @@ }, "cordova-plugin-qrscanner": {}, "cordova-android-support-gradle-release": { - "ANDROID_SUPPORT_VERSION": "26.1.0" + "ANDROID_SUPPORT_VERSION": "28.+" }, "cordova-plugin-camera-preview": { - "ANDROID_SUPPORT_LIBRARY_VERSION": "26.1.0" + "ANDROID_SUPPORT_LIBRARY_VERSION": "28.+" }, "cordova-plugin-statusbar": {}, "ionic-plugin-deeplinks": { @@ -217,4 +217,4 @@ "cordova-plugin-airgap-security-utils": {} } } -} +} \ No newline at end of file From 52df54523dbb60170845afdbbd6d6aad742e49a5 Mon Sep 17 00:00:00 2001 From: Andreas Gassmann Date: Fri, 6 Dec 2019 10:36:05 +0100 Subject: [PATCH 2/3] fix(dependencies): lock version of camera preview plugin --- config.xml | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config.xml b/config.xml index fe951718..b51d231e 100644 --- a/config.xml +++ b/config.xml @@ -117,7 +117,7 @@ - + diff --git a/package-lock.json b/package-lock.json index 0e57d89d..4717a39a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4097,8 +4097,8 @@ "integrity": "sha512-CUCaI0mBQWHAJmF9/4n9cPk7D9y7+Iot1K2JA/7UgJouyao1i2bvLFIkIjF14x+vlfD/mhgvAs0Y9nsUcdWmqA==" }, "cordova-plugin-camera-preview": { - "version": "git+https://github.com/cordova-plugin-camera-preview/cordova-plugin-camera-preview.git#295187a528906f9938881cfc56e979c64bfc79c3", - "from": "git+https://github.com/cordova-plugin-camera-preview/cordova-plugin-camera-preview.git" + "version": "0.11.1", + "resolved": "git+https://github.com/cordova-plugin-camera-preview/cordova-plugin-camera-preview.git#295187a528906f9938881cfc56e979c64bfc79c3" }, "cordova-plugin-compat": { "version": "1.2.0", diff --git a/package.json b/package.json index 02628bb5..29295ae2 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "cordova-plugin-airgap-webview": "git+https://github.com/airgap-it/cordova-plugin-airgap-webview.git#content-filter", "cordova-plugin-app-version": "0.1.9", "cordova-plugin-audioinput": "1.0.1", - "cordova-plugin-camera-preview": "git+https://github.com/cordova-plugin-camera-preview/cordova-plugin-camera-preview.git", + "cordova-plugin-camera-preview": "0.11.1", "cordova-plugin-compat": "1.2.0", "cordova-plugin-device": "2.0.2", "cordova-plugin-device-motion": "2.0.1", From 3238c282fa2e71db989a4358089d23226cc3d7e0 Mon Sep 17 00:00:00 2001 From: Andreas Gassmann Date: Fri, 6 Dec 2019 13:35:10 +0100 Subject: [PATCH 3/3] feat(ci): change name of apk --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9a0951f1..51afc96e 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -56,14 +56,14 @@ build_android: - sed -i -e "s/version=\"0.0.0\"/version=\"$VERSION\"/g" config.xml - docker build -f build/android/Dockerfile -t $IMAGE_TAG_ANDROID_CURRENT --build-arg BUILD_NR="$CI_PIPELINE_ID" --build-arg VERSION="$VERSION" . - docker run --name $CI_PIPELINE_ID $IMAGE_TAG_ANDROID_CURRENT echo "container ran." - - docker cp $CI_PIPELINE_ID:/app/android-release-unsigned.apk android-release-unsigned-$CI_PIPELINE_ID.apk - - docker cp $CI_PIPELINE_ID:/app/android-debug.apk android-debug-$CI_PIPELINE_ID.apk + - docker cp $CI_PIPELINE_ID:/app/android-release-unsigned.apk airgap-vault-release-unsigned-$CI_PIPELINE_ID.apk + - docker cp $CI_PIPELINE_ID:/app/android-debug.apk airgap-vault-debug-$CI_PIPELINE_ID.apk after_script: - docker rm -f $CI_PIPELINE_ID || true artifacts: paths: - - android-release-unsigned-$CI_PIPELINE_ID.apk - - android-debug-$CI_PIPELINE_ID.apk + - airgap-vault-release-unsigned-$CI_PIPELINE_ID.apk + - airgap-vault-debug-$CI_PIPELINE_ID.apk build_ios: stage: native_build