Skip to content

Commit 4cdc144

Browse files
committed
Bump version
1 parent cbe9052 commit 4cdc144

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

app/src/Outlander.xcodeproj/project.pbxproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282
7BAC842E25ECA23C00A6C7D5 /* Matches.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BAC842C25ECA23C00A6C7D5 /* Matches.swift */; };
8383
7BC74D1B2755D37300B6DF62 /* LinkCommandHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BC74D1A2755D37300B6DF62 /* LinkCommandHandler.swift */; };
8484
7BC74D1C2755D37300B6DF62 /* LinkCommandHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BC74D1A2755D37300B6DF62 /* LinkCommandHandler.swift */; };
85+
7BC74D1D27575B4300B6DF62 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9BCF2ED22E177E100C7F7F0 /* AppDelegate.swift */; };
8586
7BCBBD0D273F499D00219CA0 /* VariableReplacerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BCBBD0C273F499D00219CA0 /* VariableReplacerTests.swift */; };
8687
7BCBBD0F2743ABEA00219CA0 /* VariableTokenizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BCBBD0E2743ABEA00219CA0 /* VariableTokenizer.swift */; };
8788
7BCBBD102743ABEA00219CA0 /* VariableTokenizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BCBBD0E2743ABEA00219CA0 /* VariableTokenizer.swift */; };
@@ -1055,6 +1056,7 @@
10551056
F9CA205E24664A4500A92736 /* VarCommandHandlerTests.swift in Sources */,
10561057
F9CA204D245CAA9700A92736 /* EventBus.swift in Sources */,
10571058
7BCBBD132746C03E00219CA0 /* FunctionEvaluator.swift in Sources */,
1059+
7BC74D1D27575B4300B6DF62 /* AppDelegate.swift in Sources */,
10581060
7B228B0D2734F8E80052610B /* ExpTracker.swift in Sources */,
10591061
7BDF5C81272723DA0020A3B0 /* MacroLoaderTests.swift in Sources */,
10601062
7BA27B5125DF93C500A88B80 /* Combinators.swift in Sources */,
@@ -1267,7 +1269,7 @@
12671269
CODE_SIGN_IDENTITY = "Apple Development";
12681270
CODE_SIGN_STYLE = Automatic;
12691271
COMBINE_HIDPI_IMAGES = YES;
1270-
CURRENT_PROJECT_VERSION = 4;
1272+
CURRENT_PROJECT_VERSION = 5;
12711273
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
12721274
DEVELOPMENT_TEAM = 9TZ225FMST;
12731275
ENABLE_HARDENED_RUNTIME = YES;
@@ -1299,7 +1301,7 @@
12991301
CODE_SIGN_IDENTITY = "Apple Development";
13001302
CODE_SIGN_STYLE = Automatic;
13011303
COMBINE_HIDPI_IMAGES = YES;
1302-
CURRENT_PROJECT_VERSION = 4;
1304+
CURRENT_PROJECT_VERSION = 5;
13031305
DEVELOPMENT_TEAM = 9TZ225FMST;
13041306
ENABLE_HARDENED_RUNTIME = YES;
13051307
FRAMEWORK_SEARCH_PATHS = "$(inherited)";

app/src/Outlander/Settings/PresetLoader.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class PresetLoader {
107107
color = "\(color),\(backgroundColor)"
108108
}
109109

110-
content += "#preset {\(preset.name)} {\(color)}"
110+
content += "#preset {\(preset.name)} {\(color.lowercased())}"
111111

112112
if className.count > 0 {
113113
content += " {\(className)}"

app/src/OutlanderTests/Settings/PresetLoaderTests.swift

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class PresetLoaderTests: XCTestCase {
2222

2323
loader!.load(context.applicationSettings, context: context)
2424

25-
XCTAssertEqual(context.presets.count, 19)
25+
XCTAssertEqual(context.presets.count, 22)
2626
XCTAssertEqual(context.presets["automapper"]?.color, "#99ffff")
2727
}
2828

@@ -45,13 +45,15 @@ class PresetLoaderTests: XCTestCase {
4545
"""
4646
#preset {automapper} {#99ffff}
4747
#preset {chatter} {#42ffff} {my_class}
48+
#preset {commandinput} {#f5f5f5,#1e1e1e}
4849
#preset {concentration} {#f5f5f5,#009999}
4950
#preset {creatures} {#ffff00}
5051
#preset {exptracker} {#66ffff}
5152
#preset {health} {#f5f5f5,#cc0000}
52-
#preset {mana} {#f5f5f5,#00004B}
53+
#preset {mana} {#f5f5f5,#00004b}
5354
#preset {roomdesc} {#cccccc}
5455
#preset {roomname} {#0000ff}
56+
#preset {roundtime} {#f5f5f5,#003366}
5557
#preset {scriptecho} {#66ffff}
5658
#preset {scripterror} {#efefef,#ff3300}
5759
#preset {scriptinfo} {#0066cc}
@@ -60,6 +62,7 @@ class PresetLoaderTests: XCTestCase {
6062
#preset {speech} {#66ffff}
6163
#preset {spirit} {#f5f5f5,#400040}
6264
#preset {stamina} {#f5f5f5,#004000}
65+
#preset {statusbartext} {#f5f5f5}
6366
#preset {thought} {#66ffff}
6467
#preset {whisper} {#66ffff}
6568

0 commit comments

Comments
 (0)