Skip to content

Commit 5ead4bd

Browse files
author
Reed Es
committed
Boosted build/version; formatting; updating for new Xcode/OS; bugfixes mirrored from GRT
1 parent ba0e7ba commit 5ead4bd

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

Sources/WatchApp.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ struct Watch_App: App {
3535
.environmentObject(coreDataStack)
3636
}
3737
.onChange(of: scenePhase) { _ in
38-
// save if: (1) app moved to background, and (2) changes are pending
38+
// save if transitioning to inactive or background
39+
guard scenePhase == .inactive || scenePhase == .background else { return }
40+
41+
// and changes are pending
3942
do {
4043
try coreDataStack.container.viewContext.save()
4144
} catch {

Task Routine Tracker Watch.xcodeproj/project.pbxproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@
400400
GCC_WARN_UNUSED_FUNCTION = YES;
401401
GCC_WARN_UNUSED_VARIABLE = YES;
402402
INFOPLIST_FILE = Sources/Info.plist;
403-
MARKETING_VERSION = 1.1.2;
403+
MARKETING_VERSION = 1.2.0;
404404
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
405405
MTL_FAST_MATH = YES;
406406
ONLY_ACTIVE_ARCH = YES;
@@ -456,7 +456,7 @@
456456
GCC_WARN_UNUSED_FUNCTION = YES;
457457
GCC_WARN_UNUSED_VARIABLE = YES;
458458
INFOPLIST_FILE = Sources/Info.plist;
459-
MARKETING_VERSION = 1.1.2;
459+
MARKETING_VERSION = 1.2.0;
460460
MTL_ENABLE_DEBUG_INFO = NO;
461461
MTL_FAST_MATH = YES;
462462
PRODUCT_BUNDLE_IDENTIFIER = org.openalloc.trout.watch;
@@ -487,7 +487,7 @@
487487
"$(inherited)",
488488
"@executable_path/Frameworks",
489489
);
490-
MARKETING_VERSION = 1.1.2;
490+
MARKETING_VERSION = 1.2.0;
491491
PRODUCT_BUNDLE_IDENTIFIER = org.openalloc.trout.watch;
492492
PRODUCT_NAME = "$(TARGET_NAME)";
493493
SDKROOT = watchos;
@@ -521,7 +521,7 @@
521521
"$(inherited)",
522522
"@executable_path/Frameworks",
523523
);
524-
MARKETING_VERSION = 1.1.2;
524+
MARKETING_VERSION = 1.2.0;
525525
PRODUCT_BUNDLE_IDENTIFIER = org.openalloc.trout.watch;
526526
PRODUCT_NAME = "$(TARGET_NAME)";
527527
SDKROOT = watchos;
@@ -543,7 +543,7 @@
543543
DEVELOPMENT_TEAM = J735QC5U38;
544544
INFOPLIST_FILE = Sources/Info.plist;
545545
INFOPLIST_KEY_CFBundleDisplayName = "Task Routine Tracker";
546-
MARKETING_VERSION = 1.1.2;
546+
MARKETING_VERSION = 1.2.0;
547547
PRODUCT_BUNDLE_IDENTIFIER = org.openalloc.trout;
548548
PRODUCT_NAME = "$(TARGET_NAME)";
549549
SDKROOT = iphoneos;
@@ -560,7 +560,7 @@
560560
DEVELOPMENT_TEAM = J735QC5U38;
561561
INFOPLIST_FILE = Sources/Info.plist;
562562
INFOPLIST_KEY_CFBundleDisplayName = "Task Routine Tracker";
563-
MARKETING_VERSION = 1.1.2;
563+
MARKETING_VERSION = 1.2.0;
564564
PRODUCT_BUNDLE_IDENTIFIER = org.openalloc.trout;
565565
PRODUCT_NAME = "$(TARGET_NAME)";
566566
SDKROOT = iphoneos;
@@ -588,7 +588,7 @@
588588
"@executable_path/../../Frameworks",
589589
"@executable_path/../../../../Frameworks",
590590
);
591-
MARKETING_VERSION = 1.1.2;
591+
MARKETING_VERSION = 1.2.0;
592592
PRODUCT_BUNDLE_IDENTIFIER = org.openalloc.trout.watch.WidgetTRT;
593593
PRODUCT_NAME = "$(TARGET_NAME)";
594594
SDKROOT = watchos;
@@ -619,7 +619,7 @@
619619
"@executable_path/../../Frameworks",
620620
"@executable_path/../../../../Frameworks",
621621
);
622-
MARKETING_VERSION = 1.1.2;
622+
MARKETING_VERSION = 1.2.0;
623623
PRODUCT_BUNDLE_IDENTIFIER = org.openalloc.trout.watch.WidgetTRT;
624624
PRODUCT_NAME = "$(TARGET_NAME)";
625625
SDKROOT = watchos;

Task Routine Tracker Watch.xcodeproj/xcshareddata/xcschemes/Task Routine Tracker Watch.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 = "1430"
3+
LastUpgradeVersion = "1500"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)