From 3da20ce95cf07b54ade0b70f13bdb6edffaa3cdd Mon Sep 17 00:00:00 2001 From: Tsubasa SEKIGUCHI Date: Fri, 11 Oct 2024 01:39:40 +0900 Subject: [PATCH 1/8] bump v8.0.0 --- android/app/build.gradle | 4 ++-- android/wearable/build.gradle.kts | 4 ++-- ios/TrainLCD.xcodeproj/project.pbxproj | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 7b01f9b7f..325352e74 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -127,8 +127,8 @@ android { } prod { dimension "environment" - versionCode 70702000 - versionName "7.7.2" + versionCode 80000000 + versionName "8.0.0" } } }// Apply static values from `gradle.properties` to the `android.packagingOptions` diff --git a/android/wearable/build.gradle.kts b/android/wearable/build.gradle.kts index 56ab86491..13908fe35 100644 --- a/android/wearable/build.gradle.kts +++ b/android/wearable/build.gradle.kts @@ -39,8 +39,8 @@ android { } create("prod") { dimension = "environment" - versionCode = 70702001 - versionName = "7.7.2" + versionCode = 80000001 + versionName = "8.0.0" } } diff --git a/ios/TrainLCD.xcodeproj/project.pbxproj b/ios/TrainLCD.xcodeproj/project.pbxproj index d1c05785e..8d5645412 100644 --- a/ios/TrainLCD.xcodeproj/project.pbxproj +++ b/ios/TrainLCD.xcodeproj/project.pbxproj @@ -1457,7 +1457,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 7.7.2; + MARKETING_VERSION = 8.0.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1495,7 +1495,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 7.7.2; + MARKETING_VERSION = 8.0.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -2137,7 +2137,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 7.7.2; + MARKETING_VERSION = 8.0.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; @@ -2181,7 +2181,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 7.7.2; + MARKETING_VERSION = 8.0.0; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE -D EXPO_CONFIGURATION_DEBUG"; PRODUCT_BUNDLE_IDENTIFIER = me.tinykitten.trainlcd.watchkitapp.watchkitextension; @@ -2219,7 +2219,7 @@ GCC_C_LANGUAGE_STANDARD = gnu11; IBSC_MODULE = WatchApp_Extension; INFOPLIST_FILE = WatchApp/Schemes/Prod/Info.plist; - MARKETING_VERSION = 7.7.2; + MARKETING_VERSION = 8.0.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; @@ -2259,7 +2259,7 @@ GCC_C_LANGUAGE_STANDARD = gnu11; IBSC_MODULE = WatchApp_Extension; INFOPLIST_FILE = WatchApp/Schemes/Prod/Info.plist; - MARKETING_VERSION = 7.7.2; + MARKETING_VERSION = 8.0.0; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE -D EXPO_CONFIGURATION_DEBUG"; PRODUCT_BUNDLE_IDENTIFIER = me.tinykitten.trainlcd.watchkitapp; From 26a1e50a68803a981eb7a93f52d3326527ebd633 Mon Sep 17 00:00:00 2001 From: Tsubasa SEKIGUCHI Date: Fri, 11 Oct 2024 02:19:18 +0900 Subject: [PATCH 2/8] bump version --- android/app/build.gradle | 2 +- android/wearable/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 325352e74..a09d6951d 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -127,7 +127,7 @@ android { } prod { dimension "environment" - versionCode 80000000 + versionCode 80000010 versionName "8.0.0" } } diff --git a/android/wearable/build.gradle.kts b/android/wearable/build.gradle.kts index 13908fe35..67bcccac7 100644 --- a/android/wearable/build.gradle.kts +++ b/android/wearable/build.gradle.kts @@ -39,7 +39,7 @@ android { } create("prod") { dimension = "environment" - versionCode = 80000001 + versionCode = 80000011 versionName = "8.0.0" } } From 573e6e747a601ba8ba7e43d1e59e8fb34d16c4af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2024 10:14:02 +0000 Subject: [PATCH 3/8] Bump cookie and express in /functions Bumps [cookie](https://github.com/jshttp/cookie) and [express](https://github.com/expressjs/express). These dependencies needed to be updated together. Updates `cookie` from 0.6.0 to 0.7.1 - [Release notes](https://github.com/jshttp/cookie/releases) - [Commits](https://github.com/jshttp/cookie/compare/v0.6.0...v0.7.1) Updates `express` from 4.20.0 to 4.21.1 - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/4.21.1/History.md) - [Commits](https://github.com/expressjs/express/compare/4.20.0...4.21.1) --- updated-dependencies: - dependency-name: cookie dependency-type: indirect - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] --- functions/package-lock.json | 120 +++++++++++------------------------- 1 file changed, 35 insertions(+), 85 deletions(-) diff --git a/functions/package-lock.json b/functions/package-lock.json index 14ca6d6f1..3d5117d42 100644 --- a/functions/package-lock.json +++ b/functions/package-lock.json @@ -2649,20 +2649,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, - "node_modules/body-parser/node_modules/qs": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", - "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", - "dependencies": { - "side-channel": "^1.0.6" - }, - "engines": { - "node": ">=0.6" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -2958,9 +2944,9 @@ "peer": true }, "node_modules/cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", + "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", "engines": { "node": ">= 0.6" } @@ -3761,23 +3747,23 @@ } }, "node_modules/express": { - "version": "4.20.0", - "resolved": "https://registry.npmjs.org/express/-/express-4.20.0.tgz", - "integrity": "sha512-pLdae7I6QqShF5PnNTCVn4hI91Dx0Grkn2+IAsMTgMIKuQVte2dN9PeGSSAME2FR8anOhVA62QDIUaWVfEXVLw==", + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", + "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.6.0", + "cookie": "0.7.1", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "1.2.0", + "finalhandler": "1.3.1", "fresh": "0.5.2", "http-errors": "2.0.0", "merge-descriptors": "1.0.3", @@ -3786,11 +3772,11 @@ "parseurl": "~1.3.3", "path-to-regexp": "0.1.10", "proxy-addr": "~2.0.7", - "qs": "6.11.0", + "qs": "6.13.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", "send": "0.19.0", - "serve-static": "1.16.0", + "serve-static": "1.16.2", "setprototypeof": "1.2.0", "statuses": "2.0.1", "type-is": "~1.6.18", @@ -3949,12 +3935,12 @@ } }, "node_modules/finalhandler": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", + "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", "dependencies": { "debug": "2.6.9", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "on-finished": "2.4.1", "parseurl": "~1.3.3", @@ -3973,6 +3959,14 @@ "ms": "2.0.0" } }, + "node_modules/finalhandler/node_modules/encodeurl": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/finalhandler/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", @@ -6688,11 +6682,11 @@ "peer": true }, "node_modules/qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", "dependencies": { - "side-channel": "^1.0.4" + "side-channel": "^1.0.6" }, "engines": { "node": ">=0.6" @@ -7040,69 +7034,25 @@ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "node_modules/serve-static": { - "version": "1.16.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.0.tgz", - "integrity": "sha512-pDLK8zwl2eKaYrs8mrPZBJua4hMplRWJ1tIFksVC3FtBEBnl8dxgeHtsaMS8DhS9i4fLObaon6ABoc4/hQGdPA==", + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", + "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", "dependencies": { - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.18.0" + "send": "0.19.0" }, "engines": { "node": ">= 0.8.0" } }, - "node_modules/serve-static/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/serve-static/node_modules/debug/node_modules/ms": { + "node_modules/serve-static/node_modules/encodeurl": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" - }, - "node_modules/serve-static/node_modules/mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", - "bin": { - "mime": "cli.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/serve-static/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" - }, - "node_modules/serve-static/node_modules/send": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", - "dependencies": { - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "mime": "1.6.0", - "ms": "2.1.3", - "on-finished": "2.4.1", - "range-parser": "~1.2.1", - "statuses": "2.0.1" - }, + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", "engines": { - "node": ">= 0.8.0" + "node": ">= 0.8" } }, "node_modules/set-function-length": { From 1399705a276cf0968f6588ad33a414445f195e67 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2024 10:14:03 +0000 Subject: [PATCH 4/8] Bump send and express in /functions Bumps [send](https://github.com/pillarjs/send) and [express](https://github.com/expressjs/express). These dependencies needed to be updated together. Updates `send` from 0.18.0 to 0.19.0 - [Release notes](https://github.com/pillarjs/send/releases) - [Changelog](https://github.com/pillarjs/send/blob/master/HISTORY.md) - [Commits](https://github.com/pillarjs/send/compare/0.18.0...0.19.0) Updates `express` from 4.20.0 to 4.21.1 - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/4.21.1/History.md) - [Commits](https://github.com/expressjs/express/compare/4.20.0...4.21.1) --- updated-dependencies: - dependency-name: send dependency-type: indirect - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] --- functions/package-lock.json | 120 +++++++++++------------------------- 1 file changed, 35 insertions(+), 85 deletions(-) diff --git a/functions/package-lock.json b/functions/package-lock.json index 14ca6d6f1..3d5117d42 100644 --- a/functions/package-lock.json +++ b/functions/package-lock.json @@ -2649,20 +2649,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, - "node_modules/body-parser/node_modules/qs": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", - "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", - "dependencies": { - "side-channel": "^1.0.6" - }, - "engines": { - "node": ">=0.6" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -2958,9 +2944,9 @@ "peer": true }, "node_modules/cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", + "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", "engines": { "node": ">= 0.6" } @@ -3761,23 +3747,23 @@ } }, "node_modules/express": { - "version": "4.20.0", - "resolved": "https://registry.npmjs.org/express/-/express-4.20.0.tgz", - "integrity": "sha512-pLdae7I6QqShF5PnNTCVn4hI91Dx0Grkn2+IAsMTgMIKuQVte2dN9PeGSSAME2FR8anOhVA62QDIUaWVfEXVLw==", + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", + "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.6.0", + "cookie": "0.7.1", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "1.2.0", + "finalhandler": "1.3.1", "fresh": "0.5.2", "http-errors": "2.0.0", "merge-descriptors": "1.0.3", @@ -3786,11 +3772,11 @@ "parseurl": "~1.3.3", "path-to-regexp": "0.1.10", "proxy-addr": "~2.0.7", - "qs": "6.11.0", + "qs": "6.13.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", "send": "0.19.0", - "serve-static": "1.16.0", + "serve-static": "1.16.2", "setprototypeof": "1.2.0", "statuses": "2.0.1", "type-is": "~1.6.18", @@ -3949,12 +3935,12 @@ } }, "node_modules/finalhandler": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", + "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", "dependencies": { "debug": "2.6.9", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "on-finished": "2.4.1", "parseurl": "~1.3.3", @@ -3973,6 +3959,14 @@ "ms": "2.0.0" } }, + "node_modules/finalhandler/node_modules/encodeurl": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/finalhandler/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", @@ -6688,11 +6682,11 @@ "peer": true }, "node_modules/qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", "dependencies": { - "side-channel": "^1.0.4" + "side-channel": "^1.0.6" }, "engines": { "node": ">=0.6" @@ -7040,69 +7034,25 @@ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "node_modules/serve-static": { - "version": "1.16.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.0.tgz", - "integrity": "sha512-pDLK8zwl2eKaYrs8mrPZBJua4hMplRWJ1tIFksVC3FtBEBnl8dxgeHtsaMS8DhS9i4fLObaon6ABoc4/hQGdPA==", + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", + "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", "dependencies": { - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.18.0" + "send": "0.19.0" }, "engines": { "node": ">= 0.8.0" } }, - "node_modules/serve-static/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/serve-static/node_modules/debug/node_modules/ms": { + "node_modules/serve-static/node_modules/encodeurl": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" - }, - "node_modules/serve-static/node_modules/mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", - "bin": { - "mime": "cli.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/serve-static/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" - }, - "node_modules/serve-static/node_modules/send": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", - "dependencies": { - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "mime": "1.6.0", - "ms": "2.1.3", - "on-finished": "2.4.1", - "range-parser": "~1.2.1", - "statuses": "2.0.1" - }, + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", "engines": { - "node": ">= 0.8.0" + "node": ">= 0.8" } }, "node_modules/set-function-length": { From 1523d5bc8d4ded2ccfea06a82b01ef8094a2c118 Mon Sep 17 00:00:00 2001 From: Tsubasa SEKIGUCHI Date: Fri, 11 Oct 2024 19:29:15 +0900 Subject: [PATCH 5/8] bump version --- android/app/build.gradle | 2 +- android/wearable/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index a09d6951d..b59d9d4da 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -127,7 +127,7 @@ android { } prod { dimension "environment" - versionCode 80000010 + versionCode 80000020 versionName "8.0.0" } } diff --git a/android/wearable/build.gradle.kts b/android/wearable/build.gradle.kts index 67bcccac7..a9d37ad5f 100644 --- a/android/wearable/build.gradle.kts +++ b/android/wearable/build.gradle.kts @@ -39,7 +39,7 @@ android { } create("prod") { dimension = "environment" - versionCode = 80000011 + versionCode = 80000021 versionName = "8.0.0" } } From 35b42c0643057607a429c7fb09bff957422e8463 Mon Sep 17 00:00:00 2001 From: Tsubasa SEKIGUCHI Date: Fri, 11 Oct 2024 19:48:36 +0900 Subject: [PATCH 6/8] bump v8.0.1 --- android/app/build.gradle | 8 ++++---- android/wearable/build.gradle.kts | 8 ++++---- ios/TrainLCD.xcodeproj/project.pbxproj | 16 ++++++++-------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index b59d9d4da..d740261e6 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -122,13 +122,13 @@ android { applicationIdSuffix ".dev" versionNameSuffix "-dev" // 10203010 <- 10203(v1.2.3 version name)+01(build number)+0(Android app) - versionCode 80000010 - versionName "8.0.0" + versionCode 80001000 + versionName "8.0.1" } prod { dimension "environment" - versionCode 80000020 - versionName "8.0.0" + versionCode 80001000 + versionName "8.0.1" } } }// Apply static values from `gradle.properties` to the `android.packagingOptions` diff --git a/android/wearable/build.gradle.kts b/android/wearable/build.gradle.kts index a9d37ad5f..7f6ef4d1f 100644 --- a/android/wearable/build.gradle.kts +++ b/android/wearable/build.gradle.kts @@ -34,13 +34,13 @@ android { applicationIdSuffix = ".dev" versionNameSuffix = "-dev" // 10203011 <- 10203(v1.2.3 version name)+01(build number)+1(Wearable app) - versionCode = 80000011 - versionName = "8.0.0" + versionCode = 80001001 + versionName = "8.0.1" } create("prod") { dimension = "environment" - versionCode = 80000021 - versionName = "8.0.0" + versionCode = 80001001 + versionName = "8.0.1" } } diff --git a/ios/TrainLCD.xcodeproj/project.pbxproj b/ios/TrainLCD.xcodeproj/project.pbxproj index 8d5645412..16eb2769b 100644 --- a/ios/TrainLCD.xcodeproj/project.pbxproj +++ b/ios/TrainLCD.xcodeproj/project.pbxproj @@ -1457,7 +1457,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 8.0.0; + MARKETING_VERSION = 8.0.1; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1495,7 +1495,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 8.0.0; + MARKETING_VERSION = 8.0.1; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1586,7 +1586,7 @@ "\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"", "\"$(inherited)\"", ); - MARKETING_VERSION = 8.0.0; + MARKETING_VERSION = 8.0.1; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = "$(inherited)"; @@ -1672,7 +1672,7 @@ "\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"", "\"$(inherited)\"", ); - MARKETING_VERSION = 8.0.0; + MARKETING_VERSION = 8.0.1; MTL_ENABLE_DEBUG_INFO = NO; OTHER_CFLAGS = "$(inherited)"; OTHER_CPLUSPLUSFLAGS = "$(inherited)"; @@ -2137,7 +2137,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 8.0.0; + MARKETING_VERSION = 8.0.1; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; @@ -2181,7 +2181,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 8.0.0; + MARKETING_VERSION = 8.0.1; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE -D EXPO_CONFIGURATION_DEBUG"; PRODUCT_BUNDLE_IDENTIFIER = me.tinykitten.trainlcd.watchkitapp.watchkitextension; @@ -2219,7 +2219,7 @@ GCC_C_LANGUAGE_STANDARD = gnu11; IBSC_MODULE = WatchApp_Extension; INFOPLIST_FILE = WatchApp/Schemes/Prod/Info.plist; - MARKETING_VERSION = 8.0.0; + MARKETING_VERSION = 8.0.1; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; @@ -2259,7 +2259,7 @@ GCC_C_LANGUAGE_STANDARD = gnu11; IBSC_MODULE = WatchApp_Extension; INFOPLIST_FILE = WatchApp/Schemes/Prod/Info.plist; - MARKETING_VERSION = 8.0.0; + MARKETING_VERSION = 8.0.1; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE -D EXPO_CONFIGURATION_DEBUG"; PRODUCT_BUNDLE_IDENTIFIER = me.tinykitten.trainlcd.watchkitapp; From 88c2ac6a684f884c5435847385e3b4d3b2d2ef81 Mon Sep 17 00:00:00 2001 From: Tsubasa SEKIGUCHI Date: Mon, 14 Oct 2024 06:36:15 +0900 Subject: [PATCH 7/8] =?UTF-8?q?=E3=82=AF=E3=83=AA=E3=83=BC=E3=83=B3?= =?UTF-8?q?=E3=82=A2=E3=83=83=E3=83=97=E5=87=A6=E7=90=86=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Permitted.tsx | 3 +++ src/hooks/useResetMainState.ts | 41 +++++++++++++++++----------------- src/screens/Main.tsx | 5 +++-- src/screens/SelectBound.tsx | 1 - src/screens/SelectLine.tsx | 1 - 5 files changed, 26 insertions(+), 25 deletions(-) diff --git a/src/components/Permitted.tsx b/src/components/Permitted.tsx index 4116558c2..bb73feeba 100644 --- a/src/components/Permitted.tsx +++ b/src/components/Permitted.tsx @@ -27,6 +27,7 @@ import { useCurrentLine } from '../hooks/useCurrentLine' import useListenMessaging from '../hooks/useListenMessaging' import useReport from '../hooks/useReport' import useReportEligibility from '../hooks/useReportEligibility' +import { useResetMainState } from '../hooks/useResetMainState' import { useThemeStore } from '../hooks/useThemeStore' import { useUpdateLiveActivities } from '../hooks/useUpdateLiveActivities' import { AppTheme } from '../models/Theme' @@ -96,6 +97,7 @@ const PermittedLayout: React.FC = ({ children }: Props) => { const { sendReport, descriptionLowerLimit } = useReport(user) const reportEligibility = useReportEligibility() const badAccuracy = useBadAccuracy() + const resetMainState = useResetMainState() const viewShotRef = useRef(null) @@ -134,6 +136,7 @@ const PermittedLayout: React.FC = ({ children }: Props) => { case 0: if (Platform.OS === 'ios') { navigation.navigate('SelectBound') + resetMainState() break } handleShare() diff --git a/src/hooks/useResetMainState.ts b/src/hooks/useResetMainState.ts index a52320520..402d96685 100644 --- a/src/hooks/useResetMainState.ts +++ b/src/hooks/useResetMainState.ts @@ -1,4 +1,4 @@ -import { useEffect } from 'react' +import { useCallback } from 'react' import { useSetRecoilState } from 'recoil' import navigationState from '../store/atoms/navigation' import stationState from '../store/atoms/station' @@ -8,24 +8,23 @@ export const useResetMainState = () => { const setNavigationState = useSetRecoilState(navigationState) const setStationState = useSetRecoilState(stationState) - useEffect(() => { - return () => { - setNavigationState((prev) => ({ - ...prev, - headerState: isJapanese ? 'CURRENT' : 'CURRENT_EN', - bottomState: 'LINE', - leftStations: [], - stationForHeader: null, - })) - setStationState((prev) => ({ - ...prev, - selectedDirection: null, - selectedBound: null, - arrived: true, - approaching: false, - averageDistance: null, - })) - } - // eslint-disable-next-line react-hooks/exhaustive-deps - }, []) + const reset = useCallback(() => { + setNavigationState((prev) => ({ + ...prev, + headerState: isJapanese ? 'CURRENT' : 'CURRENT_EN', + bottomState: 'LINE', + leftStations: [], + stationForHeader: null, + })) + setStationState((prev) => ({ + ...prev, + selectedDirection: null, + selectedBound: null, + arrived: true, + approaching: false, + averageDistance: null, + })) + }, [setNavigationState, setStationState]) + + return reset } diff --git a/src/screens/Main.tsx b/src/screens/Main.tsx index 68b9a9326..85d42f057 100644 --- a/src/screens/Main.tsx +++ b/src/screens/Main.tsx @@ -154,7 +154,7 @@ const MainScreen: React.FC = () => { useRefreshStation() useKeepAwake() useStartBackgroundLocationUpdates() - useResetMainState() + const resetMainState = useResetMainState() useTTS() const { pause: pauseBottomTimer } = useUpdateBottomState() @@ -262,11 +262,12 @@ const MainScreen: React.FC = () => { 'hardwareBackPress', () => { navigation.navigate('SelectBound') + resetMainState() return true } ) return subscription.remove - }, [navigation]) + }, [navigation, resetMainState]) const marginForMetroThemeStyle = useMemo( () => ({ diff --git a/src/screens/SelectBound.tsx b/src/screens/SelectBound.tsx index a54cb7819..897dc738d 100644 --- a/src/screens/SelectBound.tsx +++ b/src/screens/SelectBound.tsx @@ -107,7 +107,6 @@ const SelectBoundScreen: React.FC = () => { trainType: null, bottomState: 'LINE', leftStations: [], - stationForHeader: null, fetchedTrainTypes: [], })) navigation.navigate('SelectLine') diff --git a/src/screens/SelectLine.tsx b/src/screens/SelectLine.tsx index 1a86fd423..a7842292b 100644 --- a/src/screens/SelectLine.tsx +++ b/src/screens/SelectLine.tsx @@ -131,7 +131,6 @@ const SelectLineScreen: React.FC = () => { ...prev, trainType: line.station?.trainType ?? null, leftStations: [], - stationForHeader: null, })) setLineState((prev) => ({ ...prev, From a8f90dcd63848f43a62ee33e67cd74d6dac097e3 Mon Sep 17 00:00:00 2001 From: Tsubasa SEKIGUCHI Date: Mon, 14 Oct 2024 06:39:11 +0900 Subject: [PATCH 8/8] =?UTF-8?q?=E3=82=AF=E3=83=A9=E3=83=83=E3=82=B7?= =?UTF-8?q?=E3=83=A5=E3=81=99=E3=82=8B=E3=83=90=E3=82=B0=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/TrainTypeInfoModal.tsx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/components/TrainTypeInfoModal.tsx b/src/components/TrainTypeInfoModal.tsx index 3741c1f7a..0d5529326 100644 --- a/src/components/TrainTypeInfoModal.tsx +++ b/src/components/TrainTypeInfoModal.tsx @@ -4,7 +4,7 @@ import { Modal, ScrollView, StyleSheet, View } from 'react-native' import { RFValue } from 'react-native-responsive-fontsize' import { useSafeAreaInsets } from 'react-native-safe-area-context' import { useRecoilValue } from 'recoil' -import { Line, Station, TrainType } from '../../gen/proto/stationapi_pb' +import { Station, TrainType } from '../../gen/proto/stationapi_pb' import { LED_THEME_BG_COLOR } from '../constants' import { useThemeStore } from '../hooks/useThemeStore' import { APP_THEME } from '../models/Theme' @@ -78,7 +78,7 @@ export const TrainTypeInfoModal: React.FC = ({ ? 0 : a.trainType?.id - b.trainType?.id ) - : ([selectedLine] as Line[]), + : [selectedLine], [selectedLine, trainType?.lines] ) @@ -186,11 +186,11 @@ export const TrainTypeInfoModal: React.FC = ({ flexDirection: 'row', alignItems: 'center', }} - key={l.id} + key={l?.id} > = ({ flex: 1, }} > - {isJapanese ? l.nameShort : l.nameRoman}:{' '} + {(isJapanese ? l?.nameShort : l?.nameRoman) ?? ''}:{' '} = ({ }} > {isJapanese - ? l.trainType?.name ?? '普通/各駅停車' - : l.trainType?.nameRoman ?? 'Local'} + ? l?.trainType?.name ?? '普通/各駅停車' + : l?.trainType?.nameRoman ?? 'Local'} ))}