From eae865911e544af61dbf8db34a1dc654922e4d90 Mon Sep 17 00:00:00 2001 From: "K. Shankari" Date: Wed, 28 Aug 2024 15:56:34 -0700 Subject: [PATCH 1/3] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20=20Bump=20up=20the=20v?= =?UTF-8?q?ersions=20of=20all=20related=20plugins?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Data collection: ⬆️ foreground service permissions + restricted broadcast event https://github.com/e-mission/e-mission-data-collection/releases/tag/v1.8.9 Server communication: 🔊 if parsing response as JSON fails, include the raw response https://github.com/e-mission/cordova-server-communication/releases/tag/v1.2.7 Local notifications: ⬆️ API 34: inexact alarms + immutable notifications https://github.com/e-mission/cordova-plugin-local-notification-12/releases/tag/0.1.5-remove-exact-alarms Server sync: 🔥 Remove the NEW_DATA broadcast intent when we pull data from the server https://github.com/e-mission/cordova-server-sync/releases/tag/v1.3.3 Related server PR: ⚡️ Always return an empty server_to_phone response https://github.com/e-mission/e-mission-server/pull/978 + Bump up version numbers --- config.cordovabuild.xml | 2 +- package.cordovabuild.json | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config.cordovabuild.xml b/config.cordovabuild.xml index 858f7fd4d..011139c48 100644 --- a/config.cordovabuild.xml +++ b/config.cordovabuild.xml @@ -1,5 +1,5 @@ - + emission A commute pattern tracker and carbon footprint estimator. diff --git a/package.cordovabuild.json b/package.cordovabuild.json index 3ee023ae8..d53aad309 100644 --- a/package.cordovabuild.json +++ b/package.cordovabuild.json @@ -1,6 +1,6 @@ { "name": "edu.berkeley.eecs.emission", - "version": "3.2.8", + "version": "3.2.9", "displayName": "emission", "license": "BSD-3-Clause", "repository": { @@ -120,10 +120,10 @@ "cordova-plugin-app-version": "0.1.14", "cordova-plugin-customurlscheme": "5.0.2", "cordova-plugin-device": "2.1.0", - "cordova-plugin-em-datacollection": "git+https://github.com/e-mission/e-mission-data-collection.git#v1.8.8", + "cordova-plugin-em-datacollection": "git+https://github.com/e-mission/e-mission-data-collection.git#v1.8.9", "cordova-plugin-em-opcodeauth": "git+https://github.com/e-mission/cordova-jwt-auth.git#v1.7.2", - "cordova-plugin-em-server-communication": "git+https://github.com/e-mission/cordova-server-communication.git#v1.2.6", - "cordova-plugin-em-serversync": "git+https://github.com/e-mission/cordova-server-sync.git#v1.3.2", + "cordova-plugin-em-server-communication": "git+https://github.com/e-mission/cordova-server-communication.git#v1.2.7", + "cordova-plugin-em-serversync": "git+https://github.com/e-mission/cordova-server-sync.git#v1.3.3", "cordova-plugin-em-settings": "git+https://github.com/e-mission/cordova-connection-settings.git#v1.2.3", "cordova-plugin-em-unifiedlogger": "git+https://github.com/e-mission/cordova-unified-logger.git#v1.3.6", "cordova-plugin-em-usercache": "git+https://github.com/e-mission/cordova-usercache.git#v1.1.9", @@ -131,7 +131,7 @@ "cordova-plugin-inappbrowser": "6.0.0", "cordova-plugin-ionic-keyboard": "2.2.0", "cordova-plugin-ionic-webview": "5.0.0", - "cordova-plugin-local-notification-12": "github:e-mission/cordova-plugin-local-notification-12#v0.1.4-fix-android-action", + "cordova-plugin-local-notification-12": "github:e-mission/cordova-plugin-local-notification-12#v0.1.5-remove-exact-alarms", "cordova-plugin-x-socialsharing": "6.0.4", "cordova-plugin-bluetooth-classic-serial-port": "git+https://github.com/louisg1337/cordova-plugin-bluetooth-classic-serial-port.git", "cordova-custom-config": "^5.1.1", From dc653518f63c7314cb83e8e4999c00d3221f7f8a Mon Sep 17 00:00:00 2001 From: "K. Shankari" Date: Wed, 28 Aug 2024 16:10:04 -0700 Subject: [PATCH 2/3] =?UTF-8?q?=E2=9E=A1=EF=B8=8F=20=20Move=20dependencies?= =?UTF-8?q?=20from=20@louisg1337=202=20@e-mission?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The bluetooth plugins, with some minor hacks to support our use case, are all currently owned by @louisg1337. Moving them into the @emission org for long-term stability. --- package.cordovabuild.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.cordovabuild.json b/package.cordovabuild.json index d53aad309..d6f0ba462 100644 --- a/package.cordovabuild.json +++ b/package.cordovabuild.json @@ -133,9 +133,9 @@ "cordova-plugin-ionic-webview": "5.0.0", "cordova-plugin-local-notification-12": "github:e-mission/cordova-plugin-local-notification-12#v0.1.5-remove-exact-alarms", "cordova-plugin-x-socialsharing": "6.0.4", - "cordova-plugin-bluetooth-classic-serial-port": "git+https://github.com/louisg1337/cordova-plugin-bluetooth-classic-serial-port.git", + "cordova-plugin-bluetooth-classic-serial-port": "git+https://github.com/e-mission/cordova-plugin-bluetooth-classic-serial-port.git", "cordova-custom-config": "^5.1.1", - "com.unarin.cordova.beacon": "github:louisg1337/cordova-plugin-ibeacon", + "com.unarin.cordova.beacon": "github:e-mission/cordova-plugin-ibeacon", "core-js": "^2.5.7", "e-mission-common": "github:JGreenlee/e-mission-common#semver:0.5.4", "enketo-core": "^6.1.7", From e1895076f119efba1f154ad85bcb25ec800ffc91 Mon Sep 17 00:00:00 2001 From: "K. Shankari" Date: Wed, 28 Aug 2024 16:33:37 -0700 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=94=A5=20Downgrade=20the=20expected?= =?UTF-8?q?=20number=20of=20plugins=20to=2025?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In https://github.com/e-mission/e-mission-phone/commit/e81164c6ecb01edfced445772ab008f20e6301f9 we removed the email plugin, but we did not adjust the expected number of plugins downward Finally doing so now Testing done: Before this: ``` Found 25 plugins, expected 26 Found 25 plugins, expected 26, retrying ``` After this: ``` Found 25 plugins, expected 25 All plugins installed successfully! ``` --- setup/setup_shared_native.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/setup_shared_native.sh b/setup/setup_shared_native.sh index dfc52f072..87e652561 100644 --- a/setup/setup_shared_native.sh +++ b/setup/setup_shared_native.sh @@ -23,7 +23,7 @@ sed -i -e "s|/usr/bin/env node|/usr/bin/env node --unhandled-rejections=strict|" npx cordova prepare -EXPECTED_COUNT=26 +EXPECTED_COUNT=25 INSTALLED_COUNT=`npx cordova plugin list | wc -l` echo "Found $INSTALLED_COUNT plugins, expected $EXPECTED_COUNT" if [ $INSTALLED_COUNT -lt $EXPECTED_COUNT ];