From 799d34738cab8b44f8ca757bf3b72a46ef1fe000 Mon Sep 17 00:00:00 2001 From: Tsubasa SEKIGUCHI Date: Wed, 16 Sep 2026 00:42:29 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A8=BA=E6=96=AD=E6=83=85=E5=A0=B1?= =?UTF-8?q?=E3=81=AB=E5=B9=B3=E6=BB=91=E5=8C=96=E3=81=AE=E5=88=A4=E5=AE=9A?= =?UTF-8?q?=E6=9D=90=E6=96=99=E3=81=A8=E7=B5=90=E6=9E=9C=E3=82=92=E8=B6=B3?= =?UTF-8?q?=E3=81=97=E3=81=A6=E5=9C=B0=E4=B8=8B=E9=89=84=E5=88=86=E5=B2=90?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E3=81=88=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= =?UTF-8?q?=E3=81=99=E3=82=8B=20(#6987)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DevOverlay.test.tsx | 33 +++++++- src/components/DevOverlay.tsx | 12 +++ src/store/atoms/location.test.ts | 96 ++++++++++++++++++++++++ src/store/atoms/location.ts | 38 ++++++++++ src/utils/devDiagnosticsSnapshot.test.ts | 19 +++++ src/utils/devDiagnosticsSnapshot.ts | 26 ++++++- 6 files changed, 222 insertions(+), 2 deletions(-) diff --git a/src/components/DevOverlay.test.tsx b/src/components/DevOverlay.test.tsx index 79cc0bb34..0496a3fc5 100644 --- a/src/components/DevOverlay.test.tsx +++ b/src/components/DevOverlay.test.tsx @@ -2,15 +2,17 @@ import { act, fireEvent, render } from '@testing-library/react-native'; import * as Application from 'expo-application'; import { useAtomValue } from 'jotai'; import { Dimensions, StyleSheet } from 'react-native'; -import type { Station } from '~/@types/graphql'; +import { LineType, type Station } from '~/@types/graphql'; import { MAX_PERMIT_ACCURACY } from '~/constants/location'; import { BAD_ACCURACY_THRESHOLD } from '~/constants/threshold'; import * as remoteConfigModule from '~/lib/remoteConfig'; import { etaAnchorAtom } from '~/store/atoms/etaFallback'; import { + accuracyHistoryAtom, backgroundLocationTrackingAtom, locationAtom, rawLocationAtom, + smoothingDecisionAtom, } from '~/store/atoms/location'; import { autoModeEnabledAtom } from '~/store/atoms/navigation'; import { isLEDThemeAtom } from '~/store/atoms/theme'; @@ -106,6 +108,8 @@ describe('DevOverlay', () => { autoModeEnabled = false, etaPhase = null, etaAnchor = null, + filterAccuracyHistory = [15], + smoothingDecision = { skipSmoothing: false, lineType: null }, }: { location?: unknown; rawLocation?: unknown; @@ -113,6 +117,8 @@ describe('DevOverlay', () => { autoModeEnabled?: boolean; etaPhase?: unknown; etaAnchor?: unknown; + filterAccuracyHistory?: number[]; + smoothingDecision?: { skipSmoothing: boolean; lineType: unknown }; } = {}) => { mockGetEtaPhaseNow.mockReturnValue(etaPhase as never); mockUseAtomValue.mockImplementation((atom) => { @@ -131,6 +137,12 @@ describe('DevOverlay', () => { if (atom === etaAnchorAtom) { return etaAnchor as never; } + if (atom === accuracyHistoryAtom) { + return filterAccuracyHistory as never; + } + if (atom === smoothingDecisionAtom) { + return smoothingDecision as never; + } if (atom === isLEDThemeAtom) { return false as never; } @@ -330,6 +342,25 @@ describe('DevOverlay', () => { ); }); + // filterのskipSmoothingとlineTypeは、判定時に1つのatomへまとめて書かれた組を + // そのまま出す。片方をstationAtomから読み直すと、測位と無関係な路線の + // 切り替わりで持ち出し時の値だけが進み、両者で検算できなくなる。 + it('平滑化の判定は結果と入力を同じ組のまま出力する', async () => { + setupAtomValues({ + smoothingDecision: { skipSmoothing: true, lineType: LineType.Subway }, + }); + const { getByTestId } = render(); + + fireEvent.press(getByTestId('dev-overlay-copy-button')); + await act(async () => {}); + + const copied = JSON.parse(mockCopyTextToClipboard.mock.calls[0][0]); + expect(copied.filter).toMatchObject({ + skipSmoothing: true, + lineType: LineType.Subway, + }); + }); + it('押した直後はCOPIED表示になり、一定時間で戻る', async () => { jest.useFakeTimers(); try { diff --git a/src/components/DevOverlay.tsx b/src/components/DevOverlay.tsx index 83072c378..5a6d78539 100644 --- a/src/components/DevOverlay.tsx +++ b/src/components/DevOverlay.tsx @@ -26,9 +26,11 @@ import { useTelemetryEnabled } from '~/hooks/useTelemetryEnabled'; import { getMaxPermitAccuracy, isEtaAssistEnabled } from '~/lib/remoteConfig'; import { etaAnchorAtom } from '~/store/atoms/etaFallback'; import { + accuracyHistoryAtom, backgroundLocationTrackingAtom, locationAtom, rawLocationAtom, + smoothingDecisionAtom, } from '~/store/atoms/location'; import { autoModeEnabledAtom } from '~/store/atoms/navigation'; import { copyTextToClipboard } from '~/utils/clipboard'; @@ -463,6 +465,13 @@ const DevOverlay: React.FC = ({ unrotated = false }) => { const isBackgroundLocationTracking = useAtomValue( backgroundLocationTrackingAtom ); + // 平滑化の要否を決めている履歴と、その判定結果。チャート用のchartHistoryとは + // 別物なので、診断の持ち出しでは両方を出す。 + // 判定結果と、その判定に使ったlineTypeは同じatomから取る。lineTypeを + // stationAtomから読むと、測位と無関係な路線の切り替わりで持ち出し時の値だけが + // 進み、判定時のskipSmoothingと食い違う。 + const filterAccuracyHistory = useAtomValue(accuracyHistoryAtom); + const smoothingDecision = useAtomValue(smoothingDecisionAtom); // ETA補助の診断表示。有効フラグ(リモート設定/手動トグル)は非リアクティブなgetter、 // アンカーはatomから購読する。推定フェーズは常駐タイマーで公開されなくなったため、 // DevOverlay自身の1秒ティック(nowTick)を評価時刻としてオンデマンド計算する。 @@ -555,6 +564,9 @@ const DevOverlay: React.FC = ({ unrotated = false }) => { rawLocation, filteredLocation: simulatedLocation, accuracyHistory: chartHistory, + filterAccuracyHistory, + skipSmoothing: smoothingDecision.skipSmoothing, + lineType: smoothingDecision.lineType, effectiveSpeedMps: effectiveSpeed, hasMeasuredSpeed: hasEverMeasuredSpeed, maxPermitAccuracy, diff --git a/src/store/atoms/location.test.ts b/src/store/atoms/location.test.ts index 2b4f905a5..ea46b7cc6 100644 --- a/src/store/atoms/location.test.ts +++ b/src/store/atoms/location.test.ts @@ -9,6 +9,7 @@ import { resetLocationState, setLocation, setRawLocation, + smoothingDecisionAtom, } from './location'; import stationState from './station'; @@ -118,6 +119,101 @@ describe('setLocation', () => { }); }); + describe('地下鉄分岐を通ったかの記録', () => { + // 診断の持ち出し(DevOverlay)がこの値を読む。同じ条件を外で組み直すと、 + // 判定と表示が別々に育って食い違うため、setLocationが下した結果そのものを固定する。 + it('地下鉄かつ精度が不安定なら真になる', () => { + setStationLineType(LineType.Subway); + store.set(accuracyHistoryAtom, [10, 300, 20, 400]); + + setLocation(makeLocation(35.0, 139.0, 500, 1000)); + + expect(store.get(smoothingDecisionAtom)).toEqual({ + skipSmoothing: true, + lineType: LineType.Subway, + }); + }); + + it('地上路線なら偽になる', () => { + setStationLineType(LineType.Normal); + store.set(accuracyHistoryAtom, [10, 300, 20, 400]); + + setLocation(makeLocation(35.0, 139.0, 500, 1000)); + + expect(store.get(smoothingDecisionAtom)).toEqual({ + skipSmoothing: false, + lineType: LineType.Normal, + }); + }); + + it('地下鉄でも精度履歴が安定していれば偽になる', () => { + setStationLineType(LineType.Subway); + store.set(accuracyHistoryAtom, [30, 35, 28, 32]); + + setLocation(makeLocation(35.0, 139.0, 30, 1000)); + + expect(store.get(smoothingDecisionAtom)).toEqual({ + skipSmoothing: false, + lineType: LineType.Subway, + }); + }); + + it('駅が無ければ路線種別はnullで記録する', () => { + setStationLineType(null); + store.set(accuracyHistoryAtom, [10, 300, 20, 400]); + + setLocation(makeLocation(35.0, 139.0, 500, 1000)); + + expect(store.get(smoothingDecisionAtom)).toEqual({ + skipSmoothing: false, + lineType: null, + }); + }); + + // 回帰: 結果と入力を別々のatom(あるいは片方をstationAtomの直読み)で持つと、 + // 測位と無関係な路線の切り替わりで入力側だけが進み、持ち出した診断の + // skipSmoothingとlineTypeが別の瞬間の値になって検算できなくなる。 + it('判定後に路線が変わっても判定時の組を保つ', () => { + setStationLineType(LineType.Subway); + store.set(accuracyHistoryAtom, [10, 300, 20, 400]); + setLocation(makeLocation(35.0, 139.0, 500, 1000)); + + setStationLineType(LineType.Normal); + + expect(store.get(smoothingDecisionAtom)).toEqual({ + skipSmoothing: true, + lineType: LineType.Subway, + }); + }); + + // 判定が変わらない限り同じオブジェクトを保つ。測位のたびに新しい参照を入れると、 + // 購読しているDevOverlayが1秒ごとに再レンダーする。 + it('判定が変わらなければ参照を作り直さない', () => { + setStationLineType(LineType.Subway); + store.set(accuracyHistoryAtom, [10, 300, 20, 400]); + setLocation(makeLocation(35.0, 139.0, 500, 1000)); + const first = store.get(smoothingDecisionAtom); + + setLocation(makeLocation(35.0001, 139.0001, 500, 2000)); + + expect(store.get(smoothingDecisionAtom)).toBe(first); + }); + + it('リセットで初期値へ戻る', () => { + setStationLineType(LineType.Subway); + store.set(accuracyHistoryAtom, [10, 300, 20, 400]); + setLocation(makeLocation(35.0, 139.0, 500, 1000)); + expect(store.get(smoothingDecisionAtom).skipSmoothing).toBe(true); + + resetLocationState(); + + expect(store.get(smoothingDecisionAtom)).toEqual({ + skipSmoothing: false, + lineType: null, + }); + }); + }); + describe('地下鉄路線', () => { it('精度が不安定な場合はスムージングをスキップする', () => { setStationLineType(LineType.Subway); diff --git a/src/store/atoms/location.ts b/src/store/atoms/location.ts index 1edb9341c..04b6b210d 100644 --- a/src/store/atoms/location.ts +++ b/src/store/atoms/location.ts @@ -106,6 +106,28 @@ export const backgroundLocationTrackingAtom = atom(false); // 下流の処理が「現在位置を信用できない＝走行中」と扱えるようにする。 export const locationAccuracyOutlierAtom = atom(false); +// 直近のsetLocationが下した平滑化の判定。診断表示専用で、パイプラインの判定には使わない。 +// 地下の挙動を調べるとき、locationAtomの値だけではどちらの経路を通ったか分からず、 +// 条件を外から組み直すと判定と食い違うため、結果そのものを残す。 +// +// 結果(skipSmoothing)と入力(lineType)を1つのオブジェクトで持つ。別々のatomにすると、 +// lineTypeは測位と無関係に変わる(stationAtomの更新)ため、判定後に路線が変わった状態で +// 持ち出したときに「判定時のskipSmoothing」と「持ち出し時のlineType」という別の瞬間の +// 値が並び、両者で検算できなくなる。 +export type SmoothingDecision = { + skipSmoothing: boolean; + lineType: LineType | null; +}; + +const INITIAL_SMOOTHING_DECISION: SmoothingDecision = { + skipSmoothing: false, + lineType: null, +}; + +export const smoothingDecisionAtom = atom( + INITIAL_SMOOTHING_DECISION +); + // EMAスムージングの基準として使う「最後にフィルタ処理を通過した位置」 // 地下鉄モード中は更新しないため、モード復帰後にノイジーなprevで誤棄却されるのを防ぐ const lastFilteredLocationAtom = atom(null); @@ -128,6 +150,7 @@ export const resetLocationState = () => { store.set(lastFilteredLocationAtom, null); store.set(lastRawLocationAtom, null); store.set(locationAccuracyOutlierAtom, false); + store.set(smoothingDecisionAtom, INITIAL_SMOOTHING_DECISION); consecutiveSpeedRejections = 0; resetEtaBoundHold(); }; @@ -261,6 +284,21 @@ export const setLocation = (location: Location.LocationObject) => { const currentLineType = store.get(stationState).station?.line?.lineType; const skipSmoothing = currentLineType === LineType.Subway && !isAccuracyStable(updatedHistory); + // 判定の結果と入力を、同じ瞬間の組として残す。DevOverlayの診断表示から + // 「いま地下鉄分岐に入っているか」と「その根拠」を読めるようにするためで、 + // 同じ条件を呼び出し側で組み直すと判定と表示が別々に育って食い違う。 + // 値が変わらないときは書かない。毎回新しいオブジェクトを入れると、購読側が + // 測位のたびに再レンダーする。 + const prevDecision = store.get(smoothingDecisionAtom); + if ( + prevDecision.skipSmoothing !== skipSmoothing || + prevDecision.lineType !== (currentLineType ?? null) + ) { + store.set(smoothingDecisionAtom, { + skipSmoothing, + lineType: currentLineType ?? null, + }); + } // ETAが許す進行量を超えた測位は、どちらの経路へも通さない if (isImplausibleByEta(location)) { diff --git a/src/utils/devDiagnosticsSnapshot.test.ts b/src/utils/devDiagnosticsSnapshot.test.ts index 9cd9ca299..b251ec54a 100644 --- a/src/utils/devDiagnosticsSnapshot.test.ts +++ b/src/utils/devDiagnosticsSnapshot.test.ts @@ -37,6 +37,9 @@ const baseInput: DevDiagnosticsInput = { rawLocation: makeLocation(35.732538, 139.670653, 312, 1_700_000_000_000), filteredLocation: makeLocation(35.7325, 139.6706, 312, 1_700_000_000_000), accuracyHistory: [20, 45, 310], + filterAccuracyHistory: [20, 45, 310, 620], + skipSmoothing: true, + lineType: 'Subway', effectiveSpeedMps: 12.5, hasMeasuredSpeed: true, maxPermitAccuracy: 1500, @@ -89,6 +92,22 @@ describe('buildDevDiagnosticsSnapshot', () => { expect(snapshot.location.accuracyHistory).toEqual([20, 45, 310]); }); + it('平滑化の判定材料と結果を持つ', () => { + // locationAtomの値だけでは、平滑化を掛けたのか生の座標を入れたのかが区別できない。 + // チャート用の精度履歴とは別に、判定に使われた履歴と結果を持ち出す + const snapshot = buildDevDiagnosticsSnapshot(baseInput); + + expect(snapshot.filter).toEqual({ + skipSmoothing: true, + lineType: 'Subway', + accuracyHistory: [20, 45, 310, 620], + }); + // チャート用とは別物であることを固定する(取り違えると地下鉄分岐の説明が付かない) + expect(snapshot.filter.accuracyHistory).not.toEqual( + snapshot.location.accuracyHistory + ); + }); + it('測位が無い場合もnullで表現して壊れない', () => { const snapshot = buildDevDiagnosticsSnapshot({ ...baseInput, diff --git a/src/utils/devDiagnosticsSnapshot.ts b/src/utils/devDiagnosticsSnapshot.ts index b1e3f64f5..296d73f59 100644 --- a/src/utils/devDiagnosticsSnapshot.ts +++ b/src/utils/devDiagnosticsSnapshot.ts @@ -30,8 +30,25 @@ export type DevDiagnosticsInput = { rawLocation: Location.LocationObject | null; /** フィルタ・スムージングを通した、アプリが現在地として使っている値 */ filteredLocation: Location.LocationObject | null; - /** DevOverlay のチャートが持つ精度履歴(古い順) */ + /** + * DevOverlay のチャートが持つ精度履歴(古い順)。1秒ごとのサンプリングで、 + * 測位が無い間は NaN が積まれる(JSONでは null になる)。見た目の推移用。 + */ accuracyHistory: number[]; + /** + * 平滑化の要否(isAccuracyStable)を決めている accuracyHistoryAtom の中身。 + * 測位を受理するたびに積まれ、無効値は捨てられるのでチャート用とは別物。 + * 地下鉄分岐に入っているかを説明できるのはこちらなので、必ず一緒に持ち出す。 + */ + filterAccuracyHistory: number[]; + /** + * 直近の測位が地下鉄分岐(平滑化スキップ)を通ったか。次の lineType と + * 対で受け取ること。どちらも smoothingDecisionAtom が同じ判定時に書いた値で、 + * 片方を stationAtom から読み直すと別の瞬間の値が混ざる。 + */ + skipSmoothing: boolean; + /** 上の判定に使った路線種別(判定時の値) */ + lineType: string | null; /** 表示に使っている速度(m/s)と、それが実測かどうか */ effectiveSpeedMps: number; hasMeasuredSpeed: boolean; @@ -112,6 +129,13 @@ export const buildDevDiagnosticsSnapshot = (input: DevDiagnosticsInput) => ({ // 変位から算出した値か、測位が運んできた実測かを区別する speedIsMeasured: input.hasMeasuredSpeed, }, + // どちらの経路を通ったかと、その判定材料。locationAtomの値だけでは + // 平滑化を掛けたのか生の座標を入れたのかが区別できない。 + filter: { + skipSmoothing: input.skipSmoothing, + lineType: input.lineType, + accuracyHistory: input.filterAccuracyHistory, + }, eta: { phase: input.etaPhase, anchor: input.etaAnchor, From a9ac253eb4f075549d9c1c07b291f9efbf0573c9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 16 Sep 2026 00:48:52 +0900 Subject: [PATCH 2/2] Bump version for canary release (#6989) --- android/app/build.gradle | 6 ++--- android/wearable/build.gradle.kts | 6 ++--- app.config.ts | 4 +-- ios/TrainLCD.xcodeproj/project.pbxproj | 36 +++++++++++++------------- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 93f25ab03..fc522f9ff 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -161,12 +161,12 @@ android { dimension "environment" applicationId "me.tinykitten.trainlcd.dev" versionNameSuffix "-dev" - versionCode 100000765 + versionCode 100000767 versionName "10.15.1" } prod { dimension "environment" - versionCode 100000765 + versionCode 100000767 versionName "10.15.1" } // ストア配信する dev (Canary) と applicationId を分けた、ローカル検証専用のフレーバー。 @@ -177,7 +177,7 @@ android { dimension "environment" applicationId "me.tinykitten.trainlcd.local" versionNameSuffix "-local" - versionCode 100000765 + versionCode 100000767 versionName "10.15.1" } } diff --git a/android/wearable/build.gradle.kts b/android/wearable/build.gradle.kts index 82eda00ec..34c2eb72e 100644 --- a/android/wearable/build.gradle.kts +++ b/android/wearable/build.gradle.kts @@ -85,12 +85,12 @@ android { dimension = "environment" applicationIdSuffix = ".dev" versionNameSuffix = "-dev" - versionCode = 100000766 + versionCode = 100000768 versionName = "10.15.1" } create("prod") { dimension = "environment" - versionCode = 100000766 + versionCode = 100000768 versionName = "10.15.1" } // :app の local フレーバーと対になるローカル検証専用フレーバー。Wear の Data Layer は @@ -100,7 +100,7 @@ android { dimension = "environment" applicationIdSuffix = ".local" versionNameSuffix = "-local" - versionCode = 100000766 + versionCode = 100000768 versionName = "10.15.1" } } diff --git a/app.config.ts b/app.config.ts index c61421af9..6190cffab 100644 --- a/app.config.ts +++ b/app.config.ts @@ -57,7 +57,7 @@ export default { userInterfaceStyle: 'automatic', // Expo SDK 57 の各モジュール（expo / expo-modules-core ほか）は podspec で iOS 16.4 以上を要求する deploymentTarget: '16.4', - buildNumber: '2912', + buildNumber: '2913', scheme: IS_DEV ? 'CanaryTrainLCD' : 'ProdTrainLCD', bundleIdentifier: IS_DEV ? 'me.tinykitten.trainlcd.dev' @@ -71,7 +71,7 @@ export default { ? 'me.tinykitten.trainlcd.dev' : 'me.tinykitten.trainlcd', permissions: [], - versionCode: 100000765, + versionCode: 100000767, }, owner: 'trainlcd', experiments: { diff --git a/ios/TrainLCD.xcodeproj/project.pbxproj b/ios/TrainLCD.xcodeproj/project.pbxproj index 2b3c3bd9e..1a1aba694 100644 --- a/ios/TrainLCD.xcodeproj/project.pbxproj +++ b/ios/TrainLCD.xcodeproj/project.pbxproj @@ -2550,7 +2550,7 @@ CODE_SIGN_ENTITLEMENTS = ProdTrainLCD.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2912; + CURRENT_PROJECT_VERSION = 2913; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = E6R2G33Z36; INFOPLIST_FILE = TrainLCD/Schemes/Prod/Info.plist; @@ -2590,7 +2590,7 @@ CODE_SIGN_ENTITLEMENTS = ProdTrainLCD.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2912; + CURRENT_PROJECT_VERSION = 2913; DEVELOPMENT_TEAM = E6R2G33Z36; INFOPLIST_FILE = TrainLCD/Schemes/Prod/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = TrainLCD; @@ -2649,7 +2649,7 @@ CODE_SIGN_ENTITLEMENTS = TrainLCD/trainlcd.entitlements; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2912; + CURRENT_PROJECT_VERSION = 2913; CXX = "$(REACT_NATIVE_PATH)/scripts/xcode/ccache-clang++.sh"; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -2756,7 +2756,7 @@ CODE_SIGN_ENTITLEMENTS = TrainLCD/trainlcd.entitlements; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 2912; + CURRENT_PROJECT_VERSION = 2913; CXX = "$(REACT_NATIVE_PATH)/scripts/xcode/ccache-clang++.sh"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -2837,7 +2837,7 @@ CODE_SIGN_ENTITLEMENTS = CanaryTrainLCD.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2912; + CURRENT_PROJECT_VERSION = 2913; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = E6R2G33Z36; INFOPLIST_FILE = TrainLCD/Schemes/Dev/Info.plist; @@ -2877,7 +2877,7 @@ CODE_SIGN_ENTITLEMENTS = CanaryTrainLCD.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2912; + CURRENT_PROJECT_VERSION = 2913; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = E6R2G33Z36; INFOPLIST_FILE = TrainLCD/Schemes/Dev/Info.plist; @@ -3089,7 +3089,7 @@ CODE_SIGN_ENTITLEMENTS = RideSessionActivity/CanaryRideSessionActivity.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2912; + CURRENT_PROJECT_VERSION = 2913; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = E6R2G33Z36; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -3141,7 +3141,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2912; + CURRENT_PROJECT_VERSION = 2913; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = E6R2G33Z36; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -3192,7 +3192,7 @@ CODE_SIGN_ENTITLEMENTS = WatchWidget/ProdWatchWidget.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2912; + CURRENT_PROJECT_VERSION = 2913; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = E6R2G33Z36; ENABLE_USER_SCRIPT_SANDBOXING = YES; @@ -3250,7 +3250,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2912; + CURRENT_PROJECT_VERSION = 2913; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = E6R2G33Z36; ENABLE_USER_SCRIPT_SANDBOXING = YES; @@ -3301,7 +3301,7 @@ CODE_SIGN_ENTITLEMENTS = WatchWidget/CanaryWatchWidget.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2912; + CURRENT_PROJECT_VERSION = 2913; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = E6R2G33Z36; ENABLE_USER_SCRIPT_SANDBOXING = YES; @@ -3358,7 +3358,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2912; + CURRENT_PROJECT_VERSION = 2913; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = E6R2G33Z36; ENABLE_USER_SCRIPT_SANDBOXING = YES; @@ -3407,7 +3407,7 @@ CODE_SIGN_ENTITLEMENTS = RideSessionActivity/ProdRideSessionActivity.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2912; + CURRENT_PROJECT_VERSION = 2913; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = E6R2G33Z36; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -3459,7 +3459,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2912; + CURRENT_PROJECT_VERSION = 2913; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = E6R2G33Z36; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -3678,7 +3678,7 @@ CODE_SIGN_ENTITLEMENTS = ProdAppClip/ProdAppClip.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2912; + CURRENT_PROJECT_VERSION = 2913; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = E6R2G33Z36; ENABLE_USER_SCRIPT_SANDBOXING = NO; @@ -3734,7 +3734,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2912; + CURRENT_PROJECT_VERSION = 2913; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = E6R2G33Z36; ENABLE_USER_SCRIPT_SANDBOXING = NO; @@ -3784,7 +3784,7 @@ CODE_SIGN_ENTITLEMENTS = CanaryAppClip/CanaryAppClip.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2912; + CURRENT_PROJECT_VERSION = 2913; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = E6R2G33Z36; ENABLE_USER_SCRIPT_SANDBOXING = NO; @@ -3842,7 +3842,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2912; + CURRENT_PROJECT_VERSION = 2913; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = E6R2G33Z36; ENABLE_USER_SCRIPT_SANDBOXING = NO;