Skip to content

Commit d479872

Browse files
Updated to the latest toolchain, and fixed an issue, where selecting HUD mode, in the basic test, would blank the center image.
1 parent f1e9c2d commit d479872

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

RVS_Spinner.xcodeproj/project.pbxproj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -921,7 +921,7 @@
921921
attributes = {
922922
CLASSPREFIX = RVS_;
923923
LastSwiftUpdateCheck = 1240;
924-
LastUpgradeCheck = 1250;
924+
LastUpgradeCheck = 1300;
925925
ORGANIZATIONNAME = "The Great Rift Valley Software Company";
926926
TargetAttributes = {
927927
D40705DF224A9FC500F1E8A2 = {
@@ -1267,7 +1267,7 @@
12671267
"$(inherited)",
12681268
"@executable_path/Frameworks",
12691269
);
1270-
MARKETING_VERSION = 2.5.7;
1270+
MARKETING_VERSION = 2.5.8;
12711271
PRODUCT_BUNDLE_IDENTIFIER = "com.riftvalleysoftware.RVS-Spinner-Basic-Test-Harness";
12721272
PRODUCT_NAME = "$(TARGET_NAME)";
12731273
SWIFT_VERSION = 5.0;
@@ -1288,7 +1288,7 @@
12881288
"$(inherited)",
12891289
"@executable_path/Frameworks",
12901290
);
1291-
MARKETING_VERSION = 2.5.7;
1291+
MARKETING_VERSION = 2.5.8;
12921292
PRODUCT_BUNDLE_IDENTIFIER = "com.riftvalleysoftware.RVS-Spinner-Basic-Test-Harness";
12931293
PRODUCT_NAME = "$(TARGET_NAME)";
12941294
SWIFT_VERSION = 5.0;
@@ -1475,7 +1475,7 @@
14751475
"$(inherited)",
14761476
"@executable_path/Frameworks",
14771477
);
1478-
MARKETING_VERSION = 2.5.7;
1478+
MARKETING_VERSION = 2.5.8;
14791479
PRODUCT_BUNDLE_IDENTIFIER = "com.riftvalleysoftware.RVS-Spinner-Tabbed-Test-Harness";
14801480
PRODUCT_NAME = "$(TARGET_NAME)";
14811481
SWIFT_VERSION = 5.0;
@@ -1496,7 +1496,7 @@
14961496
"$(inherited)",
14971497
"@executable_path/Frameworks",
14981498
);
1499-
MARKETING_VERSION = 2.5.7;
1499+
MARKETING_VERSION = 2.5.8;
15001500
PRODUCT_BUNDLE_IDENTIFIER = "com.riftvalleysoftware.RVS-Spinner-Tabbed-Test-Harness";
15011501
PRODUCT_NAME = "$(TARGET_NAME)";
15021502
SWIFT_VERSION = 5.0;
@@ -1519,7 +1519,7 @@
15191519
"$(inherited)",
15201520
"@executable_path/Frameworks",
15211521
);
1522-
MARKETING_VERSION = 2.5.7;
1522+
MARKETING_VERSION = 2.5.8;
15231523
PRODUCT_BUNDLE_IDENTIFIER = com.riftvalleysoftware.Spinner;
15241524
PRODUCT_NAME = "$(TARGET_NAME)";
15251525
SWIFT_VERSION = 5.0;
@@ -1542,7 +1542,7 @@
15421542
"$(inherited)",
15431543
"@executable_path/Frameworks",
15441544
);
1545-
MARKETING_VERSION = 2.5.7;
1545+
MARKETING_VERSION = 2.5.8;
15461546
PRODUCT_BUNDLE_IDENTIFIER = com.riftvalleysoftware.Spinner;
15471547
PRODUCT_NAME = "$(TARGET_NAME)";
15481548
SWIFT_VERSION = 5.0;
@@ -1563,7 +1563,7 @@
15631563
"$(inherited)",
15641564
"@executable_path/Frameworks",
15651565
);
1566-
MARKETING_VERSION = 2.5.7;
1566+
MARKETING_VERSION = 2.5.8;
15671567
PRODUCT_BUNDLE_IDENTIFIER = "com.riftvalleysoftware.RVS-Spinner-Leak-Test";
15681568
PRODUCT_NAME = "$(TARGET_NAME)";
15691569
SWIFT_VERSION = 5.0;
@@ -1584,7 +1584,7 @@
15841584
"$(inherited)",
15851585
"@executable_path/Frameworks",
15861586
);
1587-
MARKETING_VERSION = 2.5.7;
1587+
MARKETING_VERSION = 2.5.8;
15881588
PRODUCT_BUNDLE_IDENTIFIER = "com.riftvalleysoftware.RVS-Spinner-Leak-Test";
15891589
PRODUCT_NAME = "$(TARGET_NAME)";
15901590
SWIFT_VERSION = 5.0;

RVS_Spinner.xcodeproj/xcshareddata/xcschemes/RVS_Spinner Framework.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1250"
3+
LastUpgradeVersion = "1300"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Sources/RVS_Spinner/RVS_Spinner.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
The Great Rift Valley Software Company: https://riftvalleysoftware.com
2222

23-
- version: 2.5.7
23+
- version: 2.5.8
2424
*/
2525

2626
import AudioToolbox

Tests/RVS_SpinnerTests/RVS_Spinner_Basic_Test_Harness/RVS_Spinner_Basic_Test_Harness_ViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ class RVS_Spinner_Basic_Test_Harness_ViewController: UIViewController, RVS_Spinn
236236
do {
237237
let imagePaths = try FileManager.default.contentsOfDirectory(atPath: imagePath).sorted()
238238
imagePaths.forEach { fileName in
239-
if let imageData = FileManager.default.contents(atPath: "\(imagePath)/\(fileName)"), let image = UIImage(data: imageData) {
239+
if let imageData = FileManager.default.contents(atPath: "\(imagePath)/\(fileName)"), let image = UIImage(data: imageData)?.withRenderingMode(.alwaysTemplate) {
240240
// The name is the filename, minus the file extension.
241241
_shapes.append((name: String(fileName.prefix(fileName.count - 4)), image: image, index: _shapes.count))
242242
}

0 commit comments

Comments
 (0)