From bc83321d3d072577e44e0f2aeecc0efdb87291cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Gonz=C3=A1lez?= <10727467+agonper@users.noreply.github.com> Date: Mon, 28 Mar 2022 10:12:28 +0100 Subject: [PATCH 1/4] chore!: migrate to new scoped nativescript-couchbase package --- demo/package-lock.json | 41 +++--------------- .../recognizers/state/store.ts | 6 +-- src/package-lock.json | 22 +++++----- src/package.json | 2 +- .../android/nativescript_context_apis.aar | Bin 12748 -> 12569 bytes 5 files changed, 22 insertions(+), 49 deletions(-) diff --git a/demo/package-lock.json b/demo/package-lock.json index 844d7ef..6fbd2a3 100644 --- a/demo/package-lock.json +++ b/demo/package-lock.json @@ -30,9 +30,9 @@ "version": "2.0.0", "license": "Apache-2.0", "dependencies": { - "nativescript-couchbase-plugin": "^0.9.6", - "nativescript-geolocation": "^5.1.0", - "nativescript-permissions": "^1.3.9", + "@nativescript/geolocation": "^8.0.2", + "@triniwiz/nativescript-couchbase": "^1.3.1", + "nativescript-permissions": "1.3.11", "rxjs": "^6.5.5" }, "devDependencies": { @@ -437,19 +437,6 @@ "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", "dev": true }, - "../src/node_modules/nativescript-couchbase-plugin": { - "version": "0.9.6", - "resolved": "https://registry.npmjs.org/nativescript-couchbase-plugin/-/nativescript-couchbase-plugin-0.9.6.tgz", - "integrity": "sha512-kMA9KHQX82TFaGnGUhY94KLOLss4pb5QmghgoEdu1sLwd94I/f1MQ+kHWbuBOdFmdQJw5oCK+Sey+A22Nd5jgA==" - }, - "../src/node_modules/nativescript-geolocation": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/nativescript-geolocation/-/nativescript-geolocation-5.1.0.tgz", - "integrity": "sha512-1TOmcNRXydfO3hCgO/xQdbzbG3oczcw71beRxheFcQISA4KQtCSc0lf3tuVZjxY3jX8rJHnr46AZVPTi+wvz+Q==", - "dependencies": { - "nativescript-permissions": "~1.3.0" - } - }, "../src/node_modules/nativescript-permissions": { "version": "1.3.9", "resolved": "https://registry.npmjs.org/nativescript-permissions/-/nativescript-permissions-1.3.9.tgz", @@ -13852,10 +13839,10 @@ "version": "file:../src", "requires": { "@nativescript/core": "~7.3.0", + "@nativescript/geolocation": "^8.0.2", "@nativescript/types": "~7.3.0", - "nativescript-couchbase-plugin": "^0.9.6", - "nativescript-geolocation": "^5.1.0", - "nativescript-permissions": "^1.3.9", + "@triniwiz/nativescript-couchbase": "^1.3.1", + "nativescript-permissions": "1.3.11", "prompt": "^1.0.0", "rimraf": "^2.6.3", "rxjs": "^6.5.5", @@ -14196,22 +14183,8 @@ "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", "dev": true }, - "nativescript-couchbase-plugin": { - "version": "0.9.6", - "resolved": "https://registry.npmjs.org/nativescript-couchbase-plugin/-/nativescript-couchbase-plugin-0.9.6.tgz", - "integrity": "sha512-kMA9KHQX82TFaGnGUhY94KLOLss4pb5QmghgoEdu1sLwd94I/f1MQ+kHWbuBOdFmdQJw5oCK+Sey+A22Nd5jgA==" - }, - "nativescript-geolocation": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/nativescript-geolocation/-/nativescript-geolocation-5.1.0.tgz", - "integrity": "sha512-1TOmcNRXydfO3hCgO/xQdbzbG3oczcw71beRxheFcQISA4KQtCSc0lf3tuVZjxY3jX8rJHnr46AZVPTi+wvz+Q==", - "requires": { - "nativescript-permissions": "~1.3.0" - } - }, "nativescript-permissions": { - "version": "1.3.9", - "resolved": "https://registry.npmjs.org/nativescript-permissions/-/nativescript-permissions-1.3.9.tgz", + "version": "https://registry.npmjs.org/nativescript-permissions/-/nativescript-permissions-1.3.9.tgz", "integrity": "sha512-Xrt7uN/+nNMOsPziw17VQAgFe5oQX0klEqJVaoM6G7MQm5mgnySaHbVGlupcgNNib+rAgFlrmqTW0LlzuQxtIg==" }, "ncp": { diff --git a/src/internal/activity-recognition/recognizers/state/store.ts b/src/internal/activity-recognition/recognizers/state/store.ts index 7ee7f76..702c48e 100644 --- a/src/internal/activity-recognition/recognizers/state/store.ts +++ b/src/internal/activity-recognition/recognizers/state/store.ts @@ -1,5 +1,5 @@ import { HumanActivity, Resolution, StartOptions } from "../../index"; -import { Couchbase } from "nativescript-couchbase-plugin"; +import { CouchBase } from "@triniwiz/nativescript-couchbase"; export interface RecognizerStateStore { isActive(recognizer: Resolution): Promise; @@ -20,10 +20,10 @@ const DATABASE_NAME = "context-apis"; const DOC_TYPE = "recognizer-state"; class RecognizersStateStoreDb implements RecognizerStateStore { - private database: Couchbase; + private database: CouchBase; constructor() { - this.database = new Couchbase(DATABASE_NAME); + this.database = new CouchBase(DATABASE_NAME); } async isActive(recognizer: Resolution): Promise { diff --git a/src/package-lock.json b/src/package-lock.json index d001d51..b7ca303 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -10,7 +10,7 @@ "license": "Apache-2.0", "dependencies": { "@nativescript/geolocation": "^8.0.2", - "nativescript-couchbase-plugin": "^0.9.6", + "@triniwiz/nativescript-couchbase": "1.2.5", "nativescript-permissions": "1.3.11", "rxjs": "^6.5.5" }, @@ -121,6 +121,11 @@ "integrity": "sha512-Tyzh95MzFaDi9ZTAZ+YLKOv+LbjOxf4nKjL7ljWSQ+7js30Xa0gg3DxtTifqoD+oxU10VPQi8mZTWjVVpRK2MQ==", "dev": true }, + "node_modules/@triniwiz/nativescript-couchbase": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/@triniwiz/nativescript-couchbase/-/nativescript-couchbase-1.2.5.tgz", + "integrity": "sha512-mTKsLDpgm2zYlXlVBfv/nJQaarlJv/MAe6X694L/qaYk1+e1HdjqjmSQ4moISPaszJ2NfCOTAVllbcOXokOgDA==" + }, "node_modules/ansi-styles": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", @@ -424,11 +429,6 @@ "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", "dev": true }, - "node_modules/nativescript-couchbase-plugin": { - "version": "0.9.6", - "resolved": "https://registry.npmjs.org/nativescript-couchbase-plugin/-/nativescript-couchbase-plugin-0.9.6.tgz", - "integrity": "sha512-kMA9KHQX82TFaGnGUhY94KLOLss4pb5QmghgoEdu1sLwd94I/f1MQ+kHWbuBOdFmdQJw5oCK+Sey+A22Nd5jgA==" - }, "node_modules/nativescript-permissions": { "version": "1.3.11", "resolved": "https://registry.npmjs.org/nativescript-permissions/-/nativescript-permissions-1.3.11.tgz", @@ -831,6 +831,11 @@ "integrity": "sha512-Tyzh95MzFaDi9ZTAZ+YLKOv+LbjOxf4nKjL7ljWSQ+7js30Xa0gg3DxtTifqoD+oxU10VPQi8mZTWjVVpRK2MQ==", "dev": true }, + "@triniwiz/nativescript-couchbase": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/@triniwiz/nativescript-couchbase/-/nativescript-couchbase-1.2.5.tgz", + "integrity": "sha512-mTKsLDpgm2zYlXlVBfv/nJQaarlJv/MAe6X694L/qaYk1+e1HdjqjmSQ4moISPaszJ2NfCOTAVllbcOXokOgDA==" + }, "ansi-styles": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", @@ -1079,11 +1084,6 @@ "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", "dev": true }, - "nativescript-couchbase-plugin": { - "version": "0.9.6", - "resolved": "https://registry.npmjs.org/nativescript-couchbase-plugin/-/nativescript-couchbase-plugin-0.9.6.tgz", - "integrity": "sha512-kMA9KHQX82TFaGnGUhY94KLOLss4pb5QmghgoEdu1sLwd94I/f1MQ+kHWbuBOdFmdQJw5oCK+Sey+A22Nd5jgA==" - }, "nativescript-permissions": { "version": "1.3.11", "resolved": "https://registry.npmjs.org/nativescript-permissions/-/nativescript-permissions-1.3.11.tgz", diff --git a/src/package.json b/src/package.json index fc09f13..20b63dc 100644 --- a/src/package.json +++ b/src/package.json @@ -61,7 +61,7 @@ }, "dependencies": { "@nativescript/geolocation": "^8.0.2", - "nativescript-couchbase-plugin": "^0.9.6", + "@triniwiz/nativescript-couchbase": "1.2.5", "nativescript-permissions": "1.3.11", "rxjs": "^6.5.5" }, diff --git a/src/platforms/android/nativescript_context_apis.aar b/src/platforms/android/nativescript_context_apis.aar index a506ba07b9d99b87ab049d5c25ddd95369c106b8..da7b04c26e1da0f55b22b799dc47cfd1d79e8fc4 100644 GIT binary patch literal 12569 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 C8Vol8 literal 12748 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 From a23629e0cf2f688db1bf448e142c13009e2bf6c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Gonz=C3=A1lez?= <10727467+agonper@users.noreply.github.com> Date: Mon, 28 Mar 2022 10:13:17 +0100 Subject: [PATCH 2/4] chore: increase minimum sdk in demo app --- demo/app/App_Resources/Android/app.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/app/App_Resources/Android/app.gradle b/demo/app/App_Resources/Android/app.gradle index f026b3d..4474b89 100644 --- a/demo/app/App_Resources/Android/app.gradle +++ b/demo/app/App_Resources/Android/app.gradle @@ -14,7 +14,7 @@ android { ndkVersion "22.1.7171670" compileSdkVersion 30 defaultConfig { - minSdkVersion 19 + minSdkVersion 22 targetSdkVersion 30 generatedDensities = [] } From b70dbe069a44ce59d5aea5d2bc4d67fae9eb3a18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Gonz=C3=A1lez?= <10727467+agonper@users.noreply.github.com> Date: Mon, 28 Mar 2022 10:17:57 +0100 Subject: [PATCH 3/4] docs: update README stating min SDK requirement --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 5da7515..e396947 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,8 @@ What we plan to offer in the future: ### Android only +> Android SDK 22 (5.1) is required as a minimum due to the dependency of this plugin on [@triniwiz/nativescript-couchbase](https://github.com/triniwiz/nativescript-plugins/tree/master/packages/nativescript-couchbase) + #### Google Play Services conflicts Given that we rely on [nativescript-geolocation](https://github.com/NativeScript/nativescript-geolocation) and use Google Play Services APIs for activity detection on Android devices, you might find Google Play Services version conflicts with other installed plugins. From 73af31d1d5847720e34c1dbd163360f2482adbcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Gonz=C3=A1lez?= <10727467+agonper@users.noreply.github.com> Date: Mon, 28 Mar 2022 10:18:28 +0100 Subject: [PATCH 4/4] fix: improve error logging in demo --- demo/app/home/home-page.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/app/home/home-page.ts b/demo/app/home/home-page.ts index 04d1807..330c1ea 100644 --- a/demo/app/home/home-page.ts +++ b/demo/app/home/home-page.ts @@ -98,7 +98,7 @@ export function listenToActivityChanges(addListener = false) { activityRecognizers.forEach((recognizerType) => { listenToActivityChangesFor(recognizerType, addListener).catch((err) => { console.error( - `An error occurred while listening to ${recognizerType} res activity changes: ${err}` + `An error occurred while listening to ${recognizerType} res activity changes: ${JSON.stringify(err)}` ); }); }); @@ -162,7 +162,7 @@ async function prepareGeolocationProvider( await _preparing; return true; } catch (e) { - console.error(`GeolocationProvider couldn't be prepared: ${e}`); + console.error(`GeolocationProvider couldn't be prepared: ${JSON.stringify(e)}`); return false; } finally { _preparing = null;