Skip to content

dev<-master #6968

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TinyKitten merged 4 commits into from
Sep 13, 2026
Merged

dev<-master #6968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ea5ec7f
v10.15.1 をリリース
TinyKitten Sep 11, 2026
3054072
devの最新をv10.15.1リリースブランチへ取り込み
claude Sep 12, 2026
7ccd30d
Merge pull request #6955 from TrainLCD/release/v10.15.1
TinyKitten Sep 13, 2026
b08234b
origin/dev をマージし版数競合を解決（semver=10.15.1、ビルド番号=max）
claude Sep 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,12 +162,12 @@ android {
applicationId "me.tinykitten.trainlcd.dev"
versionNameSuffix "-dev"
versionCode 100000757
versionName "10.15.0"
versionName "10.15.1"
}
prod {
dimension "environment"
versionCode 100000757
versionName "10.15.0"
versionName "10.15.1"
}
// ストア配信する dev (Canary) と applicationId を分けた、ローカル検証専用のフレーバー。
// ストアの Canary 版を消さずに同居させるためだけに存在し、配信には使わない
Expand All @@ -178,7 +178,7 @@ android {
applicationId "me.tinykitten.trainlcd.local"
versionNameSuffix "-local"
versionCode 100000757
versionName "10.15.0"
versionName "10.15.1"
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions android/wearable/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,12 @@ android {
applicationIdSuffix = ".dev"
versionNameSuffix = "-dev"
versionCode = 100000758
versionName = "10.15.0"
versionName = "10.15.1"
}
create("prod") {
dimension = "environment"
versionCode = 100000758
versionName = "10.15.0"
versionName = "10.15.1"
}
// :app の local フレーバーと対になるローカル検証専用フレーバー。Wear の Data Layer は
// applicationId が一致する場合しか疎通しないため、:app を .local にしたときは
Expand All @@ -101,7 +101,7 @@ android {
applicationIdSuffix = ".local"
versionNameSuffix = "-local"
versionCode = 100000758
versionName = "10.15.0"
versionName = "10.15.1"
}
}

Expand Down
2 changes: 1 addition & 1 deletion app.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const IS_DEV = process.env.APP_VARIANT === 'dev' || IS_LOCAL;
export default {
name: 'TrainLCD',
slug: 'trainlcd',
version: '10.15.0',
version: '10.15.1',
plugins: [
'expo-image',
'expo-font',
Expand Down
8 changes: 4 additions & 4 deletions ios/TrainLCD.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2679,7 +2679,7 @@
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
"\"$(inherited)\"",
);
MARKETING_VERSION = 10.15.0;
MARKETING_VERSION = 10.15.1;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "$(inherited)";
Expand Down Expand Up @@ -2781,7 +2781,7 @@
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
"\"$(inherited)\"",
);
MARKETING_VERSION = 10.15.0;
MARKETING_VERSION = 10.15.1;
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_CFLAGS = "$(inherited)";
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
Expand Down Expand Up @@ -3780,7 +3780,7 @@
"@executable_path/Frameworks",
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MARKETING_VERSION = 10.15.0;
MARKETING_VERSION = 10.15.1;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
Expand Down Expand Up @@ -3834,7 +3834,7 @@
"@executable_path/Frameworks",
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MARKETING_VERSION = 10.15.0;
MARKETING_VERSION = 10.15.1;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
PODS_ROOT = "${SRCROOT}/Pods";
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,5 +173,5 @@
}
},
"name": "trainlcd",
"version": "10.15.0"
"version": "10.15.1"
}
Loading