Raise watchOS min version to 7.4 as supported by Xcode 14 unit tests

Fix compound indexes for dynamic models

.swiftpm/xcode/xcuserdata/JohnEstropia.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>CoreStore.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-	</dict>
-</dict>
-</plist>

CoreStore.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
     s.name = "CoreStore"
-    s.version = "7.3.1"
-    s.swift_version = "5.3"
+    s.version = "9.0.0"
+    s.swift_version = "5.7"
     s.license = "MIT"
     s.homepage = "https://github.com/JohnEstropia/CoreStore"
     s.documentation_url = "https://JohnEstropia.github.io/CoreStore"
@@ -9,14 +9,27 @@ Pod::Spec.new do |s|
     s.author = { "John Rommel Estropia" => "rommel.estropia@gmail.com" }
     s.source = { :git => "https://github.com/JohnEstropia/CoreStore.git", :tag => s.version.to_s }
 
-    s.ios.deployment_target = "10.0"
-    s.osx.deployment_target = "10.12"
-    s.watchos.deployment_target = "3.0"
-    s.tvos.deployment_target = "10.0"
+    s.ios.deployment_target = "13.0"
+    s.osx.deployment_target = "10.15"
+    s.tvos.deployment_target = "13.0"
+    s.watchos.deployment_target = "7.4"
 
-    s.source_files = "Sources", "Sources/**/*.{swift,h,m}"
+    s.source_files = "Sources", "Sources/**/*.swift"
     s.public_header_files = "Sources/**/*.h"
     s.frameworks = "Foundation", "CoreData"
     s.requires_arc = true
     s.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS[config=Debug]' => '-D DEBUG', 'OTHER_LDFLAGS' => '-weak_framework Combine -weak_framework SwiftUI' }
+
+    s.test_spec "CoreStoreTests" do |ts|
+        ts.source_files = "CoreStoreTests", "CoreStoreTests/**/*.swift", "CoreStoreTests/**/*.xcdatamodeld", "CoreStoreTests/**/*.xcdatamodel"
+        ts.public_header_files = "CoreStoreTests/**/*.h"
+        ts.resources = [ "CoreStoreTests/**/*.xcdatamodeld", "CoreStoreTests/**/*.xcdatamodel" ]
+        ts.preserve_paths =  "CoreStoreTests/**/*.xcdatamodeld"
+        ts.frameworks = "Foundation", "CoreData"
+        ts.requires_arc = true
+        ts.ios.deployment_target = "13.0"
+        ts.osx.deployment_target = "10.15"
+        ts.tvos.deployment_target = "13.0"
+        ts.watchos.deployment_target = "7.4"
+    end
 end

CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore OSX.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1400"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore iOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1400"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore tvOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1400"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore watchOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1400"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -20,6 +20,20 @@
                ReferencedContainer = "container:CoreStore.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "B5114DA328CEEE5400EEAE78"
+               BuildableName = "CoreStoreTests.xctest"
+               BlueprintName = "CoreStoreTests watchOS"
+               ReferencedContainer = "container:CoreStore.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
@@ -28,6 +42,16 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "B5114DA328CEEE5400EEAE78"
+               BuildableName = "CoreStoreTests.xctest"
+               BlueprintName = "CoreStoreTests watchOS"
+               ReferencedContainer = "container:CoreStore.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction

CoreStore.xcworkspace/contents.xcworkspacedata

@@ -7,7 +7,4 @@
    <FileRef
       location = "group:CoreStore.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:LegacyDemo/LegacyDemo.xcodeproj">
-   </FileRef>
 </Workspace>

CoreStore.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict/>
+<dict>
+	<key>PreviewsEnabled</key>
+	<false/>
+</dict>
 </plist>

CoreStoreTests/BaseTestCase.swift

@@ -28,6 +28,17 @@ import XCTest
 @testable
 import CoreStore
 
+#if !SWIFT_PACKAGE
+
+extension Bundle {
+    
+    static var module: Bundle {
+        return Bundle(for: BaseTestCase.self)
+    }
+}
+
+#endif
+
 
 // MARK: - BaseTestCase
 
@@ -40,7 +51,7 @@ class BaseTestCase: XCTestCase {
         
         let stack = DataStack(
             xcodeModelName: "Model",
-            bundle: Bundle(for: Self.self)
+            bundle: Bundle.module
         )
         do {
             

CoreStoreTests/BridgingTests.m

@@ -1,269 +0,0 @@
-//
-//  BridgingTests.m
-//  CoreStore
-//
-//  Copyright © 2018 John Rommel Estropia
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to deal
-//  in the Software without restriction, including without limitation the rights
-//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//  copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//
-//  The above copyright notice and this permission notice shall be included in all
-//  copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//  SOFTWARE.
-//
-
-#import "BridgingTests.h"
-#import <CoreStore/CoreStore.h>
-#import <CoreStore/CoreStore-Swift.h>
-#import "CoreStoreTests-Swift.h"
-
-@import CoreData;
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-
-// MARK: - BridgingTests
-
-@implementation BridgingTests
-
-- (void)test_ThatFlags_HaveCorrectValues {
-    
-    XCTAssertEqual(CSLocalStorageOptionsNone, 0);
-    XCTAssertEqual(CSLocalStorageOptionsRecreateStoreOnModelMismatch, 1);
-    XCTAssertEqual(CSLocalStorageOptionsPreventProgressiveMigration, 2);
-    XCTAssertEqual(CSLocalStorageOptionsAllowSynchronousLightweightMigration, 4);
-}
-
-- (void)test_ThatKeyPaths_AreCorrect {
-    
-    XCTAssertEqualObjects(CSKeyPath(TestEntity1, testNumber), @"testNumber");
-    XCTAssertEqualObjects(CSKeyPath(TestEntity1, testString), @"testString");
-    XCTAssertEqualObjects(CSKeyPathOperator(count, TestEntity1, testString), @"@count.testString");
-    XCTAssertEqualObjects(CSKeyPathOperator(max, TestEntity1, testNumber), @"@max.testNumber");
-}
-
-- (void)test_ThatFromClauses_BridgeCorrectly {
-    
-    {
-        CSFrom *from = CSFromClass([TestEntity1 class]);
-        XCTAssertEqualObjects(from.entityClass, [TestEntity1 class]);
-        XCTAssertNil(from.configurations);
-    }
-    {
-        CSFrom *from = CSFromClass([TestEntity1 class], [NSNull null]);
-        XCTAssertEqualObjects(from.entityClass, [TestEntity1 class]);
-        
-        NSArray *configurations = @[[NSNull null]];
-        XCTAssertEqualObjects(from.configurations, configurations);
-    }
-    {
-        CSFrom *from = CSFromClass([TestEntity1 class], @"Config1");
-        XCTAssertEqualObjects(from.entityClass, [TestEntity1 class]);
-        
-        NSArray *configurations = @[@"Config1"];
-        XCTAssertEqualObjects(from.configurations, configurations);
-    }
-    {
-        CSFrom *from = CSFromClass([TestEntity1 class], @[[NSNull null], @"Config2"]);
-        XCTAssertEqualObjects(from.entityClass, [TestEntity1 class]);
-        
-        NSArray *configurations = @[[NSNull null], @"Config2"];
-        XCTAssertEqualObjects(from.configurations, configurations);
-    }
-}
-
-- (void)test_ThatWhereClauses_BridgeCorrectly {
-    
-    {
-        CSWhere *where = CSWhereFormat(@"%K == %@", @"key", @"value");
-        NSPredicate *predicate = [NSPredicate predicateWithFormat:@"%K == %@", @"key", @"value"];
-        XCTAssertEqualObjects(where.predicate, predicate);
-    }
-    {
-        CSWhere *where = CSWhereValue(YES);
-        NSPredicate *predicate = [NSPredicate predicateWithValue:YES];
-        XCTAssertEqualObjects(where.predicate, predicate);
-    }
-    {
-        CSWhere *where = CSWherePredicate([NSPredicate predicateWithFormat:@"%K == %@", @"key", @"value"]);
-        NSPredicate *predicate = [NSPredicate predicateWithFormat:@"%K == %@", @"key", @"value"];
-        XCTAssertEqualObjects(where.predicate, predicate);
-    }
-}
-
-- (void)test_ThatOrderByClauses_BridgeCorrectly {
-    
-    {
-        CSOrderBy *orderBy = CSOrderByKey(CSSortAscending(@"key"));
-        XCTAssertEqualObjects(orderBy.sortDescriptors, @[[NSSortDescriptor sortDescriptorWithKey:@"key" ascending:YES]]);
-    }
-    {
-        CSOrderBy *orderBy = CSOrderByKey(CSSortDescending(@"key"));
-        XCTAssertEqualObjects(orderBy.sortDescriptors, @[[NSSortDescriptor sortDescriptorWithKey:@"key" ascending:NO]]);
-    }
-    {
-        CSOrderBy *orderBy = CSOrderByKeys(CSSortAscending(@"key1"), CSSortDescending(@"key2"), nil);
-        NSArray *sortDescriptors = @[[NSSortDescriptor sortDescriptorWithKey:@"key1" ascending:YES],
-                                     [NSSortDescriptor sortDescriptorWithKey:@"key2" ascending:NO]];
-        XCTAssertEqualObjects(orderBy.sortDescriptors, sortDescriptors);
-    }
-}
-
-- (void)test_ThatGroupByClauses_BridgeCorrectly {
-    
-    {
-        CSGroupBy *groupBy = CSGroupByKeyPath(@"key");
-        XCTAssertEqualObjects(groupBy.keyPaths, @[@"key"]);
-    }
-    {
-        CSGroupBy *groupBy = CSGroupByKeyPaths(@[@"key1", @"key2"]);
-        
-        NSArray *keyPaths = @[@"key1", @"key2"];
-        XCTAssertEqualObjects(groupBy.keyPaths, keyPaths);
-    }
-}
-
-- (void)test_ThatTweakClauses_BridgeCorrectly {
-    
-    CSTweak *tweak = CSTweakRequest(^(NSFetchRequest * _Nonnull fetchRequest) {
-        
-        fetchRequest.fetchLimit = 100;
-    });
-    NSFetchRequest *request = [NSFetchRequest new];
-    tweak.block(request);
-    XCTAssertEqual(request.fetchLimit, 100);
-}
-
-- (void)test_ThatIntoClauses_BridgeCorrectly {
-    
-    {
-        CSInto *into = CSIntoClass([TestEntity1 class]);
-        XCTAssertEqualObjects(into.entityClass, [TestEntity1 class]);
-    }
-    {
-        CSInto *into = CSIntoClass([TestEntity1 class], [NSNull null]);
-        XCTAssertEqualObjects(into.entityClass, [TestEntity1 class]);
-        XCTAssertNil(into.configuration);
-    }
-    {
-        CSInto *into = CSIntoClass([TestEntity1 class], @"Config1");
-        XCTAssertEqualObjects(into.entityClass, [TestEntity1 class]);
-        XCTAssertEqualObjects(into.configuration, @"Config1");
-    }
-}
-
-- (void)test_ThatDataStacks_BridgeCorrectly {
-    
-    CSDataStack *dataStack = [[CSDataStack alloc]
-                              initWithXcodeModelName:@"Model"
-                              bundle:[NSBundle bundleForClass:[self class]]
-                              versionChain:nil];
-    XCTAssertNotNil(dataStack);
-    
-    NSError *memoryError;
-    CSInMemoryStore *memoryStorage = [dataStack
-                                      addInMemoryStorageAndWait:[CSInMemoryStore new]
-                                      error:&memoryError];
-    XCTAssertNotNil(memoryStorage);
-    XCTAssertEqualObjects([[memoryStorage class] storeType], [CSInMemoryStore storeType]);
-    XCTAssertEqualObjects([[memoryStorage class] storeType], NSInMemoryStoreType);
-    XCTAssertNil(memoryStorage.configuration);
-    XCTAssertNil(memoryStorage.storeOptions);
-    XCTAssertNil(memoryError);
-    
-    NSError *sqliteError;
-    CSSQLiteStore *sqliteStorage = [dataStack
-                                    addSQLiteStorageAndWait:[CSSQLiteStore new]
-                                    error:&sqliteError];
-    XCTAssertNotNil(sqliteStorage);
-    XCTAssertEqualObjects([[sqliteStorage class] storeType], [CSSQLiteStore storeType]);
-    XCTAssertEqualObjects([[sqliteStorage class] storeType], NSSQLiteStoreType);
-    XCTAssertNil(sqliteStorage.configuration);
-    NSDictionary *storeOptions;
-    if (@available(iOS 11.0, macOS 10.13, tvOS 11.0, *)) {
-        
-        storeOptions = @{ NSSQLitePragmasOption: @{ @"journal_mode": @"WAL" },
-                          NSBinaryStoreInsecureDecodingCompatibilityOption: @YES };
-    }
-    else {
-        
-        storeOptions = @{ NSSQLitePragmasOption: @{ @"journal_mode": @"WAL" }};
-    }
-    XCTAssertEqualObjects(sqliteStorage.storeOptions, storeOptions);
-    XCTAssertNil(sqliteError);
-}
-
-- (void)test_ThatTransactions_BridgeCorrectly {
-
-    CSDataStack *dataStack = [[CSDataStack alloc]
-                              initWithXcodeModelName:@"Model"
-                              bundle:[NSBundle bundleForClass:[self class]]
-                              versionChain:nil];
-    XCTAssertNotNil(dataStack);
-
-    [dataStack
-     addInMemoryStorageAndWait:[CSInMemoryStore new]
-     error:nil];
-    
-    {
-        CSUnsafeDataTransaction *transaction = [dataStack beginUnsafe];
-        XCTAssertNotNil(transaction);
-        XCTAssert([transaction isKindOfClass:[CSUnsafeDataTransaction class]]);
-        NSError *error;
-        BOOL result = [transaction commitAndWaitWithError:&error];
-        XCTAssertTrue(result);
-        XCTAssertNil(error);
-    }
-    {
-        XCTestExpectation *expectation = [self expectationWithDescription:@"sync"];
-        NSError *error;
-        BOOL result =
-        [dataStack
-         beginSynchronous:^(CSSynchronousDataTransaction * _Nonnull transaction) {
-
-            XCTAssertNotNil(transaction);
-            XCTAssert([transaction isKindOfClass:[CSSynchronousDataTransaction class]]);
-            NSError *error;
-            XCTAssertTrue([transaction commitAndWaitWithError:&error]);
-            XCTAssertNil(error);
-            [expectation fulfill];
-        }
-         error:&error];
-        XCTAssertTrue(result);
-        XCTAssertNil(error);
-    }
-    {
-        XCTestExpectation *expectation = [self expectationWithDescription:@"async"];
-        [dataStack beginAsynchronous:^(CSAsynchronousDataTransaction * _Nonnull transaction) {
-            
-            XCTAssertNotNil(transaction);
-            XCTAssert([transaction isKindOfClass:[CSAsynchronousDataTransaction class]]);
-            [transaction
-             commitWithSuccess:^{
-                 
-                 [expectation fulfill];
-             }
-             failure:^(CSError *error){
-                 
-                 XCTFail();
-             }];
-        }];
-    }
-    [self waitForExpectationsWithTimeout:10 handler:nil];
-}
-
-@end
-
-#pragma clang diagnostic pop

CoreStoreTests/ConvenienceTests.swift

@@ -23,13 +23,15 @@
 //  SOFTWARE.
 //
 
+import CoreData
+import XCTest
+
 @testable
 import CoreStore
 
 
 // MARK: - ConvenienceTests
 
-@available(macOS 10.12, *)
 class ConvenienceTests: BaseTestCase {
     
     @objc

CoreStoreTests/CoreStoreTests-Bridging-Header.h

@@ -1,5 +0,0 @@
-//
-//  Use this file to import your target's public headers that you would like to expose to Swift.
-//
-
-#import "BridgingTests.h"

CoreStoreTests/DynamicModelTests.swift

@@ -197,7 +197,7 @@ class DynamicModelTests: BaseTestDataTestCase {
                 modelVersion: "V1",
                 entities: [
                     Entity<Animal>("Animal"),
-                    Entity<Dog>("Dog"),
+                    Entity<Dog>("Dog", indexes: [[\Dog.$nickname, \Dog.$age]]),
                     Entity<Person>("Person")
                 ],
                 versionLock: [

CoreStoreTests/ErrorTests.swift

@@ -31,7 +31,6 @@ import CoreStore
 
 // MARK: - ErrorTests
 
-@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.")
 final class ErrorTests: XCTestCase {
 
     @objc
@@ -43,14 +42,12 @@ final class ErrorTests: XCTestCase {
         
         let userInfo: NSDictionary = [:]
         
-        let objcError = error.bridgeToObjectiveC
-        XCTAssertEqual(error, objcError.bridgeToSwift)
+        let objcError = error as NSError
         XCTAssertEqual(objcError.domain, CoreStoreErrorDomain)
         XCTAssertEqual(objcError.code, CoreStoreErrorCode.unknownError.rawValue)
         XCTAssertEqual(objcError.userInfo as NSDictionary, userInfo)
         
-        let objcError2 = objcError.bridgeToSwift.bridgeToObjectiveC
-        XCTAssertEqual(error, objcError2.bridgeToSwift)
+        let objcError2 = CoreStoreError(objcError) as NSError
         XCTAssertEqual(objcError2.domain, CoreStoreErrorDomain)
         XCTAssertEqual(objcError2.code, CoreStoreErrorCode.unknownError.rawValue)
         XCTAssertEqual(objcError2.userInfo as NSDictionary, userInfo)
@@ -68,14 +65,12 @@ final class ErrorTests: XCTestCase {
         let userInfo: NSDictionary = [
             "existingPersistentStoreURL": dummyURL
         ]
-        let objcError = error.bridgeToObjectiveC
-        XCTAssertEqual(error, objcError.bridgeToSwift)
+        let objcError = error as NSError
         XCTAssertEqual(objcError.domain, CoreStoreErrorDomain)
         XCTAssertEqual(objcError.code, CoreStoreErrorCode.differentStorageExistsAtURL.rawValue)
         XCTAssertEqual(objcError.userInfo as NSDictionary, userInfo)
-        
-        let objcError2 = objcError.bridgeToSwift.bridgeToObjectiveC
-        XCTAssertEqual(error, objcError2.bridgeToSwift)
+
+        let objcError2 = CoreStoreError(objcError) as NSError
         XCTAssertEqual(objcError2.domain, CoreStoreErrorDomain)
         XCTAssertEqual(objcError2.code, CoreStoreErrorCode.differentStorageExistsAtURL.rawValue)
         XCTAssertEqual(objcError2.userInfo as NSDictionary, userInfo)
@@ -89,7 +84,7 @@ final class ErrorTests: XCTestCase {
         let schemaHistory = SchemaHistory(
             XcodeDataModelSchema.from(
                 modelName: "Model",
-                bundle: Bundle(for: Self.self)
+                bundle: Bundle.module
             )
         )
         let version = "1.0.0"
@@ -103,14 +98,12 @@ final class ErrorTests: XCTestCase {
             "targetModel": schemaHistory.rawModel,
             "targetModelVersion": version
         ]
-        let objcError = error.bridgeToObjectiveC
-        XCTAssertEqual(error, objcError.bridgeToSwift)
+        let objcError = error as NSError
         XCTAssertEqual(objcError.domain, CoreStoreErrorDomain)
         XCTAssertEqual(objcError.code, CoreStoreErrorCode.mappingModelNotFound.rawValue)
         XCTAssertEqual(objcError.userInfo as NSDictionary, userInfo)
-        
-        let objcError2 = objcError.bridgeToSwift.bridgeToObjectiveC
-        XCTAssertEqual(error, objcError2.bridgeToSwift)
+
+        let objcError2 = CoreStoreError(objcError) as NSError
         XCTAssertEqual(objcError2.domain, CoreStoreErrorDomain)
         XCTAssertEqual(objcError2.code, CoreStoreErrorCode.mappingModelNotFound.rawValue)
         XCTAssertEqual(objcError2.userInfo as NSDictionary, userInfo)
@@ -128,14 +121,12 @@ final class ErrorTests: XCTestCase {
         let userInfo: NSDictionary = [
             "localStoreURL": dummyURL
         ]
-        let objcError = error.bridgeToObjectiveC
-        XCTAssertEqual(error, objcError.bridgeToSwift)
+        let objcError = error as NSError
         XCTAssertEqual(objcError.domain, CoreStoreErrorDomain)
         XCTAssertEqual(objcError.code, CoreStoreErrorCode.progressiveMigrationRequired.rawValue)
         XCTAssertEqual(objcError.userInfo as NSDictionary, userInfo)
-        
-        let objcError2 = objcError.bridgeToSwift.bridgeToObjectiveC
-        XCTAssertEqual(error, objcError2.bridgeToSwift)
+
+        let objcError2 = CoreStoreError(objcError) as NSError
         XCTAssertEqual(objcError2.domain, CoreStoreErrorDomain)
         XCTAssertEqual(objcError2.code, CoreStoreErrorCode.progressiveMigrationRequired.rawValue)
         XCTAssertEqual(objcError2.userInfo as NSDictionary, userInfo)
@@ -160,14 +151,12 @@ final class ErrorTests: XCTestCase {
         let userInfo: NSDictionary = [
             "NSError": internalError
         ]
-        let objcError = error.bridgeToObjectiveC
-        XCTAssertEqual(error, objcError.bridgeToSwift)
+        let objcError = error as NSError
         XCTAssertEqual(objcError.domain, CoreStoreErrorDomain)
         XCTAssertEqual(objcError.code, CoreStoreErrorCode.internalError.rawValue)
         XCTAssertEqual(objcError.userInfo as NSDictionary, userInfo)
-        
-        let objcError2 = objcError.bridgeToSwift.bridgeToObjectiveC
-        XCTAssertEqual(error, objcError2.bridgeToSwift)
+
+        let objcError2 = CoreStoreError(objcError) as NSError
         XCTAssertEqual(objcError2.domain, CoreStoreErrorDomain)
         XCTAssertEqual(objcError2.code, CoreStoreErrorCode.internalError.rawValue)
         XCTAssertEqual(objcError2.userInfo as NSDictionary, userInfo)

CoreStoreTests/FromTests.swift

@@ -23,6 +23,7 @@
 //  SOFTWARE.
 //
 
+import CoreData
 import XCTest
 
 @testable

CoreStoreTests/GroupByTests.swift

@@ -23,6 +23,7 @@
 //  SOFTWARE.
 //
 
+import CoreData
 import XCTest
 
 @testable

CoreStoreTests/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.2.1</string>
+	<string>9.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

CoreStoreTests/IntoTests.swift

@@ -23,6 +23,7 @@
 //  SOFTWARE.
 //
 
+import CoreData
 import XCTest
 
 @testable
@@ -125,15 +126,4 @@ final class IntoTests: XCTestCase {
             XCTAssertNotEqual(into, Into<TestEntity1>("Config2"))
         }
     }
-    
-    @objc
-    dynamic func test_ThatIntoClauses_BridgeCorrectly() {
-        
-        do {
-            
-            let into = Into<NSManagedObject>()
-            let objcInto = into.bridgeToObjectiveC
-            XCTAssertEqual(into, objcInto.bridgeToSwift)
-        }
-    }
 }

CoreStoreTests/ListObserverTests.swift

@@ -23,6 +23,7 @@
 //  SOFTWARE.
 //
 
+import CoreData
 import XCTest
 
 @testable
@@ -31,7 +32,6 @@ import CoreStore
 
 // MARK: - ListObserverTests
 
-@available(macOS 10.12, *)
 class ListObserverTests: BaseTestDataTestCase {
     
     @objc
@@ -101,9 +101,9 @@ class ListObserverTests: BaseTestDataTestCase {
                         ["indexPath", "object"]
                     )
                     
-                    let indexPath = userInfo?["indexPath"] as? NSIndexPath
-                    XCTAssertEqual(indexPath?.index(atPosition: 0), 0)
-                    XCTAssertEqual(indexPath?.index(atPosition: 1), 0)
+                    let indexPath = userInfo?["indexPath"] as? IndexPath
+                    XCTAssertEqual(indexPath?.section, 0)
+                    XCTAssertEqual(indexPath?.item, 0)
                     
                     let object = userInfo?["object"] as? TestEntity1
                     XCTAssertEqual(object?.testBoolean, NSNumber(value: true))
@@ -213,14 +213,14 @@ class ListObserverTests: BaseTestDataTestCase {
                         ["indexPath", "object"]
                     )
                     
-                    let indexPath = userInfo?["indexPath"] as? NSIndexPath
+                    let indexPath = userInfo?["indexPath"] as? IndexPath
                     let object = userInfo?["object"] as? TestEntity1
                     
                     switch object?.testEntityID {
                         
                     case NSNumber(value: 101)?:
-                        XCTAssertEqual(indexPath?.index(atPosition: 0), 1)
-                        XCTAssertEqual(indexPath?.index(atPosition: 1), 0)
+                        XCTAssertEqual(indexPath?.section, 1)
+                        XCTAssertEqual(indexPath?.item, 0)
                         
                         XCTAssertEqual(object?.testBoolean, NSNumber(value: true))
                         XCTAssertEqual(object?.testNumber, NSNumber(value: 11))
@@ -230,8 +230,8 @@ class ListObserverTests: BaseTestDataTestCase {
                         XCTAssertEqual(object?.testDate, self.dateFormatter.date(from: "2000-01-11T00:00:00Z")!)
                         
                     case NSNumber(value: 102)?:
-                        XCTAssertEqual(indexPath?.index(atPosition: 0), 0)
-                        XCTAssertEqual(indexPath?.index(atPosition: 1), 0)
+                        XCTAssertEqual(indexPath?.section, 0)
+                        XCTAssertEqual(indexPath?.item, 0)
                         
                         XCTAssertEqual(object?.testBoolean, NSNumber(value: false))
                         XCTAssertEqual(object?.testNumber, NSNumber(value: 22))
@@ -357,13 +357,13 @@ class ListObserverTests: BaseTestDataTestCase {
                         ["fromIndexPath", "toIndexPath", "object"]
                     )
                     
-                    let fromIndexPath = userInfo?["fromIndexPath"] as? NSIndexPath
-                    XCTAssertEqual(fromIndexPath?.index(atPosition: 0), 0)
-                    XCTAssertEqual(fromIndexPath?.index(atPosition: 1), 0)
+                    let fromIndexPath = userInfo?["fromIndexPath"] as? IndexPath
+                    XCTAssertEqual(fromIndexPath?.section, 0)
+                    XCTAssertEqual(fromIndexPath?.item, 0)
                     
-                    let toIndexPath = userInfo?["toIndexPath"] as? NSIndexPath
-                    XCTAssertEqual(toIndexPath?.index(atPosition: 0), 1)
-                    XCTAssertEqual(toIndexPath?.index(atPosition: 1), 1)
+                    let toIndexPath = userInfo?["toIndexPath"] as? IndexPath
+                    XCTAssertEqual(toIndexPath?.section, 1)
+                    XCTAssertEqual(toIndexPath?.item, 1)
                     
                     let object = userInfo?["object"] as? TestEntity1
                     XCTAssertEqual(object?.testEntityID, NSNumber(value: 102))
@@ -465,10 +465,10 @@ class ListObserverTests: BaseTestDataTestCase {
                         ["indexPath", "object"]
                     )
                     
-                    let indexPath = userInfo?["indexPath"] as? NSIndexPath
+                    let indexPath = userInfo?["indexPath"] as? IndexPath
                     
                     XCTAssertEqual(indexPath?.section, 0)
-                    XCTAssert(indexPath?.index(atPosition: 1) == 0 || indexPath?.index(atPosition: 1) == 1)
+                    XCTAssert(indexPath?.item == 0 || indexPath?.item == 1)
                     
                     let object = userInfo?["object"] as? TestEntity1
                     XCTAssertEqual(object?.isDeleted, true)
@@ -551,7 +551,6 @@ class ListObserverTests: BaseTestDataTestCase {
 
 // MARK: TestListObserver
 
-@available(macOS 10.12, *)
 class TestListObserver: ListSectionObserver {
     
     // MARK: ListObserver

CoreStoreTests/ListPublisherTests.swift

@@ -33,7 +33,6 @@ import CoreStore
 
 // MARK: - ListPublisherTests
 
-@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
 class ListPublisherTests: BaseTestDataTestCase {
 
     @objc

CoreStoreTests/Model.xcdatamodeld/Model.xcdatamodel/contents

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="14460.32" systemVersion="17G2307" minimumToolsVersion="Xcode 4.3" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
-    <entity name="TestEntity1AAA" representedClassName="CoreStoreTests.TestEntity1" syncable="YES">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="21279" systemVersion="21G83" minimumToolsVersion="Xcode 4.3" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
+    <entity name="TestEntity1AAA" representedClassName=".TestEntity1" syncable="YES">
         <attribute name="testBoolean" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="testData" optional="YES" attributeType="Binary" syncable="YES"/>
         <attribute name="testDate" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
@@ -12,7 +12,7 @@
         <relationship name="testToManyUnordered" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="TestEntity1AAA" inverseName="testToOne" inverseEntity="TestEntity1AAA" syncable="YES"/>
         <relationship name="testToOne" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="TestEntity1AAA" inverseName="testToManyUnordered" inverseEntity="TestEntity1AAA" syncable="YES"/>
     </entity>
-    <entity name="TestEntity2" representedClassName="CoreStoreTests.TestEntity2" syncable="YES">
+    <entity name="TestEntity2" representedClassName=".TestEntity2" syncable="YES">
         <attribute name="testBoolean" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="testData" optional="YES" attributeType="Binary" syncable="YES"/>
         <attribute name="testDate" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
@@ -30,8 +30,4 @@
     <configuration name="Config2">
         <memberEntity name="TestEntity2"/>
     </configuration>
-    <elements>
-        <element name="TestEntity1AAA" positionX="-63" positionY="-18" width="128" height="195"/>
-        <element name="TestEntity2" positionX="-63" positionY="9" width="128" height="195"/>
-    </elements>
 </model>

CoreStoreTests/ObjectObserverTests.swift

@@ -31,7 +31,6 @@ import CoreStore
 
 // MARK: - ObjectObserverTests
 
-@available(macOS 10.12, *)
 class ObjectObserverTests: BaseTestDataTestCase {
     
     @objc
@@ -203,7 +202,6 @@ class ObjectObserverTests: BaseTestDataTestCase {
 
 // MARK: TestObjectObserver
 
-@available(macOS 10.12, *)
 class TestObjectObserver: ObjectObserver {
     
     typealias ObjectEntityType = TestEntity1

CoreStoreTests/ObjectPublisherTests.swift

@@ -31,7 +31,6 @@ import CoreStore
 
 // MARK: - ObjectPublisherTests
 
-@available(macOS 10.12, *)
 class ObjectPublisherTests: BaseTestDataTestCase {
 
     @objc

CoreStoreTests/OrderByTests.swift

@@ -23,6 +23,7 @@
 //  SOFTWARE.
 //
 
+import CoreData
 import XCTest
 
 @testable

CoreStoreTests/QueryTests.swift

@@ -23,6 +23,7 @@
 //  SOFTWARE.
 //
 
+import CoreData
 import XCTest
 
 @testable

CoreStoreTests/SectionByTests.swift

@@ -23,6 +23,7 @@
 //  SOFTWARE.
 //
 
+import CoreData
 import XCTest
 
 @testable
@@ -31,7 +32,6 @@ import CoreStore
 
 //MARK: - SectionByTests
 
-@available(macOS 10.12, *)
 final class SectionByTests: XCTestCase {
     
     @objc
@@ -41,11 +41,14 @@ final class SectionByTests: XCTestCase {
             
             let sectionBy = SectionBy<NSManagedObject>("key")
             XCTAssertEqual(sectionBy.sectionKeyPath, "key")
-            XCTAssertEqual(sectionBy.sectionIndexTransformer("key"), "key")
+            XCTAssertNil(sectionBy.sectionIndexTransformer("key"))
         }
         do {
             
-            let sectionBy = SectionBy<NSManagedObject>("key") { $0.flatMap { "\($0):suffix" } }
+            let sectionBy = SectionBy<NSManagedObject>(
+                "key",
+                sectionIndexTransformer: { $0.flatMap { "\($0):suffix" } }
+            )
             XCTAssertEqual(sectionBy.sectionKeyPath, "key")
             XCTAssertEqual(sectionBy.sectionIndexTransformer("key"), "key:suffix")
             XCTAssertNil(sectionBy.sectionIndexTransformer(nil))

CoreStoreTests/SelectTests.swift

@@ -23,6 +23,7 @@
 //  SOFTWARE.
 //
 
+import CoreData
 import XCTest
 
 @testable

CoreStoreTests/SetupTests.swift

@@ -23,6 +23,9 @@
 //  SOFTWARE.
 //
 
+import CoreData
+import XCTest
+
 @testable
 import CoreStore
 
@@ -39,7 +42,7 @@ class SetupTests: BaseTestDataTestCase {
             let schemaHistory = SchemaHistory(
                 XcodeDataModelSchema.from(
                     modelName: "Model",
-                    bundle: Bundle(for: Self.self)
+                    bundle: Bundle.module
                 )
             )
             let stack = DataStack(schemaHistory: schemaHistory)
@@ -65,7 +68,7 @@ class SetupTests: BaseTestDataTestCase {
                 
                 DataStack(
                     xcodeModelName: "Model",
-                    bundle: Bundle(for: Self.self),
+                    bundle: Bundle.module,
                     migrationChain: migrationChain
                 )
             }
@@ -79,7 +82,7 @@ class SetupTests: BaseTestDataTestCase {
         
         let stack = DataStack(
             xcodeModelName: "Model",
-            bundle: Bundle(for: Self.self)
+            bundle: Bundle.module
         )
         do {
             
@@ -134,7 +137,7 @@ class SetupTests: BaseTestDataTestCase {
         
         let stack = DataStack(
             xcodeModelName: "Model",
-            bundle: Bundle(for: Self.self)
+            bundle: Bundle.module
         )
         do {
             
@@ -202,7 +205,7 @@ class SetupTests: BaseTestDataTestCase {
                 
                 let stack = DataStack(
                     xcodeModelName: "Model",
-                    bundle: Bundle(for: Self.self)
+                    bundle: Bundle.module
                 )
                 try! stack.addStorageAndWait(sqliteStore)
                 self.prepareTestDataForStack(stack)
@@ -221,7 +224,7 @@ class SetupTests: BaseTestDataTestCase {
             let metadata = try createStore()
             let stack = DataStack(
                 xcodeModelName: "Model",
-                bundle: Bundle(for: Self.self)
+                bundle: Bundle.module
             )
             try sqliteStore.cs_eraseStorageAndWait(
                 metadata: metadata,
@@ -254,7 +257,7 @@ class SetupTests: BaseTestDataTestCase {
         
         let stack = DataStack(
             xcodeModelName: "Model",
-            bundle: Bundle(for: Self.self)
+            bundle: Bundle.module
         )
         do {
             
@@ -322,7 +325,7 @@ class SetupTests: BaseTestDataTestCase {
                 
                 let stack = DataStack(
                     xcodeModelName: "Model",
-                    bundle: Bundle(for: Self.self)
+                    bundle: Bundle.module
                 )
                 try! stack.addStorageAndWait(
                     SQLiteStore.legacy(
@@ -348,7 +351,7 @@ class SetupTests: BaseTestDataTestCase {
             let metadata = try createStore()
             let stack = DataStack(
                 xcodeModelName: "Model",
-                bundle: Bundle(for: Self.self)
+                bundle: Bundle.module
             )
             try sqliteStore.cs_eraseStorageAndWait(
                 metadata: metadata,

CoreStoreTests/StorageInterfaceTests.swift

@@ -23,6 +23,7 @@
 //  SOFTWARE.
 //
 
+import CoreData
 import XCTest
 
 @testable
@@ -83,21 +84,11 @@ final class StorageInterfaceTests: XCTestCase {
         let store = SQLiteStore()
         XCTAssertEqual(type(of: store).storeType, NSSQLiteStoreType)
         XCTAssertNil(store.configuration)
-        if #available(iOS 11.0, macOS 10.13, tvOS 11.0, *) {
-            
-            XCTAssertEqual(
-                store.storeOptions as NSDictionary?,
-                [NSSQLitePragmasOption: ["journal_mode": "WAL"],
-                 NSBinaryStoreInsecureDecodingCompatibilityOption: true] as NSDictionary
-            )
-        }
-        else {
-            
-            XCTAssertEqual(
-                store.storeOptions as NSDictionary?,
-                [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary
-            )
-        }
+        XCTAssertEqual(
+            store.storeOptions as NSDictionary?,
+            [NSSQLitePragmasOption: ["journal_mode": "WAL"],
+             NSBinaryStoreInsecureDecodingCompatibilityOption: true] as NSDictionary
+        )
         
         XCTAssertEqual(store.fileURL, SQLiteStore.defaultFileURL)
         XCTAssertTrue(store.migrationMappingProviders.isEmpty)
@@ -112,7 +103,7 @@ final class StorageInterfaceTests: XCTestCase {
             .appendingPathExtension("db")
         let mappingProvider = XcodeSchemaMappingProvider(
             from: "V1", to: "V2",
-            mappingModelBundle: Bundle(for: Self.self)
+            mappingModelBundle: Bundle.module
         )
         
         let store = SQLiteStore(
@@ -123,21 +114,11 @@ final class StorageInterfaceTests: XCTestCase {
         )
         XCTAssertEqual(type(of: store).storeType, NSSQLiteStoreType)
         XCTAssertEqual(store.configuration, "config1")
-        if #available(iOS 11.0, macOS 10.13, tvOS 11.0, *) {
-            
-            XCTAssertEqual(
-                store.storeOptions as NSDictionary?,
-                [NSSQLitePragmasOption: ["journal_mode": "WAL"],
-                 NSBinaryStoreInsecureDecodingCompatibilityOption: true] as NSDictionary
-            )
-        }
-        else {
-            
-            XCTAssertEqual(
-                store.storeOptions as NSDictionary?,
-                [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary
-            )
-        }
+        XCTAssertEqual(
+            store.storeOptions as NSDictionary?,
+            [NSSQLitePragmasOption: ["journal_mode": "WAL"],
+             NSBinaryStoreInsecureDecodingCompatibilityOption: true] as NSDictionary
+        )
         
         XCTAssertEqual(store.fileURL, fileURL)
         XCTAssertEqual(store.migrationMappingProviders as! [XcodeSchemaMappingProvider], [mappingProvider])
@@ -150,7 +131,7 @@ final class StorageInterfaceTests: XCTestCase {
         let fileName = UUID().uuidString + ".db"
         let mappingProvider = XcodeSchemaMappingProvider(
             from: "V1", to: "V2",
-            mappingModelBundle: Bundle(for: Self.self)
+            mappingModelBundle: Bundle.module
         )
         let store = SQLiteStore(
             fileName: fileName,
@@ -160,21 +141,11 @@ final class StorageInterfaceTests: XCTestCase {
         )
         XCTAssertEqual(type(of: store).storeType, NSSQLiteStoreType)
         XCTAssertEqual(store.configuration, "config1")
-        if #available(iOS 11.0, macOS 10.13, tvOS 11.0, *) {
-            
-            XCTAssertEqual(
-                store.storeOptions as NSDictionary?,
-                [NSSQLitePragmasOption: ["journal_mode": "WAL"],
-                 NSBinaryStoreInsecureDecodingCompatibilityOption: true] as NSDictionary
-            )
-        }
-        else {
-            
-            XCTAssertEqual(
-                store.storeOptions as NSDictionary?,
-                [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary
-            )
-        }
+        XCTAssertEqual(
+            store.storeOptions as NSDictionary?,
+            [NSSQLitePragmasOption: ["journal_mode": "WAL"],
+             NSBinaryStoreInsecureDecodingCompatibilityOption: true] as NSDictionary
+        )
         
         XCTAssertEqual(store.fileURL.deletingLastPathComponent(), SQLiteStore.defaultRootDirectory)
         XCTAssertEqual(store.fileURL.lastPathComponent, fileName)
@@ -209,21 +180,11 @@ final class StorageInterfaceTests: XCTestCase {
         let store = SQLiteStore.legacy()
         XCTAssertEqual(type(of: store).storeType, NSSQLiteStoreType)
         XCTAssertNil(store.configuration)
-        if #available(iOS 11.0, macOS 10.13, tvOS 11.0, *) {
-            
-            XCTAssertEqual(
-                store.storeOptions as NSDictionary?,
-                [NSSQLitePragmasOption: ["journal_mode": "WAL"],
-                 NSBinaryStoreInsecureDecodingCompatibilityOption: true] as NSDictionary
-            )
-        }
-        else {
-            
-            XCTAssertEqual(
-                store.storeOptions as NSDictionary?,
-                [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary
-            )
-        }
+        XCTAssertEqual(
+            store.storeOptions as NSDictionary?,
+            [NSSQLitePragmasOption: ["journal_mode": "WAL"],
+             NSBinaryStoreInsecureDecodingCompatibilityOption: true] as NSDictionary
+        )
         
         XCTAssertEqual(store.fileURL, SQLiteStore.legacyDefaultFileURL)
         XCTAssertTrue(store.migrationMappingProviders.isEmpty)
@@ -236,7 +197,7 @@ final class StorageInterfaceTests: XCTestCase {
         let fileName = UUID().uuidString + ".db"
         let mappingProvider = XcodeSchemaMappingProvider(
             from: "V1", to: "V2",
-            mappingModelBundle: Bundle(for: Self.self)
+            mappingModelBundle: Bundle.module
         )
         let store = SQLiteStore.legacy(
             fileName: fileName,
@@ -246,21 +207,11 @@ final class StorageInterfaceTests: XCTestCase {
         )
         XCTAssertEqual(type(of: store).storeType, NSSQLiteStoreType)
         XCTAssertEqual(store.configuration, "config1")
-        if #available(iOS 11.0, macOS 10.13, tvOS 11.0, *) {
-            
-            XCTAssertEqual(
-                store.storeOptions as NSDictionary?,
-                [NSSQLitePragmasOption: ["journal_mode": "WAL"],
-                 NSBinaryStoreInsecureDecodingCompatibilityOption: true] as NSDictionary
-            )
-        }
-        else {
-            
-            XCTAssertEqual(
-                store.storeOptions as NSDictionary?,
-                [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary
-            )
-        }
+        XCTAssertEqual(
+            store.storeOptions as NSDictionary?,
+            [NSSQLitePragmasOption: ["journal_mode": "WAL"],
+             NSBinaryStoreInsecureDecodingCompatibilityOption: true] as NSDictionary
+        )
         
         XCTAssertEqual(store.fileURL.deletingLastPathComponent(), SQLiteStore.legacyDefaultRootDirectory)
         XCTAssertEqual(store.fileURL.lastPathComponent, fileName)

CoreStoreTests/TransactionTests.swift

@@ -23,6 +23,7 @@
 //  SOFTWARE.
 //
 
+import Foundation
 import XCTest
 
 @testable
@@ -383,8 +384,6 @@ final class TransactionTests: BaseTestCase {
         }
     }
     
-    
-    @available(macOS 10.12, *)
     @objc
     dynamic func test_ThatSynchronousTransactions_CanCommitWithoutWaitingForMerges() {
         
@@ -428,9 +427,9 @@ final class TransactionTests: BaseTestCase {
                         ["indexPath", "object"]
                     )
                     
-                    let indexPath = userInfo?["indexPath"] as? NSIndexPath
-                    XCTAssertEqual(indexPath?.index(atPosition: 0), 0)
-                    XCTAssertEqual(indexPath?.index(atPosition: 1), 0)
+                    let indexPath = userInfo?["indexPath"] as? IndexPath
+                    XCTAssertEqual(indexPath?.section, 0)
+                    XCTAssertEqual(indexPath?.item, 0)
                     
                     let object = userInfo?["object"] as? TestEntity1
                     XCTAssertEqual(object?.testBoolean, NSNumber(value: true))

CoreStoreTests/TweakTests.swift

@@ -23,6 +23,7 @@
 //  SOFTWARE.
 //
 
+import CoreData
 import XCTest
 
 @testable

CoreStoreTests/WhereTests.swift

@@ -23,6 +23,7 @@
 //  SOFTWARE.
 //
 
+import CoreData
 import XCTest
 
 @testable

Demo/Demo.xcodeproj/project.pbxproj

@@ -8,16 +8,16 @@
 
 /* Begin PBXBuildFile section */
 		B531EFE724EA762D005F247D /* Menu.PlaceholderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B531EFE624EA762D005F247D /* Menu.PlaceholderView.swift */; };
-		B531EFE924EB5A53005F247D /* ⭐️Modern.PokedexDemo.PokedexEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = B531EFE824EB5A52005F247D /* ⭐️Modern.PokedexDemo.PokedexEntry.swift */; };
-		B531EFEB24EB5ECD005F247D /* ⭐️Modern.PokedexDemo.Service.swift in Sources */ = {isa = PBXBuildFile; fileRef = B531EFEA24EB5ECD005F247D /* ⭐️Modern.PokedexDemo.Service.swift */; };
+		B531EFE924EB5A53005F247D /* Modern.PokedexDemo.PokedexEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = B531EFE824EB5A52005F247D /* Modern.PokedexDemo.PokedexEntry.swift */; };
+		B531EFEB24EB5ECD005F247D /* Modern.PokedexDemo.Service.swift in Sources */ = {isa = PBXBuildFile; fileRef = B531EFEA24EB5ECD005F247D /* Modern.PokedexDemo.Service.swift */; };
 		B531EFED24EB7453005F247D /* Modern.PokedexDemo.MainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B531EFEC24EB7453005F247D /* Modern.PokedexDemo.MainView.swift */; };
 		B54D2F7A25119540004BEC7D /* Advanced.EvolutionDemo.V2.FromV1.xcmappingmodel in Sources */ = {isa = PBXBuildFile; fileRef = B54D2F7925119540004BEC7D /* Advanced.EvolutionDemo.V2.FromV1.xcmappingmodel */; };
 		B54D2F7C251196B6004BEC7D /* Advanced.EvolutionDemo.V2.FromV1MigrationPolicy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54D2F7B251196B6004BEC7D /* Advanced.EvolutionDemo.V2.FromV1MigrationPolicy.swift */; };
 		B54D2F7E25119DCE004BEC7D /* Advanced.EvolutionDemo.V1.FromV2.xcmappingmodel in Sources */ = {isa = PBXBuildFile; fileRef = B54D2F7D25119DCE004BEC7D /* Advanced.EvolutionDemo.V1.FromV2.xcmappingmodel */; };
 		B54D2F852511B70B004BEC7D /* Advanced.EvolutionDemo.CreaturesDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54D2F842511B70B004BEC7D /* Advanced.EvolutionDemo.CreaturesDataSource.swift */; };
-		B566C8E824F9D406001134A1 /* Modern.PokedexDemo.ListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B566C8E724F9D406001134A1 /* Modern.PokedexDemo.ListView.swift */; };
-		B566C8EA24F9D412001134A1 /* Modern.PokedexDemo.ListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B566C8E924F9D412001134A1 /* Modern.PokedexDemo.ListViewController.swift */; };
-		B566C8EC24F9D694001134A1 /* Modern.PokedexDemo.ItemCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B566C8EB24F9D694001134A1 /* Modern.PokedexDemo.ItemCell.swift */; };
+		B566C8E824F9D406001134A1 /* Modern.PokedexDemo.UIKit.ListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B566C8E724F9D406001134A1 /* Modern.PokedexDemo.UIKit.ListView.swift */; };
+		B566C8EA24F9D412001134A1 /* Modern.PokedexDemo.UIKit.ListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B566C8E924F9D412001134A1 /* Modern.PokedexDemo.UIKit.ListViewController.swift */; };
+		B566C8EC24F9D694001134A1 /* Modern.PokedexDemo.UIKit.ItemCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B566C8EB24F9D694001134A1 /* Modern.PokedexDemo.UIKit.ItemCell.swift */; };
 		B566C8EE24FA1EA3001134A1 /* Modern.PokedexDemo.Details.swift in Sources */ = {isa = PBXBuildFile; fileRef = B566C8ED24FA1EA3001134A1 /* Modern.PokedexDemo.Details.swift */; };
 		B5931B4225124756007DA58E /* Advanced.EvolutionDemo.V1.FromV2.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5931B4125124756007DA58E /* Advanced.EvolutionDemo.V1.FromV2.swift */; };
 		B5931B442512480A007DA58E /* Advanced.EvolutionDemo.V2.FromV1.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5931B432512480A007DA58E /* Advanced.EvolutionDemo.V2.FromV1.swift */; };
@@ -35,18 +35,12 @@
 		B5A3915324E6537F00E7E8BD /* Menu.ItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A3915224E6537F00E7E8BD /* Menu.ItemView.swift */; };
 		B5A3915924E685EC00E7E8BD /* Classic.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A3915824E685EC00E7E8BD /* Classic.swift */; };
 		B5A3915B24E685FE00E7E8BD /* Modern.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A3915A24E685FE00E7E8BD /* Modern.swift */; };
-		B5A3915E24E6922E00E7E8BD /* ⭐️Modern.PlacemarksDemo.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A3915D24E6922E00E7E8BD /* ⭐️Modern.PlacemarksDemo.swift */; };
+		B5A3915E24E6922E00E7E8BD /* Modern.PlacemarksDemo.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A3915D24E6922E00E7E8BD /* Modern.PlacemarksDemo.swift */; };
 		B5A3916024E6925900E7E8BD /* Modern.PlacemarksDemo.MapView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A3915F24E6925900E7E8BD /* Modern.PlacemarksDemo.MapView.swift */; };
-		B5A3916224E697BA00E7E8BD /* ⭐️Modern.PlacemarksDemo.MainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A3916124E697BA00E7E8BD /* ⭐️Modern.PlacemarksDemo.MainView.swift */; };
+		B5A3916224E697BA00E7E8BD /* Modern.PlacemarksDemo.MainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A3916124E697BA00E7E8BD /* Modern.PlacemarksDemo.MainView.swift */; };
 		B5A3916524E698C700E7E8BD /* Modern.PlacemarksDemo.Place.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A3916424E698C700E7E8BD /* Modern.PlacemarksDemo.Place.swift */; };
 		B5A3916B24E698F900E7E8BD /* CoreStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5A3916724E698F900E7E8BD /* CoreStore.framework */; };
 		B5A3916C24E698F900E7E8BD /* CoreStore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B5A3916724E698F900E7E8BD /* CoreStore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		B5A3916D24E698F900E7E8BD /* CoreStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5A3916824E698F900E7E8BD /* CoreStore.framework */; };
-		B5A3916E24E698F900E7E8BD /* CoreStore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B5A3916824E698F900E7E8BD /* CoreStore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		B5A3916F24E698F900E7E8BD /* CoreStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5A3916924E698F900E7E8BD /* CoreStore.framework */; };
-		B5A3917024E698F900E7E8BD /* CoreStore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B5A3916924E698F900E7E8BD /* CoreStore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		B5A3917124E698F900E7E8BD /* CoreStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5A3916A24E698F900E7E8BD /* CoreStore.framework */; };
-		B5A3917224E698F900E7E8BD /* CoreStore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B5A3916A24E698F900E7E8BD /* CoreStore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		B5A3917524E6990200E7E8BD /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5A3917424E6990200E7E8BD /* MapKit.framework */; };
 		B5A3917724E6990700E7E8BD /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5A3917624E6990700E7E8BD /* CoreLocation.framework */; };
 		B5A3917924E6991600E7E8BD /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5A3917824E6991600E7E8BD /* SwiftUI.framework */; };
@@ -55,36 +49,36 @@
 		B5A3918024E787D900E7E8BD /* InstructionsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A3917F24E787D900E7E8BD /* InstructionsView.swift */; };
 		B5A3918324E7A21800E7E8BD /* Modern.TimeZonesDemo.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A3918224E7A21800E7E8BD /* Modern.TimeZonesDemo.swift */; };
 		B5A3918624E7A54A00E7E8BD /* Modern.TimeZonesDemo.TimeZone.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A3918524E7A54A00E7E8BD /* Modern.TimeZonesDemo.TimeZone.swift */; };
-		B5A3918824E7A8F900E7E8BD /* ⭐️Modern.TimeZonesDemo.MainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A3918724E7A8F900E7E8BD /* ⭐️Modern.TimeZonesDemo.MainView.swift */; };
+		B5A3918824E7A8F900E7E8BD /* Modern.TimeZonesDemo.MainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A3918724E7A8F900E7E8BD /* Modern.TimeZonesDemo.MainView.swift */; };
 		B5A3918A24E7AD1800E7E8BD /* Modern.TimeZonesDemo.ListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A3918924E7AD1800E7E8BD /* Modern.TimeZonesDemo.ListView.swift */; };
 		B5A3918C24E7B44B00E7E8BD /* Modern.TimeZonesDemo.ItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A3918B24E7B44B00E7E8BD /* Modern.TimeZonesDemo.ItemView.swift */; };
 		B5A3918F24E7E06500E7E8BD /* Modern.ColorsDemo.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A3918E24E7E06500E7E8BD /* Modern.ColorsDemo.swift */; };
 		B5A3919224E7E0C600E7E8BD /* Modern.ColorsDemo.Palette.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A3919124E7E0C600E7E8BD /* Modern.ColorsDemo.Palette.swift */; };
-		B5A3919424E7E36700E7E8BD /* ⭐️Modern.ColorsDemo.SwiftUI.ListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A3919324E7E36700E7E8BD /* ⭐️Modern.ColorsDemo.SwiftUI.ListView.swift */; };
-		B5A3919624E7E4AC00E7E8BD /* ⭐️Modern.ColorsDemo.SwiftUI.ItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A3919524E7E4AC00E7E8BD /* ⭐️Modern.ColorsDemo.SwiftUI.ItemView.swift */; };
+		B5A3919424E7E36700E7E8BD /* Modern.ColorsDemo.SwiftUI.ListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A3919324E7E36700E7E8BD /* Modern.ColorsDemo.SwiftUI.ListView.swift */; };
+		B5A3919624E7E4AC00E7E8BD /* Modern.ColorsDemo.SwiftUI.ItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A3919524E7E4AC00E7E8BD /* Modern.ColorsDemo.SwiftUI.ItemView.swift */; };
 		B5A3919824E7E67000E7E8BD /* Modern.ColorsDemo.Filter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A3919724E7E67000E7E8BD /* Modern.ColorsDemo.Filter.swift */; };
-		B5A3919A24E8207A00E7E8BD /* ⭐️Modern.ColorsDemo.SwiftUI.DetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A3919924E8207A00E7E8BD /* ⭐️Modern.ColorsDemo.SwiftUI.DetailView.swift */; };
+		B5A3919A24E8207A00E7E8BD /* Modern.ColorsDemo.SwiftUI.DetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A3919924E8207A00E7E8BD /* Modern.ColorsDemo.SwiftUI.DetailView.swift */; };
 		B5A3919E24E8EEB600E7E8BD /* Modern.ColorsDemo.SwiftUI.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A3919D24E8EEB600E7E8BD /* Modern.ColorsDemo.SwiftUI.swift */; };
 		B5A391A024E8F00A00E7E8BD /* Modern.ColorsDemo.UIKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A3919F24E8F00A00E7E8BD /* Modern.ColorsDemo.UIKit.swift */; };
-		B5A391A224E8F01F00E7E8BD /* ⭐️Modern.ColorsDemo.UIKit.ListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A391A124E8F01F00E7E8BD /* ⭐️Modern.ColorsDemo.UIKit.ListViewController.swift */; };
+		B5A391A224E8F01F00E7E8BD /* Modern.ColorsDemo.UIKit.ListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A391A124E8F01F00E7E8BD /* Modern.ColorsDemo.UIKit.ListViewController.swift */; };
 		B5A391A424E8F04300E7E8BD /* Modern.ColorsDemo.UIKit.ListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A391A324E8F04300E7E8BD /* Modern.ColorsDemo.UIKit.ListView.swift */; };
-		B5A391A624E8F4EA00E7E8BD /* ⭐️Modern.ColorsDemo.MainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A391A524E8F4EA00E7E8BD /* ⭐️Modern.ColorsDemo.MainView.swift */; };
+		B5A391A624E8F4EA00E7E8BD /* Modern.ColorsDemo.MainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A391A524E8F4EA00E7E8BD /* Modern.ColorsDemo.MainView.swift */; };
 		B5A391AA24E9104300E7E8BD /* Modern.ColorsDemo.UIKit.ItemCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A391A924E9104300E7E8BD /* Modern.ColorsDemo.UIKit.ItemCell.swift */; };
 		B5A391AC24E9143B00E7E8BD /* Modern.ColorsDemo.UIKit.DetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A391AB24E9143B00E7E8BD /* Modern.ColorsDemo.UIKit.DetailView.swift */; };
-		B5A391AE24E9150F00E7E8BD /* ⭐️Modern.ColorsDemo.UIKit.DetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A391AD24E9150F00E7E8BD /* ⭐️Modern.ColorsDemo.UIKit.DetailViewController.swift */; };
+		B5A391AE24E9150F00E7E8BD /* Modern.ColorsDemo.UIKit.DetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A391AD24E9150F00E7E8BD /* Modern.ColorsDemo.UIKit.DetailViewController.swift */; };
 		B5A391B124E96AF600E7E8BD /* Modern.PokedexDemo.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A391B024E96AF600E7E8BD /* Modern.PokedexDemo.swift */; };
-		B5A391B424E96C0A00E7E8BD /* ⭐️Modern.PokedexDemo.Form.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A391B324E96C0A00E7E8BD /* ⭐️Modern.PokedexDemo.Form.swift */; };
-		B5A391B924E96F8500E7E8BD /* ⭐️Modern.PokedexDemo.Species.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A391B824E96F8500E7E8BD /* ⭐️Modern.PokedexDemo.Species.swift */; };
-		B5A391BB24E970A400E7E8BD /* ⭐️Modern.PokedexDemo.PokemonType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A391BA24E970A400E7E8BD /* ⭐️Modern.PokedexDemo.PokemonType.swift */; };
+		B5A391B424E96C0A00E7E8BD /* Modern.PokedexDemo.Form.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A391B324E96C0A00E7E8BD /* Modern.PokedexDemo.Form.swift */; };
+		B5A391B924E96F8500E7E8BD /* Modern.PokedexDemo.Species.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A391B824E96F8500E7E8BD /* Modern.PokedexDemo.Species.swift */; };
+		B5A391BB24E970A400E7E8BD /* Modern.PokedexDemo.PokemonType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A391BA24E970A400E7E8BD /* Modern.PokedexDemo.PokemonType.swift */; };
 		B5A543D724FB7478000DC5E3 /* Classic.ColorsDemo.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A543D624FB7478000DC5E3 /* Classic.ColorsDemo.swift */; };
 		B5A543DB24FB7513000DC5E3 /* Classic.ColorsDemo.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B5A543D924FB7513000DC5E3 /* Classic.ColorsDemo.xcdatamodeld */; };
 		B5A543DD24FB78F9000DC5E3 /* Classic.ColorsDemo.Palette.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A543DC24FB78F9000DC5E3 /* Classic.ColorsDemo.Palette.swift */; };
 		B5A543E724FB82BB000DC5E3 /* Classic.ColorsDemo.Filter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A543E624FB82BB000DC5E3 /* Classic.ColorsDemo.Filter.swift */; };
 		B5A543E924FB84A1000DC5E3 /* Classic.ColorsDemo.DetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A543E824FB84A1000DC5E3 /* Classic.ColorsDemo.DetailView.swift */; };
-		B5A543EB24FB84AF000DC5E3 /* ⭐️Classic.ColorsDemo.DetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A543EA24FB84AF000DC5E3 /* ⭐️Classic.ColorsDemo.DetailViewController.swift */; };
+		B5A543EB24FB84AF000DC5E3 /* Classic.ColorsDemo.DetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A543EA24FB84AF000DC5E3 /* Classic.ColorsDemo.DetailViewController.swift */; };
 		B5A543ED24FB84BE000DC5E3 /* Classic.ColorsDemo.MainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A543EC24FB84BE000DC5E3 /* Classic.ColorsDemo.MainView.swift */; };
 		B5A543EF24FB84D1000DC5E3 /* Classic.ColorsDemo.LIstView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A543EE24FB84D1000DC5E3 /* Classic.ColorsDemo.LIstView.swift */; };
-		B5A543F124FB84DD000DC5E3 /* ⭐️Classic.ColorsDemo.ListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A543F024FB84DD000DC5E3 /* ⭐️Classic.ColorsDemo.ListViewController.swift */; };
+		B5A543F124FB84DD000DC5E3 /* Classic.ColorsDemo.ListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A543F024FB84DD000DC5E3 /* Classic.ColorsDemo.ListViewController.swift */; };
 		B5A543F324FB84EC000DC5E3 /* Classic.ColorsDemo.ItemCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A543F224FB84EC000DC5E3 /* Classic.ColorsDemo.ItemCell.swift */; };
 		B5A543F624FBF13A000DC5E3 /* Advanced.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A543F524FBF13A000DC5E3 /* Advanced.swift */; };
 		B5A543FB2504840E000DC5E3 /* Advanced.EvolutionDemo.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A543FA2504840E000DC5E3 /* Advanced.EvolutionDemo.swift */; };
@@ -97,12 +91,13 @@
 		B5A5440B25049492000DC5E3 /* Advanced.EvolutionDemo.V3.Creature.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A5440A25049492000DC5E3 /* Advanced.EvolutionDemo.V3.Creature.swift */; };
 		B5A5440D2504949C000DC5E3 /* Advanced.EvolutionDemo.V4.Creature.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A5440C2504949C000DC5E3 /* Advanced.EvolutionDemo.V4.Creature.swift */; };
 		B5C18F3325138700001BEFB3 /* Advanced.EvolutionDemo.ProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C18F3225138700001BEFB3 /* Advanced.EvolutionDemo.ProgressView.swift */; };
+		B5C795B625D8EE2B00BDACC1 /* Modern.PokedexDemo.UIKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C795B525D8EE2B00BDACC1 /* Modern.PokedexDemo.UIKit.swift */; };
 		B5D6F1F8250E07FD00DF5D2F /* Advanced.EvolutionDemo.V1.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D6F1F7250E07FD00DF5D2F /* Advanced.EvolutionDemo.V1.swift */; };
 		B5D6F1FC250E0B1700DF5D2F /* Advanced.EvolutionDemo.V2.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D6F1FB250E0B1700DF5D2F /* Advanced.EvolutionDemo.V2.swift */; };
 		B5D6F1FE250E0B3F00DF5D2F /* Advanced.EvolutionDemo.GeologicalPeriod.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D6F1FD250E0B3F00DF5D2F /* Advanced.EvolutionDemo.GeologicalPeriod.swift */; };
 		B5D6F205250E0DD600DF5D2F /* Advanced.EvolutionDemo.V3.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D6F204250E0DD600DF5D2F /* Advanced.EvolutionDemo.V3.swift */; };
 		B5D6F207250E0E3B00DF5D2F /* Advanced.EvolutionDemo.V4.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D6F206250E0E3B00DF5D2F /* Advanced.EvolutionDemo.V4.swift */; };
-		B5D6F209250E14AA00DF5D2F /* ⭐️Advanced.EvolutionDemo.Migrator.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D6F208250E14AA00DF5D2F /* ⭐️Advanced.EvolutionDemo.Migrator.swift */; };
+		B5D6F209250E14AA00DF5D2F /* Advanced.EvolutionDemo.Migrator.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D6F208250E14AA00DF5D2F /* Advanced.EvolutionDemo.Migrator.swift */; };
 		B5D6F210250E1E3200DF5D2F /* Advanced.EvolutionDemo.V1.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B5D6F20E250E1E3200DF5D2F /* Advanced.EvolutionDemo.V1.xcdatamodeld */; };
 		B5E32C9024FA41F9003F46AD /* ImageDownloader.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E32C8F24FA41F9003F46AD /* ImageDownloader.swift */; };
 /* End PBXBuildFile section */
@@ -115,9 +110,6 @@
 			dstSubfolderSpec = 10;
 			files = (
 				B5A3916C24E698F900E7E8BD /* CoreStore.framework in Embed Frameworks */,
-				B5A3917224E698F900E7E8BD /* CoreStore.framework in Embed Frameworks */,
-				B5A3917024E698F900E7E8BD /* CoreStore.framework in Embed Frameworks */,
-				B5A3916E24E698F900E7E8BD /* CoreStore.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -126,16 +118,16 @@
 
 /* Begin PBXFileReference section */
 		B531EFE624EA762D005F247D /* Menu.PlaceholderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Menu.PlaceholderView.swift; sourceTree = "<group>"; };
-		B531EFE824EB5A52005F247D /* ⭐️Modern.PokedexDemo.PokedexEntry.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "⭐️Modern.PokedexDemo.PokedexEntry.swift"; sourceTree = "<group>"; };
-		B531EFEA24EB5ECD005F247D /* ⭐️Modern.PokedexDemo.Service.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "⭐️Modern.PokedexDemo.Service.swift"; sourceTree = "<group>"; };
+		B531EFE824EB5A52005F247D /* Modern.PokedexDemo.PokedexEntry.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.PokedexDemo.PokedexEntry.swift; sourceTree = "<group>"; };
+		B531EFEA24EB5ECD005F247D /* Modern.PokedexDemo.Service.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.PokedexDemo.Service.swift; sourceTree = "<group>"; };
 		B531EFEC24EB7453005F247D /* Modern.PokedexDemo.MainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.PokedexDemo.MainView.swift; sourceTree = "<group>"; };
 		B54D2F7925119540004BEC7D /* Advanced.EvolutionDemo.V2.FromV1.xcmappingmodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcmappingmodel; path = Advanced.EvolutionDemo.V2.FromV1.xcmappingmodel; sourceTree = "<group>"; };
 		B54D2F7B251196B6004BEC7D /* Advanced.EvolutionDemo.V2.FromV1MigrationPolicy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Advanced.EvolutionDemo.V2.FromV1MigrationPolicy.swift; sourceTree = "<group>"; };
 		B54D2F7D25119DCE004BEC7D /* Advanced.EvolutionDemo.V1.FromV2.xcmappingmodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcmappingmodel; path = Advanced.EvolutionDemo.V1.FromV2.xcmappingmodel; sourceTree = "<group>"; };
 		B54D2F842511B70B004BEC7D /* Advanced.EvolutionDemo.CreaturesDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Advanced.EvolutionDemo.CreaturesDataSource.swift; sourceTree = "<group>"; };
-		B566C8E724F9D406001134A1 /* Modern.PokedexDemo.ListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.PokedexDemo.ListView.swift; sourceTree = "<group>"; };
-		B566C8E924F9D412001134A1 /* Modern.PokedexDemo.ListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.PokedexDemo.ListViewController.swift; sourceTree = "<group>"; };
-		B566C8EB24F9D694001134A1 /* Modern.PokedexDemo.ItemCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.PokedexDemo.ItemCell.swift; sourceTree = "<group>"; };
+		B566C8E724F9D406001134A1 /* Modern.PokedexDemo.UIKit.ListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.PokedexDemo.UIKit.ListView.swift; sourceTree = "<group>"; };
+		B566C8E924F9D412001134A1 /* Modern.PokedexDemo.UIKit.ListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.PokedexDemo.UIKit.ListViewController.swift; sourceTree = "<group>"; };
+		B566C8EB24F9D694001134A1 /* Modern.PokedexDemo.UIKit.ItemCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.PokedexDemo.UIKit.ItemCell.swift; sourceTree = "<group>"; };
 		B566C8ED24FA1EA3001134A1 /* Modern.PokedexDemo.Details.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.PokedexDemo.Details.swift; sourceTree = "<group>"; };
 		B5931B4125124756007DA58E /* Advanced.EvolutionDemo.V1.FromV2.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Advanced.EvolutionDemo.V1.FromV2.swift; sourceTree = "<group>"; };
 		B5931B432512480A007DA58E /* Advanced.EvolutionDemo.V2.FromV1.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Advanced.EvolutionDemo.V2.FromV1.swift; sourceTree = "<group>"; };
@@ -156,9 +148,9 @@
 		B5A3915224E6537F00E7E8BD /* Menu.ItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Menu.ItemView.swift; sourceTree = "<group>"; };
 		B5A3915824E685EC00E7E8BD /* Classic.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Classic.swift; sourceTree = "<group>"; };
 		B5A3915A24E685FE00E7E8BD /* Modern.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.swift; sourceTree = "<group>"; };
-		B5A3915D24E6922E00E7E8BD /* ⭐️Modern.PlacemarksDemo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "⭐️Modern.PlacemarksDemo.swift"; sourceTree = "<group>"; };
+		B5A3915D24E6922E00E7E8BD /* Modern.PlacemarksDemo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.PlacemarksDemo.swift; sourceTree = "<group>"; };
 		B5A3915F24E6925900E7E8BD /* Modern.PlacemarksDemo.MapView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.PlacemarksDemo.MapView.swift; sourceTree = "<group>"; };
-		B5A3916124E697BA00E7E8BD /* ⭐️Modern.PlacemarksDemo.MainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "⭐️Modern.PlacemarksDemo.MainView.swift"; sourceTree = "<group>"; };
+		B5A3916124E697BA00E7E8BD /* Modern.PlacemarksDemo.MainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.PlacemarksDemo.MainView.swift; sourceTree = "<group>"; };
 		B5A3916424E698C700E7E8BD /* Modern.PlacemarksDemo.Place.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.PlacemarksDemo.Place.swift; sourceTree = "<group>"; };
 		B5A3916724E698F900E7E8BD /* CoreStore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CoreStore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		B5A3916824E698F900E7E8BD /* CoreStore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CoreStore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -172,36 +164,36 @@
 		B5A3917F24E787D900E7E8BD /* InstructionsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InstructionsView.swift; sourceTree = "<group>"; };
 		B5A3918224E7A21800E7E8BD /* Modern.TimeZonesDemo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.TimeZonesDemo.swift; sourceTree = "<group>"; };
 		B5A3918524E7A54A00E7E8BD /* Modern.TimeZonesDemo.TimeZone.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.TimeZonesDemo.TimeZone.swift; sourceTree = "<group>"; };
-		B5A3918724E7A8F900E7E8BD /* ⭐️Modern.TimeZonesDemo.MainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "⭐️Modern.TimeZonesDemo.MainView.swift"; sourceTree = "<group>"; };
+		B5A3918724E7A8F900E7E8BD /* Modern.TimeZonesDemo.MainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.TimeZonesDemo.MainView.swift; sourceTree = "<group>"; };
 		B5A3918924E7AD1800E7E8BD /* Modern.TimeZonesDemo.ListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.TimeZonesDemo.ListView.swift; sourceTree = "<group>"; };
 		B5A3918B24E7B44B00E7E8BD /* Modern.TimeZonesDemo.ItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.TimeZonesDemo.ItemView.swift; sourceTree = "<group>"; };
 		B5A3918E24E7E06500E7E8BD /* Modern.ColorsDemo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.ColorsDemo.swift; sourceTree = "<group>"; };
 		B5A3919124E7E0C600E7E8BD /* Modern.ColorsDemo.Palette.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.ColorsDemo.Palette.swift; sourceTree = "<group>"; };
-		B5A3919324E7E36700E7E8BD /* ⭐️Modern.ColorsDemo.SwiftUI.ListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "⭐️Modern.ColorsDemo.SwiftUI.ListView.swift"; sourceTree = "<group>"; };
-		B5A3919524E7E4AC00E7E8BD /* ⭐️Modern.ColorsDemo.SwiftUI.ItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "⭐️Modern.ColorsDemo.SwiftUI.ItemView.swift"; sourceTree = "<group>"; };
+		B5A3919324E7E36700E7E8BD /* Modern.ColorsDemo.SwiftUI.ListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.ColorsDemo.SwiftUI.ListView.swift; sourceTree = "<group>"; };
+		B5A3919524E7E4AC00E7E8BD /* Modern.ColorsDemo.SwiftUI.ItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.ColorsDemo.SwiftUI.ItemView.swift; sourceTree = "<group>"; };
 		B5A3919724E7E67000E7E8BD /* Modern.ColorsDemo.Filter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.ColorsDemo.Filter.swift; sourceTree = "<group>"; };
-		B5A3919924E8207A00E7E8BD /* ⭐️Modern.ColorsDemo.SwiftUI.DetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "⭐️Modern.ColorsDemo.SwiftUI.DetailView.swift"; sourceTree = "<group>"; };
+		B5A3919924E8207A00E7E8BD /* Modern.ColorsDemo.SwiftUI.DetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.ColorsDemo.SwiftUI.DetailView.swift; sourceTree = "<group>"; };
 		B5A3919D24E8EEB600E7E8BD /* Modern.ColorsDemo.SwiftUI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.ColorsDemo.SwiftUI.swift; sourceTree = "<group>"; };
 		B5A3919F24E8F00A00E7E8BD /* Modern.ColorsDemo.UIKit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.ColorsDemo.UIKit.swift; sourceTree = "<group>"; };
-		B5A391A124E8F01F00E7E8BD /* ⭐️Modern.ColorsDemo.UIKit.ListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "⭐️Modern.ColorsDemo.UIKit.ListViewController.swift"; sourceTree = "<group>"; };
+		B5A391A124E8F01F00E7E8BD /* Modern.ColorsDemo.UIKit.ListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.ColorsDemo.UIKit.ListViewController.swift; sourceTree = "<group>"; };
 		B5A391A324E8F04300E7E8BD /* Modern.ColorsDemo.UIKit.ListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.ColorsDemo.UIKit.ListView.swift; sourceTree = "<group>"; };
-		B5A391A524E8F4EA00E7E8BD /* ⭐️Modern.ColorsDemo.MainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "⭐️Modern.ColorsDemo.MainView.swift"; sourceTree = "<group>"; };
+		B5A391A524E8F4EA00E7E8BD /* Modern.ColorsDemo.MainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.ColorsDemo.MainView.swift; sourceTree = "<group>"; };
 		B5A391A924E9104300E7E8BD /* Modern.ColorsDemo.UIKit.ItemCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.ColorsDemo.UIKit.ItemCell.swift; sourceTree = "<group>"; };
 		B5A391AB24E9143B00E7E8BD /* Modern.ColorsDemo.UIKit.DetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.ColorsDemo.UIKit.DetailView.swift; sourceTree = "<group>"; };
-		B5A391AD24E9150F00E7E8BD /* ⭐️Modern.ColorsDemo.UIKit.DetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "⭐️Modern.ColorsDemo.UIKit.DetailViewController.swift"; sourceTree = "<group>"; };
+		B5A391AD24E9150F00E7E8BD /* Modern.ColorsDemo.UIKit.DetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.ColorsDemo.UIKit.DetailViewController.swift; sourceTree = "<group>"; };
 		B5A391B024E96AF600E7E8BD /* Modern.PokedexDemo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.PokedexDemo.swift; sourceTree = "<group>"; };
-		B5A391B324E96C0A00E7E8BD /* ⭐️Modern.PokedexDemo.Form.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "⭐️Modern.PokedexDemo.Form.swift"; sourceTree = "<group>"; };
-		B5A391B824E96F8500E7E8BD /* ⭐️Modern.PokedexDemo.Species.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "⭐️Modern.PokedexDemo.Species.swift"; sourceTree = "<group>"; };
-		B5A391BA24E970A400E7E8BD /* ⭐️Modern.PokedexDemo.PokemonType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "⭐️Modern.PokedexDemo.PokemonType.swift"; sourceTree = "<group>"; };
+		B5A391B324E96C0A00E7E8BD /* Modern.PokedexDemo.Form.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.PokedexDemo.Form.swift; sourceTree = "<group>"; };
+		B5A391B824E96F8500E7E8BD /* Modern.PokedexDemo.Species.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.PokedexDemo.Species.swift; sourceTree = "<group>"; };
+		B5A391BA24E970A400E7E8BD /* Modern.PokedexDemo.PokemonType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.PokedexDemo.PokemonType.swift; sourceTree = "<group>"; };
 		B5A543D624FB7478000DC5E3 /* Classic.ColorsDemo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Classic.ColorsDemo.swift; sourceTree = "<group>"; };
 		B5A543DA24FB7513000DC5E3 /* ColorsDemo.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = ColorsDemo.xcdatamodel; sourceTree = "<group>"; };
 		B5A543DC24FB78F9000DC5E3 /* Classic.ColorsDemo.Palette.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Classic.ColorsDemo.Palette.swift; sourceTree = "<group>"; };
 		B5A543E624FB82BB000DC5E3 /* Classic.ColorsDemo.Filter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Classic.ColorsDemo.Filter.swift; sourceTree = "<group>"; };
 		B5A543E824FB84A1000DC5E3 /* Classic.ColorsDemo.DetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Classic.ColorsDemo.DetailView.swift; sourceTree = "<group>"; };
-		B5A543EA24FB84AF000DC5E3 /* ⭐️Classic.ColorsDemo.DetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "⭐️Classic.ColorsDemo.DetailViewController.swift"; sourceTree = "<group>"; };
+		B5A543EA24FB84AF000DC5E3 /* Classic.ColorsDemo.DetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Classic.ColorsDemo.DetailViewController.swift; sourceTree = "<group>"; };
 		B5A543EC24FB84BE000DC5E3 /* Classic.ColorsDemo.MainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Classic.ColorsDemo.MainView.swift; sourceTree = "<group>"; };
 		B5A543EE24FB84D1000DC5E3 /* Classic.ColorsDemo.LIstView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Classic.ColorsDemo.LIstView.swift; sourceTree = "<group>"; };
-		B5A543F024FB84DD000DC5E3 /* ⭐️Classic.ColorsDemo.ListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "⭐️Classic.ColorsDemo.ListViewController.swift"; sourceTree = "<group>"; };
+		B5A543F024FB84DD000DC5E3 /* Classic.ColorsDemo.ListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Classic.ColorsDemo.ListViewController.swift; sourceTree = "<group>"; };
 		B5A543F224FB84EC000DC5E3 /* Classic.ColorsDemo.ItemCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Classic.ColorsDemo.ItemCell.swift; sourceTree = "<group>"; };
 		B5A543F524FBF13A000DC5E3 /* Advanced.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Advanced.swift; sourceTree = "<group>"; };
 		B5A543FA2504840E000DC5E3 /* Advanced.EvolutionDemo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Advanced.EvolutionDemo.swift; sourceTree = "<group>"; };
@@ -214,12 +206,13 @@
 		B5A5440A25049492000DC5E3 /* Advanced.EvolutionDemo.V3.Creature.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Advanced.EvolutionDemo.V3.Creature.swift; sourceTree = "<group>"; };
 		B5A5440C2504949C000DC5E3 /* Advanced.EvolutionDemo.V4.Creature.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Advanced.EvolutionDemo.V4.Creature.swift; sourceTree = "<group>"; };
 		B5C18F3225138700001BEFB3 /* Advanced.EvolutionDemo.ProgressView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Advanced.EvolutionDemo.ProgressView.swift; sourceTree = "<group>"; };
+		B5C795B525D8EE2B00BDACC1 /* Modern.PokedexDemo.UIKit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modern.PokedexDemo.UIKit.swift; sourceTree = "<group>"; };
 		B5D6F1F7250E07FD00DF5D2F /* Advanced.EvolutionDemo.V1.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Advanced.EvolutionDemo.V1.swift; sourceTree = "<group>"; };
 		B5D6F1FB250E0B1700DF5D2F /* Advanced.EvolutionDemo.V2.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Advanced.EvolutionDemo.V2.swift; sourceTree = "<group>"; };
 		B5D6F1FD250E0B3F00DF5D2F /* Advanced.EvolutionDemo.GeologicalPeriod.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Advanced.EvolutionDemo.GeologicalPeriod.swift; sourceTree = "<group>"; };
 		B5D6F204250E0DD600DF5D2F /* Advanced.EvolutionDemo.V3.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Advanced.EvolutionDemo.V3.swift; sourceTree = "<group>"; };
 		B5D6F206250E0E3B00DF5D2F /* Advanced.EvolutionDemo.V4.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Advanced.EvolutionDemo.V4.swift; sourceTree = "<group>"; };
-		B5D6F208250E14AA00DF5D2F /* ⭐️Advanced.EvolutionDemo.Migrator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "⭐️Advanced.EvolutionDemo.Migrator.swift"; sourceTree = "<group>"; };
+		B5D6F208250E14AA00DF5D2F /* Advanced.EvolutionDemo.Migrator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Advanced.EvolutionDemo.Migrator.swift; sourceTree = "<group>"; };
 		B5D6F20F250E1E3200DF5D2F /* Advanced.EvolutionDemo.V1.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Advanced.EvolutionDemo.V1.xcdatamodel; sourceTree = "<group>"; };
 		B5D6F211250E1E7000DF5D2F /* Advanced.EvolutionDemo.V2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Advanced.EvolutionDemo.V2.xcdatamodel; sourceTree = "<group>"; };
 		B5E32C8F24FA41F9003F46AD /* ImageDownloader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageDownloader.swift; sourceTree = "<group>"; };
@@ -232,11 +225,8 @@
 			files = (
 				B5A3917724E6990700E7E8BD /* CoreLocation.framework in Frameworks */,
 				B5A3916B24E698F900E7E8BD /* CoreStore.framework in Frameworks */,
-				B5A3917124E698F900E7E8BD /* CoreStore.framework in Frameworks */,
 				B5A3917924E6991600E7E8BD /* SwiftUI.framework in Frameworks */,
 				B5A3917524E6990200E7E8BD /* MapKit.framework in Frameworks */,
-				B5A3916F24E698F900E7E8BD /* CoreStore.framework in Frameworks */,
-				B5A3916D24E698F900E7E8BD /* CoreStore.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -247,12 +237,14 @@
 			isa = PBXGroup;
 			children = (
 				B5A3913D24E62C6C00E7E8BD /* Metadata */,
-				B5A3911B24E5429200E7E8BD /* ⭐️Sources */,
+				B5A3911B24E5429200E7E8BD /* Sources */,
 				B5A3913E24E62CB200E7E8BD /* Resources */,
 				B5A3911A24E5429200E7E8BD /* Products */,
 				B5A3916624E698F900E7E8BD /* Frameworks */,
 			);
+			indentWidth = 4;
 			sourceTree = "<group>";
+			tabWidth = 4;
 		};
 		B5A3911A24E5429200E7E8BD /* Products */ = {
 			isa = PBXGroup;
@@ -262,15 +254,15 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		B5A3911B24E5429200E7E8BD /* ⭐️Sources */ = {
+		B5A3911B24E5429200E7E8BD /* Sources */ = {
 			isa = PBXGroup;
 			children = (
 				B5A3911C24E5429200E7E8BD /* AppDelegate.swift */,
 				B5A3911E24E5429200E7E8BD /* SceneDelegate.swift */,
-				B5A3915524E6858A00E7E8BD /* ⭐️Demos */,
+				B5A3915524E6858A00E7E8BD /* Demos */,
 				B5A3917A24E6A75F00E7E8BD /* Helpers */,
 			);
-			path = "⭐️Sources";
+			path = Sources;
 			sourceTree = "<group>";
 		};
 		B5A3912424E5429300E7E8BD /* Preview Content */ = {
@@ -311,47 +303,47 @@
 			path = Menu;
 			sourceTree = "<group>";
 		};
-		B5A3915524E6858A00E7E8BD /* ⭐️Demos */ = {
+		B5A3915524E6858A00E7E8BD /* Demos */ = {
 			isa = PBXGroup;
 			children = (
-				B5A3915624E685B700E7E8BD /* ⭐️Modern */,
-				B5A3915724E685D300E7E8BD /* ⭐️Classic */,
-				B5A543F424FBF107000DC5E3 /* ⭐️Advanced */,
+				B5A3915624E685B700E7E8BD /* Modern */,
+				B5A3915724E685D300E7E8BD /* Classic */,
+				B5A543F424FBF107000DC5E3 /* Advanced */,
 			);
-			path = "⭐️Demos";
+			path = Demos;
 			sourceTree = "<group>";
 		};
-		B5A3915624E685B700E7E8BD /* ⭐️Modern */ = {
+		B5A3915624E685B700E7E8BD /* Modern */ = {
 			isa = PBXGroup;
 			children = (
 				B5A3915A24E685FE00E7E8BD /* Modern.swift */,
-				B5A3915C24E6921E00E7E8BD /* ⭐️PlacemarksDemo */,
-				B5A3918124E7A1EF00E7E8BD /* ⭐️TimeZonesDemo */,
-				B5A3918D24E7DE7A00E7E8BD /* ⭐️ColorsDemo */,
-				B5A391AF24E96AD600E7E8BD /* ⭐️PokedexDemo */,
+				B5A3915C24E6921E00E7E8BD /* PlacemarksDemo */,
+				B5A3918124E7A1EF00E7E8BD /* TimeZonesDemo */,
+				B5A3918D24E7DE7A00E7E8BD /* ColorsDemo */,
+				B5A391AF24E96AD600E7E8BD /* PokedexDemo */,
 			);
-			path = "⭐️Modern";
+			path = Modern;
 			sourceTree = "<group>";
 		};
-		B5A3915724E685D300E7E8BD /* ⭐️Classic */ = {
+		B5A3915724E685D300E7E8BD /* Classic */ = {
 			isa = PBXGroup;
 			children = (
 				B5A3915824E685EC00E7E8BD /* Classic.swift */,
-				B5A543D524FB73B2000DC5E3 /* ⭐️ColorsDemo */,
+				B5A543D524FB73B2000DC5E3 /* ColorsDemo */,
 			);
-			path = "⭐️Classic";
+			path = Classic;
 			sourceTree = "<group>";
 		};
-		B5A3915C24E6921E00E7E8BD /* ⭐️PlacemarksDemo */ = {
+		B5A3915C24E6921E00E7E8BD /* PlacemarksDemo */ = {
 			isa = PBXGroup;
 			children = (
-				B5A3915D24E6922E00E7E8BD /* ⭐️Modern.PlacemarksDemo.swift */,
-				B5A3916124E697BA00E7E8BD /* ⭐️Modern.PlacemarksDemo.MainView.swift */,
+				B5A3915D24E6922E00E7E8BD /* Modern.PlacemarksDemo.swift */,
+				B5A3916124E697BA00E7E8BD /* Modern.PlacemarksDemo.MainView.swift */,
 				B5A3915F24E6925900E7E8BD /* Modern.PlacemarksDemo.MapView.swift */,
 				B5A3917D24E7728400E7E8BD /* Modern.PlacemarksDemo.Geocoder.swift */,
 				B5A3916324E698B300E7E8BD /* Models */,
 			);
-			path = "⭐️PlacemarksDemo";
+			path = PlacemarksDemo;
 			sourceTree = "<group>";
 		};
 		B5A3916324E698B300E7E8BD /* Models */ = {
@@ -387,16 +379,16 @@
 			path = Helpers;
 			sourceTree = "<group>";
 		};
-		B5A3918124E7A1EF00E7E8BD /* ⭐️TimeZonesDemo */ = {
+		B5A3918124E7A1EF00E7E8BD /* TimeZonesDemo */ = {
 			isa = PBXGroup;
 			children = (
 				B5A3918224E7A21800E7E8BD /* Modern.TimeZonesDemo.swift */,
-				B5A3918724E7A8F900E7E8BD /* ⭐️Modern.TimeZonesDemo.MainView.swift */,
+				B5A3918724E7A8F900E7E8BD /* Modern.TimeZonesDemo.MainView.swift */,
 				B5A3918924E7AD1800E7E8BD /* Modern.TimeZonesDemo.ListView.swift */,
 				B5A3918B24E7B44B00E7E8BD /* Modern.TimeZonesDemo.ItemView.swift */,
 				B5A3918424E7A53300E7E8BD /* Models */,
 			);
-			path = "⭐️TimeZonesDemo";
+			path = TimeZonesDemo;
 			sourceTree = "<group>";
 		};
 		B5A3918424E7A53300E7E8BD /* Models */ = {
@@ -407,17 +399,17 @@
 			name = Models;
 			sourceTree = "<group>";
 		};
-		B5A3918D24E7DE7A00E7E8BD /* ⭐️ColorsDemo */ = {
+		B5A3918D24E7DE7A00E7E8BD /* ColorsDemo */ = {
 			isa = PBXGroup;
 			children = (
 				B5A3918E24E7E06500E7E8BD /* Modern.ColorsDemo.swift */,
 				B5A3919724E7E67000E7E8BD /* Modern.ColorsDemo.Filter.swift */,
-				B5A391A524E8F4EA00E7E8BD /* ⭐️Modern.ColorsDemo.MainView.swift */,
-				B5A3919C24E8EE9000E7E8BD /* ⭐️UIKit */,
-				B5A3919B24E8EE8100E7E8BD /* ⭐️SwiftUI */,
+				B5A391A524E8F4EA00E7E8BD /* Modern.ColorsDemo.MainView.swift */,
+				B5A3919C24E8EE9000E7E8BD /* UIKit */,
+				B5A3919B24E8EE8100E7E8BD /* SwiftUI */,
 				B5A3919024E7E0B000E7E8BD /* Models */,
 			);
-			path = "⭐️ColorsDemo";
+			path = ColorsDemo;
 			sourceTree = "<group>";
 		};
 		B5A3919024E7E0B000E7E8BD /* Models */ = {
@@ -428,78 +420,76 @@
 			name = Models;
 			sourceTree = "<group>";
 		};
-		B5A3919B24E8EE8100E7E8BD /* ⭐️SwiftUI */ = {
+		B5A3919B24E8EE8100E7E8BD /* SwiftUI */ = {
 			isa = PBXGroup;
 			children = (
 				B5A3919D24E8EEB600E7E8BD /* Modern.ColorsDemo.SwiftUI.swift */,
-				B5A3919324E7E36700E7E8BD /* ⭐️Modern.ColorsDemo.SwiftUI.ListView.swift */,
-				B5A3919524E7E4AC00E7E8BD /* ⭐️Modern.ColorsDemo.SwiftUI.ItemView.swift */,
-				B5A3919924E8207A00E7E8BD /* ⭐️Modern.ColorsDemo.SwiftUI.DetailView.swift */,
+				B5A3919324E7E36700E7E8BD /* Modern.ColorsDemo.SwiftUI.ListView.swift */,
+				B5A3919524E7E4AC00E7E8BD /* Modern.ColorsDemo.SwiftUI.ItemView.swift */,
+				B5A3919924E8207A00E7E8BD /* Modern.ColorsDemo.SwiftUI.DetailView.swift */,
 			);
-			name = "⭐️SwiftUI";
+			name = SwiftUI;
 			sourceTree = "<group>";
 		};
-		B5A3919C24E8EE9000E7E8BD /* ⭐️UIKit */ = {
+		B5A3919C24E8EE9000E7E8BD /* UIKit */ = {
 			isa = PBXGroup;
 			children = (
 				B5A3919F24E8F00A00E7E8BD /* Modern.ColorsDemo.UIKit.swift */,
 				B5A391A324E8F04300E7E8BD /* Modern.ColorsDemo.UIKit.ListView.swift */,
-				B5A391A124E8F01F00E7E8BD /* ⭐️Modern.ColorsDemo.UIKit.ListViewController.swift */,
+				B5A391A124E8F01F00E7E8BD /* Modern.ColorsDemo.UIKit.ListViewController.swift */,
 				B5A391A924E9104300E7E8BD /* Modern.ColorsDemo.UIKit.ItemCell.swift */,
 				B5A391AB24E9143B00E7E8BD /* Modern.ColorsDemo.UIKit.DetailView.swift */,
-				B5A391AD24E9150F00E7E8BD /* ⭐️Modern.ColorsDemo.UIKit.DetailViewController.swift */,
+				B5A391AD24E9150F00E7E8BD /* Modern.ColorsDemo.UIKit.DetailViewController.swift */,
 			);
-			name = "⭐️UIKit";
+			name = UIKit;
 			sourceTree = "<group>";
 		};
-		B5A391AF24E96AD600E7E8BD /* ⭐️PokedexDemo */ = {
+		B5A391AF24E96AD600E7E8BD /* PokedexDemo */ = {
 			isa = PBXGroup;
 			children = (
 				B5A391B024E96AF600E7E8BD /* Modern.PokedexDemo.swift */,
-				B531EFEA24EB5ECD005F247D /* ⭐️Modern.PokedexDemo.Service.swift */,
+				B531EFEA24EB5ECD005F247D /* Modern.PokedexDemo.Service.swift */,
 				B531EFEC24EB7453005F247D /* Modern.PokedexDemo.MainView.swift */,
-				B566C8E724F9D406001134A1 /* Modern.PokedexDemo.ListView.swift */,
-				B566C8E924F9D412001134A1 /* Modern.PokedexDemo.ListViewController.swift */,
-				B566C8EB24F9D694001134A1 /* Modern.PokedexDemo.ItemCell.swift */,
-				B5A391B224E96B7400E7E8BD /* ⭐️Models */,
+				B5C795B425D8EE1A00BDACC1 /* UIKit */,
+				B5A391B224E96B7400E7E8BD /* Models */,
 			);
-			path = "⭐️PokedexDemo";
+			path = PokedexDemo;
 			sourceTree = "<group>";
 		};
-		B5A391B224E96B7400E7E8BD /* ⭐️Models */ = {
+		B5A391B224E96B7400E7E8BD /* Models */ = {
 			isa = PBXGroup;
 			children = (
-				B531EFE824EB5A52005F247D /* ⭐️Modern.PokedexDemo.PokedexEntry.swift */,
+				B531EFE824EB5A52005F247D /* Modern.PokedexDemo.PokedexEntry.swift */,
 				B566C8ED24FA1EA3001134A1 /* Modern.PokedexDemo.Details.swift */,
-				B5A391B824E96F8500E7E8BD /* ⭐️Modern.PokedexDemo.Species.swift */,
-				B5A391B324E96C0A00E7E8BD /* ⭐️Modern.PokedexDemo.Form.swift */,
-				B5A391B724E96E8600E7E8BD /* ⭐️Attributes */,
+				B5A391B824E96F8500E7E8BD /* Modern.PokedexDemo.Species.swift */,
+				B5A391B324E96C0A00E7E8BD /* Modern.PokedexDemo.Form.swift */,
+				B5A391B724E96E8600E7E8BD /* Attributes */,
 			);
-			name = "⭐️Models";
+			name = Models;
 			sourceTree = "<group>";
 		};
-		B5A391B724E96E8600E7E8BD /* ⭐️Attributes */ = {
+		B5A391B724E96E8600E7E8BD /* Attributes */ = {
 			isa = PBXGroup;
 			children = (
-				B5A391BA24E970A400E7E8BD /* ⭐️Modern.PokedexDemo.PokemonType.swift */,
+				B5A391BA24E970A400E7E8BD /* Modern.PokedexDemo.PokemonType.swift */,
 			);
-			name = "⭐️Attributes";
+			name = Attributes;
 			sourceTree = "<group>";
 		};
-		B5A543D524FB73B2000DC5E3 /* ⭐️ColorsDemo */ = {
+		B5A543D524FB73B2000DC5E3 /* ColorsDemo */ = {
 			isa = PBXGroup;
 			children = (
 				B5A543D624FB7478000DC5E3 /* Classic.ColorsDemo.swift */,
 				B5A543E624FB82BB000DC5E3 /* Classic.ColorsDemo.Filter.swift */,
 				B5A543EC24FB84BE000DC5E3 /* Classic.ColorsDemo.MainView.swift */,
 				B5A543EE24FB84D1000DC5E3 /* Classic.ColorsDemo.LIstView.swift */,
-				B5A543F024FB84DD000DC5E3 /* ⭐️Classic.ColorsDemo.ListViewController.swift */,
+				B5A543F024FB84DD000DC5E3 /* Classic.ColorsDemo.ListViewController.swift */,
 				B5A543F224FB84EC000DC5E3 /* Classic.ColorsDemo.ItemCell.swift */,
 				B5A543E824FB84A1000DC5E3 /* Classic.ColorsDemo.DetailView.swift */,
-				B5A543EA24FB84AF000DC5E3 /* ⭐️Classic.ColorsDemo.DetailViewController.swift */,
+				B5A543EA24FB84AF000DC5E3 /* Classic.ColorsDemo.DetailViewController.swift */,
 				B5A543D824FB7483000DC5E3 /* Models */,
 			);
-			path = "⭐️ColorsDemo";
+			path = ColorsDemo;
 			sourceTree = "<group>";
 		};
 		B5A543D824FB7483000DC5E3 /* Models */ = {
@@ -511,16 +501,16 @@
 			name = Models;
 			sourceTree = "<group>";
 		};
-		B5A543F424FBF107000DC5E3 /* ⭐️Advanced */ = {
+		B5A543F424FBF107000DC5E3 /* Advanced */ = {
 			isa = PBXGroup;
 			children = (
 				B5A543F524FBF13A000DC5E3 /* Advanced.swift */,
-				B5A543F8250482EF000DC5E3 /* ⭐️EvolutionDemo */,
+				B5A543F8250482EF000DC5E3 /* EvolutionDemo */,
 			);
-			path = "⭐️Advanced";
+			path = Advanced;
 			sourceTree = "<group>";
 		};
-		B5A543F8250482EF000DC5E3 /* ⭐️EvolutionDemo */ = {
+		B5A543F8250482EF000DC5E3 /* EvolutionDemo */ = {
 			isa = PBXGroup;
 			children = (
 				B5A543FA2504840E000DC5E3 /* Advanced.EvolutionDemo.swift */,
@@ -528,12 +518,12 @@
 				B5A543FE250487B1000DC5E3 /* Advanced.EvolutionDemo.MainView.swift */,
 				B5A54400250487C7000DC5E3 /* Advanced.EvolutionDemo.ListView.swift */,
 				B5A54402250487D4000DC5E3 /* Advanced.EvolutionDemo.ItemView.swift */,
-				B5D6F208250E14AA00DF5D2F /* ⭐️Advanced.EvolutionDemo.Migrator.swift */,
+				B5D6F208250E14AA00DF5D2F /* Advanced.EvolutionDemo.Migrator.swift */,
 				B5C18F3225138700001BEFB3 /* Advanced.EvolutionDemo.ProgressView.swift */,
 				B54D2F842511B70B004BEC7D /* Advanced.EvolutionDemo.CreaturesDataSource.swift */,
 				B5A543FD25048794000DC5E3 /* Models */,
 			);
-			path = "⭐️EvolutionDemo";
+			path = EvolutionDemo;
 			sourceTree = "<group>";
 		};
 		B5A543FD25048794000DC5E3 /* Models */ = {
@@ -549,6 +539,17 @@
 			name = Models;
 			sourceTree = "<group>";
 		};
+		B5C795B425D8EE1A00BDACC1 /* UIKit */ = {
+			isa = PBXGroup;
+			children = (
+				B5C795B525D8EE2B00BDACC1 /* Modern.PokedexDemo.UIKit.swift */,
+				B566C8E724F9D406001134A1 /* Modern.PokedexDemo.UIKit.ListView.swift */,
+				B566C8E924F9D412001134A1 /* Modern.PokedexDemo.UIKit.ListViewController.swift */,
+				B566C8EB24F9D694001134A1 /* Modern.PokedexDemo.UIKit.ItemCell.swift */,
+			);
+			name = UIKit;
+			sourceTree = "<group>";
+		};
 		B5D6F1F9250E08D200DF5D2F /* V1 */ = {
 			isa = PBXGroup;
 			children = (
@@ -622,7 +623,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1160;
-				LastUpgradeCheck = 1200;
+				LastUpgradeCheck = 1400;
 				TargetAttributes = {
 					B5A3911824E5429200E7E8BD = {
 						CreatedOnToolsVersion = 11.6;
@@ -683,14 +684,14 @@
 				B5A3918F24E7E06500E7E8BD /* Modern.ColorsDemo.swift in Sources */,
 				B5A391B124E96AF600E7E8BD /* Modern.PokedexDemo.swift in Sources */,
 				B5A3918324E7A21800E7E8BD /* Modern.TimeZonesDemo.swift in Sources */,
-				B5A3915E24E6922E00E7E8BD /* ⭐️Modern.PlacemarksDemo.swift in Sources */,
+				B5A3915E24E6922E00E7E8BD /* Modern.PlacemarksDemo.swift in Sources */,
 				B5A54405250487F5000DC5E3 /* Advanced.EvolutionDemo.CreatureType.swift in Sources */,
 				B54D2F852511B70B004BEC7D /* Advanced.EvolutionDemo.CreaturesDataSource.swift in Sources */,
 				B5D6F1FE250E0B3F00DF5D2F /* Advanced.EvolutionDemo.GeologicalPeriod.swift in Sources */,
 				B5A54403250487D5000DC5E3 /* Advanced.EvolutionDemo.ItemView.swift in Sources */,
 				B5A54401250487C7000DC5E3 /* Advanced.EvolutionDemo.ListView.swift in Sources */,
 				B5A543FF250487B1000DC5E3 /* Advanced.EvolutionDemo.MainView.swift in Sources */,
-				B5D6F209250E14AA00DF5D2F /* ⭐️Advanced.EvolutionDemo.Migrator.swift in Sources */,
+				B5D6F209250E14AA00DF5D2F /* Advanced.EvolutionDemo.Migrator.swift in Sources */,
 				B5C18F3325138700001BEFB3 /* Advanced.EvolutionDemo.ProgressView.swift in Sources */,
 				B5D6F1F8250E07FD00DF5D2F /* Advanced.EvolutionDemo.V1.swift in Sources */,
 				B5D6F210250E1E3200DF5D2F /* Advanced.EvolutionDemo.V1.xcdatamodeld in Sources */,
@@ -704,6 +705,7 @@
 				B5A543ED24FB84BE000DC5E3 /* Classic.ColorsDemo.MainView.swift in Sources */,
 				B5A543DD24FB78F9000DC5E3 /* Classic.ColorsDemo.Palette.swift in Sources */,
 				B5A3919824E7E67000E7E8BD /* Modern.ColorsDemo.Filter.swift in Sources */,
+				B5C795B625D8EE2B00BDACC1 /* Modern.PokedexDemo.UIKit.swift in Sources */,
 				B5A3919224E7E0C600E7E8BD /* Modern.ColorsDemo.Palette.swift in Sources */,
 				B5A3919E24E8EEB600E7E8BD /* Modern.ColorsDemo.SwiftUI.swift in Sources */,
 				B5A391A024E8F00A00E7E8BD /* Modern.ColorsDemo.UIKit.swift in Sources */,
@@ -711,23 +713,23 @@
 				B5A3916024E6925900E7E8BD /* Modern.PlacemarksDemo.MapView.swift in Sources */,
 				B5A3916524E698C700E7E8BD /* Modern.PlacemarksDemo.Place.swift in Sources */,
 				B566C8EE24FA1EA3001134A1 /* Modern.PokedexDemo.Details.swift in Sources */,
-				B566C8EC24F9D694001134A1 /* Modern.PokedexDemo.ItemCell.swift in Sources */,
-				B566C8E824F9D406001134A1 /* Modern.PokedexDemo.ListView.swift in Sources */,
-				B566C8EA24F9D412001134A1 /* Modern.PokedexDemo.ListViewController.swift in Sources */,
+				B566C8EC24F9D694001134A1 /* Modern.PokedexDemo.UIKit.ItemCell.swift in Sources */,
+				B566C8E824F9D406001134A1 /* Modern.PokedexDemo.UIKit.ListView.swift in Sources */,
+				B566C8EA24F9D412001134A1 /* Modern.PokedexDemo.UIKit.ListViewController.swift in Sources */,
 				B531EFED24EB7453005F247D /* Modern.PokedexDemo.MainView.swift in Sources */,
 				B5A3918C24E7B44B00E7E8BD /* Modern.TimeZonesDemo.ItemView.swift in Sources */,
 				B5A3918A24E7AD1800E7E8BD /* Modern.TimeZonesDemo.ListView.swift in Sources */,
 				B5A3918624E7A54A00E7E8BD /* Modern.TimeZonesDemo.TimeZone.swift in Sources */,
-				B5A543EB24FB84AF000DC5E3 /* ⭐️Classic.ColorsDemo.DetailViewController.swift in Sources */,
-				B5A543F124FB84DD000DC5E3 /* ⭐️Classic.ColorsDemo.ListViewController.swift in Sources */,
-				B5A391A624E8F4EA00E7E8BD /* ⭐️Modern.ColorsDemo.MainView.swift in Sources */,
-				B5A3916224E697BA00E7E8BD /* ⭐️Modern.PlacemarksDemo.MainView.swift in Sources */,
-				B5A391B424E96C0A00E7E8BD /* ⭐️Modern.PokedexDemo.Form.swift in Sources */,
-				B531EFE924EB5A53005F247D /* ⭐️Modern.PokedexDemo.PokedexEntry.swift in Sources */,
-				B5A391BB24E970A400E7E8BD /* ⭐️Modern.PokedexDemo.PokemonType.swift in Sources */,
-				B531EFEB24EB5ECD005F247D /* ⭐️Modern.PokedexDemo.Service.swift in Sources */,
-				B5A391B924E96F8500E7E8BD /* ⭐️Modern.PokedexDemo.Species.swift in Sources */,
-				B5A3918824E7A8F900E7E8BD /* ⭐️Modern.TimeZonesDemo.MainView.swift in Sources */,
+				B5A543EB24FB84AF000DC5E3 /* Classic.ColorsDemo.DetailViewController.swift in Sources */,
+				B5A543F124FB84DD000DC5E3 /* Classic.ColorsDemo.ListViewController.swift in Sources */,
+				B5A391A624E8F4EA00E7E8BD /* Modern.ColorsDemo.MainView.swift in Sources */,
+				B5A3916224E697BA00E7E8BD /* Modern.PlacemarksDemo.MainView.swift in Sources */,
+				B5A391B424E96C0A00E7E8BD /* Modern.PokedexDemo.Form.swift in Sources */,
+				B531EFE924EB5A53005F247D /* Modern.PokedexDemo.PokedexEntry.swift in Sources */,
+				B5A391BB24E970A400E7E8BD /* Modern.PokedexDemo.PokemonType.swift in Sources */,
+				B531EFEB24EB5ECD005F247D /* Modern.PokedexDemo.Service.swift in Sources */,
+				B5A391B924E96F8500E7E8BD /* Modern.PokedexDemo.Species.swift in Sources */,
+				B5A3918824E7A8F900E7E8BD /* Modern.TimeZonesDemo.MainView.swift in Sources */,
 				B5A5440725049480000DC5E3 /* Advanced.EvolutionDemo.V1.Creature.swift in Sources */,
 				B5931B4225124756007DA58E /* Advanced.EvolutionDemo.V1.FromV2.swift in Sources */,
 				B54D2F7E25119DCE004BEC7D /* Advanced.EvolutionDemo.V1.FromV2.xcmappingmodel in Sources */,
@@ -744,11 +746,11 @@
 				B5A391AC24E9143B00E7E8BD /* Modern.ColorsDemo.UIKit.DetailView.swift in Sources */,
 				B5A391AA24E9104300E7E8BD /* Modern.ColorsDemo.UIKit.ItemCell.swift in Sources */,
 				B5A391A424E8F04300E7E8BD /* Modern.ColorsDemo.UIKit.ListView.swift in Sources */,
-				B5A3919A24E8207A00E7E8BD /* ⭐️Modern.ColorsDemo.SwiftUI.DetailView.swift in Sources */,
-				B5A3919624E7E4AC00E7E8BD /* ⭐️Modern.ColorsDemo.SwiftUI.ItemView.swift in Sources */,
-				B5A3919424E7E36700E7E8BD /* ⭐️Modern.ColorsDemo.SwiftUI.ListView.swift in Sources */,
-				B5A391AE24E9150F00E7E8BD /* ⭐️Modern.ColorsDemo.UIKit.DetailViewController.swift in Sources */,
-				B5A391A224E8F01F00E7E8BD /* ⭐️Modern.ColorsDemo.UIKit.ListViewController.swift in Sources */,
+				B5A3919A24E8207A00E7E8BD /* Modern.ColorsDemo.SwiftUI.DetailView.swift in Sources */,
+				B5A3919624E7E4AC00E7E8BD /* Modern.ColorsDemo.SwiftUI.ItemView.swift in Sources */,
+				B5A3919424E7E36700E7E8BD /* Modern.ColorsDemo.SwiftUI.ListView.swift in Sources */,
+				B5A391AE24E9150F00E7E8BD /* Modern.ColorsDemo.UIKit.DetailViewController.swift in Sources */,
+				B5A391A224E8F01F00E7E8BD /* Modern.ColorsDemo.UIKit.ListViewController.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -787,6 +789,7 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				DEAD_CODE_STRIPPING = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -796,7 +799,8 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				ONLY_ACTIVE_ARCH = YES;
 			};
 			name = Debug;
 		};
@@ -821,6 +825,7 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				DEAD_CODE_STRIPPING = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -829,7 +834,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 			};
 			name = Release;
 		};

Demo/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1400"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Demo/Sources/Demos/Advanced/EvolutionDemo/Advanced.EvolutionDemo.ProgressView.swift

@@ -45,17 +45,16 @@ extension Advanced.EvolutionDemo {
                         .padding(.horizontal)
                     GeometryReader { geometry in
                         ZStack(alignment: .leading) {
-                            Color.gray
-                                .opacity(0.2)
+                            RoundedRectangle(cornerRadius: 4, style: .continuous)
+                                .fill(Color.gray.opacity(0.2))
                                 .frame(width: geometry.size.width, height: 8)
-                                .cornerRadius(4.0)
-                            Color.blue
+                            RoundedRectangle(cornerRadius: 4, style: .continuous)
+                                .fill(Color.blue)
                                 .frame(
                                     width: geometry.size.width
                                         * self.progressObserver.fractionCompleted,
                                     height: 8
                                 )
-                                .cornerRadius(4.0)
                         }
                     }
                     .fixedSize(horizontal: false, vertical: true)

Demo/Sources/Demos/Classic/ColorsDemo/Classic.ColorsDemo.xcdatamodeld/ColorsDemo.xcdatamodel/contents

@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="16119" systemVersion="19F101" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="17709" systemVersion="20C5048l" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
     <entity name="Palette" representedClassName="Classic_ColorsDemo_Palette" syncable="YES">
         <attribute name="brightness" attributeType="Float" defaultValueString="0.0" usesScalarValueType="YES"/>
         <attribute name="colorGroup" optional="YES" transient="YES" attributeType="String"/>
         <attribute name="hue" attributeType="Float" defaultValueString="0.0" usesScalarValueType="YES"/>
         <attribute name="saturation" attributeType="Float" defaultValueString="0.0" usesScalarValueType="YES"/>
+        <fetchedProperty name="testFetchProperty" optional="YES">
+            <fetchRequest name="fetchedPropertyFetchRequest" entity="Palette"/>
+        </fetchedProperty>
     </entity>
     <elements>
-        <element name="Palette" positionX="-63" positionY="-18" width="128" height="103"/>
+        <element name="Palette" positionX="-63" positionY="-18" width="128" height="110"/>
     </elements>
 </model>

Demo/Sources/Demos/Modern/ColorsDemo/Modern.ColorsDemo.MainView.swift

@@ -13,12 +13,6 @@ extension Modern.ColorsDemo {
 
     struct MainView<ListView: View, DetailView: View>: View {
         
-        /**
-         ⭐️ Sample 1: Setting a sectioned `ListPublisher` declared as an `@ObservedObject`
-         */
-        @ObservedObject
-        private var listPublisher: ListPublisher<Modern.ColorsDemo.Palette>
-        
         // MARK: Internal
         
         init(
@@ -30,38 +24,24 @@ extension Modern.ColorsDemo {
             
             self.listView = listView
             self.detailView = detailView
-            self.listPublisher = Modern.ColorsDemo.palettesPublisher
-            self._filter = Binding(
-                get: { Modern.ColorsDemo.filter },
-                set: { Modern.ColorsDemo.filter = $0 }
-            )
         }
         
         
         // MARK: View
         
         var body: some View {
-            let detailView: AnyView
-            if let selectedPalette = self.selectedPalette {
-                
-                detailView = AnyView(
-                    self.detailView(selectedPalette)
-                )
-            }
-            else {
-                
-                detailView = AnyView(EmptyView())
-            }
-            let listPublisher = self.listPublisher
             return VStack(spacing: 0) {
-                self.listView(listPublisher, { self.selectedPalette = $0 })
+                self.listView(self.$palettes, { self.selectedPalette = $0 })
                     .navigationBarTitle(
-                        Text("Colors (\(listPublisher.snapshot.numberOfItems) objects)")
+                        Text("Colors (\(self.palettes.count) objects)")
                     )
                     .frame(minHeight: 0, maxHeight: .infinity)
-                detailView
-                    .edgesIgnoringSafeArea(.all)
-                    .frame(minHeight: 0, maxHeight: .infinity)
+                self.selectedPalette.map {
+                    
+                    self.detailView($0)
+                        .edgesIgnoringSafeArea(.all)
+                        .frame(minHeight: 0, maxHeight: .infinity)
+                }
             }
             .navigationBarItems(
                 leading: HStack {
@@ -91,6 +71,9 @@ extension Modern.ColorsDemo {
         
         // MARK: Private
         
+        @ListState(Modern.ColorsDemo.palettesPublisher)
+        private var palettes: ListSnapshot
+        
         private let listView: (
             _ listPublisher: ListPublisher<Modern.ColorsDemo.Palette>,
             _ onPaletteTapped: @escaping (ObjectPublisher<Modern.ColorsDemo.Palette>) -> Void
@@ -103,12 +86,13 @@ extension Modern.ColorsDemo {
         @State
         private var selectedPalette: ObjectPublisher<Modern.ColorsDemo.Palette>?
         
-        @Binding
-        private var filter: Modern.ColorsDemo.Filter
+        @State
+        private var filter: Modern.ColorsDemo.Filter = Modern.ColorsDemo.filter
         
         private func changeFilter() {
             
             Modern.ColorsDemo.filter = Modern.ColorsDemo.filter.next()
+            self.filter = Modern.ColorsDemo.filter
         }
         
         private func clearColors() {
@@ -118,6 +102,7 @@ extension Modern.ColorsDemo {
 
                     try transaction.deleteAll(From<Modern.ColorsDemo.Palette>())
                 },
+                sourceIdentifier: TransactionSource.clear,
                 completion: { _ in }
             )
         }
@@ -129,6 +114,7 @@ extension Modern.ColorsDemo {
 
                     _ = transaction.create(Into<Modern.ColorsDemo.Palette>())
                 },
+                sourceIdentifier: TransactionSource.add,
                 completion: { _ in }
             )
         }
@@ -143,6 +129,7 @@ extension Modern.ColorsDemo {
                         palette.setRandomHue()
                     }
                 },
+                sourceIdentifier: TransactionSource.shuffle,
                 completion: { _ in }
             )
         }

Demo/Sources/Demos/Modern/ColorsDemo/Modern.ColorsDemo.SwiftUI.DetailView.swift

@@ -15,10 +15,10 @@ extension Modern.ColorsDemo.SwiftUI {
     struct DetailView: View {
         
         /**
-         ⭐️ Sample 1: Setting an `ObjectPublisher` declared as an `@ObservedObject`
+         ⭐️ Sample 1: Using a `ObjectState` to observe object changes. Note that the `ObjectSnapshot` is always `Optional`
          */
-        @ObservedObject
-        private var palette: ObjectPublisher<Modern.ColorsDemo.Palette>
+        @ObjectState
+        private var palette: ObjectSnapshot<Modern.ColorsDemo.Palette>?
         
         /**
          ⭐️ Sample 2: Setting properties that can be binded to controls (`Slider` in this case) by creating custom `@Binding` instances that updates the store when the values change.
@@ -34,7 +34,7 @@ extension Modern.ColorsDemo.SwiftUI {
 
         init(_ palette: ObjectPublisher<Modern.ColorsDemo.Palette>) {
 
-            self.palette = palette
+            self._palette = .init(palette)
             self._hue = Binding(
                 get: { palette.hue ?? 0 },
                 set: { percentage in
@@ -84,56 +84,50 @@ extension Modern.ColorsDemo.SwiftUI {
         
         var body: some View {
             
-            guard let snapshot = self.palette.snapshot else {
+            if let palette = self.palette {
                 
-                return AnyView(EmptyView())
-            }
-            return AnyView(
-                GeometryReader { geometry in
-                    ZStack(alignment: .bottom) {
-                        Color(snapshot.$color)
-                        ZStack {
-                            Color.white
-                                .cornerRadius(10)
-                                .shadow(color: Color(.sRGB, white: 0.5, opacity: 0.3), radius: 2, x: 1, y: 1)
-                            VStack(alignment: .leading, spacing: 10) {
-                                HStack {
-                                    Text("H: \(Int(snapshot.$hue * 359))°")
-                                        .frame(width: 80)
-                                    Slider(
-                                        value: self.$hue,
-                                        in: 0 ... 1,
-                                        step: 1 / 359
-                                    )
-                                }
-                                HStack {
-                                    Text("S: \(Int(snapshot.$saturation * 100))%")
-                                        .frame(width: 80)
-                                    Slider(
-                                        value: self.$saturation,
-                                        in: 0 ... 1,
-                                        step: 1 / 100
-                                    )
-                                }
-                                HStack {
-                                    Text("B: \(Int(snapshot.$brightness * 100))%")
-                                        .frame(width: 80)
-                                    Slider(
-                                        value: self.$brightness,
-                                        in: 0 ... 1,
-                                        step: 1 / 100
-                                    )
-                                }
+                ZStack(alignment: .center) {
+                    Color(palette.$color)
+                    ZStack {
+                        RoundedRectangle(cornerRadius: 10, style: .continuous)
+                            .fill(Color.white)
+                            .shadow(color: Color(.sRGB, white: 0.5, opacity: 0.3), radius: 2, x: 1, y: 1)
+                        VStack(alignment: .leading, spacing: 10) {
+                            HStack {
+                                Text("H: \(Int(palette.$hue * 359))°")
+                                    .frame(width: 80)
+                                Slider(
+                                    value: self.$hue,
+                                    in: 0 ... 1,
+                                    step: 1 / 359
+                                )
+                            }
+                            HStack {
+                                Text("S: \(Int(palette.$saturation * 100))%")
+                                    .frame(width: 80)
+                                Slider(
+                                    value: self.$saturation,
+                                    in: 0 ... 1,
+                                    step: 1 / 100
+                                )
+                            }
+                            HStack {
+                                Text("B: \(Int(palette.$brightness * 100))%")
+                                    .frame(width: 80)
+                                Slider(
+                                    value: self.$brightness,
+                                    in: 0 ... 1,
+                                    step: 1 / 100
+                                )
                             }
-                            .foregroundColor(Color(.sRGB, white: 0, opacity: 0.8))
-                            .padding()
                         }
-                        .fixedSize(horizontal: false, vertical: true)
+                        .foregroundColor(Color(.sRGB, white: 0, opacity: 0.8))
                         .padding()
-                        .padding(geometry.safeAreaInsets)
                     }
+                    .fixedSize(horizontal: false, vertical: true)
+                    .padding()
                 }
-            )
+            }
         }
     }
 }

Demo/Sources/Demos/Modern/ColorsDemo/Modern.ColorsDemo.SwiftUI.ItemView.swift

@@ -14,36 +14,34 @@ extension Modern.ColorsDemo.SwiftUI {
     struct ItemView: View {
         
         /**
-         ⭐️ Sample 1: Setting an `ObjectPublisher` declared as an `@ObservedObject`
+         ⭐️ Sample 1: Using a `ObjectState` to observe object changes. Note that the `ObjectSnapshot` is always `Optional`
          */
-        @ObservedObject
-        private var palette: ObjectPublisher<Modern.ColorsDemo.Palette>
-        
-        
-        // MARK: Internal
+        @ObjectState
+        private var palette: ObjectSnapshot<Modern.ColorsDemo.Palette>?
         
+        /**
+         ⭐️ Sample 2: Initializing a `ObjectState` from an existing `ObjectPublisher`
+         */
         internal init(_ palette: ObjectPublisher<Modern.ColorsDemo.Palette>) {
             
-            self.palette = palette
+            self._palette = .init(palette)
         }
         
-        
-        // MARK: View
-
+        /**
+         ⭐️ Sample 3: Readding values directly from the `ObjectSnapshot`
+         */
         var body: some View {
             
-            guard let palette = self.palette.snapshot else {
+            if let palette = self.palette {
                 
-                return AnyView(EmptyView())
-            }
-            return AnyView(
                 Color(palette.$color).overlay(
                     Text(palette.$colorText)
                         .foregroundColor(palette.$brightness > 0.6 ? .black : .white)
                         .padding(),
                     alignment: .leading
                 )
-            )
+                .animation(.default)
+            }
         }
     }
 }

Demo/Sources/Demos/Modern/ColorsDemo/Modern.ColorsDemo.SwiftUI.ListView.swift

@@ -5,7 +5,6 @@
 import CoreStore
 import SwiftUI
 
-
 // MARK: - Modern.ColorsDemo.SwiftUI
 
 extension Modern.ColorsDemo.SwiftUI {
@@ -15,53 +14,58 @@ extension Modern.ColorsDemo.SwiftUI {
     struct ListView: View {
         
         /**
-         ⭐️ Sample 1: Setting a sectioned `ListPublisher` declared as an `@ObservedObject`
+         ⭐️ Sample 1: Using a `ListState` to observe list changes
          */
-        @ObservedObject
-        private var listPublisher: ListPublisher<Modern.ColorsDemo.Palette>
+        @ListState
+        private var palettes: ListSnapshot<Modern.ColorsDemo.Palette>
         
         /**
-         ⭐️ Sample 2: Assigning sections and items of the `ListPublisher` to corresponding `View`s
+         ⭐️ Sample 2: Initializing a `ListState` from an existing `ListPublisher`
          */
-         var body: some View {
-            let listSnapshot = self.listPublisher.snapshot
-            return List {
-                ForEach(listSnapshot.sectionIDs, id: \.self) { (sectionID) in
-                    Section(header: Text(sectionID)) {
-                        ForEach(listSnapshot.items(inSectionWithID: sectionID), id: \.self) { palette in
+        init(
+            listPublisher: ListPublisher<Modern.ColorsDemo.Palette>,
+            onPaletteTapped: @escaping (ObjectPublisher<Modern.ColorsDemo.Palette>) -> Void
+        ) {
+            
+            self._palettes = .init(listPublisher)
+            self.onPaletteTapped = onPaletteTapped
+        }
+        
+        /**
+         ⭐️ Sample 3: Assigning sections and items of the `ListSnapshot` to corresponding `View`s by using the correct `ForEach` overloads.
+         */
+        var body: some View {
+            
+            List {
+                
+                ForEach(sectionIn: self.palettes) { section in
+                    
+                    Section(header: Text(section.sectionID)) {
+                        
+                        ForEach(objectIn: section) { palette in
+                            
                             Button(
                                 action: {
+                                    
                                     self.onPaletteTapped(palette)
                                 },
                                 label: {
+                                    
                                     Modern.ColorsDemo.SwiftUI.ItemView(palette)
                                 }
                             )
                             .listRowInsets(.init())
                         }
                         .onDelete { itemIndices in
-
-                            self.deleteColors(at: itemIndices, in: sectionID)
+                            
+                            self.deleteColors(at: itemIndices, in: section.sectionID)
                         }
                     }
                 }
-                GeometryReader { geometry in
-                    Spacer(minLength: geometry.safeAreaInsets.bottom)
-                }
             }
+            .animation(.default)
             .listStyle(PlainListStyle())
-         }
-        
-        
-        // MARK: Internal
-        
-        init(
-            listPublisher: ListPublisher<Modern.ColorsDemo.Palette>,
-            onPaletteTapped: @escaping (ObjectPublisher<Modern.ColorsDemo.Palette>) -> Void
-        ) {
-            
-            self.listPublisher = listPublisher
-            self.onPaletteTapped = onPaletteTapped
+            .edgesIgnoringSafeArea([])
         }
         
         
@@ -71,7 +75,7 @@ extension Modern.ColorsDemo.SwiftUI {
         
         private func deleteColors(at indices: IndexSet, in sectionID: String) {
             
-            let objectIDsToDelete = self.listPublisher.snapshot.itemIDs(
+            let objectIDsToDelete = self.palettes.itemIDs(
                 inSectionWithID: sectionID,
                 atIndices: indices
             )

Demo/Sources/Demos/Modern/ColorsDemo/Modern.ColorsDemo.UIKit.DetailView.swift

@@ -30,14 +30,19 @@ extension Modern.ColorsDemo.UIKit {
             return UIViewControllerType(self.palette)
         }
 
-        func updateUIViewController(_ uiViewController: UIViewControllerType, context: Self.Context) {}
+        func updateUIViewController(_ uiViewController: UIViewControllerType, context: Self.Context) {
+            
+            uiViewController.palette = Modern.ColorsDemo.dataStack.monitorObject(
+                self.palette.object!
+            )
+        }
 
         static func dismantleUIViewController(_ uiViewController: UIViewControllerType, coordinator: Void) {}
         
         
         // MARK: Private
         
-        private let palette: ObjectPublisher<Modern.ColorsDemo.Palette>
+        private var palette: ObjectPublisher<Modern.ColorsDemo.Palette>
     }
 }
 

Demo/Sources/Demos/Modern/ColorsDemo/Modern.ColorsDemo.UIKit.DetailViewController.swift

@@ -40,6 +40,15 @@ extension Modern.ColorsDemo.UIKit {
         /**
          ⭐️ Sample 3: We can end monitoring updates anytime. `removeObserver()` was called here for illustration purposes only. `ObjectMonitor`s safely remove deallocated observers automatically.
          */
+        var palette: ObjectMonitor<Modern.ColorsDemo.Palette> {
+            
+            didSet {
+                
+                oldValue.removeObserver(self)
+                self.startMonitoringObject()
+            }
+        }
+        
         deinit {
             
             self.palette.removeObserver(self)
@@ -82,7 +91,8 @@ extension Modern.ColorsDemo.UIKit {
         func objectMonitor(
             _ monitor: ObjectMonitor<Modern.ColorsDemo.Palette>,
             didUpdateObject object: Modern.ColorsDemo.Palette,
-            changedPersistentKeys: Set<KeyPathString>
+            changedPersistentKeys: Set<KeyPathString>,
+            sourceIdentifier: Any?
         ) {
             
             self.reloadPaletteInfo(object, changedKeys: changedPersistentKeys)
@@ -183,9 +193,8 @@ extension Modern.ColorsDemo.UIKit {
                             equalTo: view.safeAreaLayoutGuide.leadingAnchor,
                             constant: 10
                         ),
-                        containerView.bottomAnchor.constraint(
-                            equalTo: view.safeAreaLayoutGuide.bottomAnchor,
-                            constant: -10
+                        containerView.centerYAnchor.constraint(
+                            equalTo: view.safeAreaLayoutGuide.centerYAnchor
                         ),
                         containerView.trailingAnchor.constraint(
                             equalTo: view.safeAreaLayoutGuide.trailingAnchor,
@@ -223,8 +232,6 @@ extension Modern.ColorsDemo.UIKit {
         
         // MARK: Private
         
-        private let palette: ObjectMonitor<Modern.ColorsDemo.Palette>
-        
         @available(*, unavailable)
         required init?(coder: NSCoder) {
             

Demo/Sources/Demos/Modern/ColorsDemo/Modern.ColorsDemo.UIKit.ListViewController.swift

@@ -15,9 +15,9 @@ extension Modern.ColorsDemo.UIKit {
     final class ListViewController: UITableViewController {
         
         /**
-         ⭐️ Sample 1: Setting up a `DiffableDataSource.TableViewAdapter` that will manage tableView snapshot updates automatically. We can use the built-in `DiffableDataSource.TableViewAdapter` type directly, but in our case we want to enabled `UITableView` cell deletions so we create a custom subclass `DeletionEnabledDataSource` (see declaration below).
+         ⭐️ Sample 1: Setting up a `DiffableDataSource.TableViewAdapter` that will manage tableView snapshot updates automatically. We can use the built-in `DiffableDataSource.TableViewAdapter` type directly, but in our case we want to enabled `UITableView` cell deletions so we create a custom subclass `CustomDataSource` (see declaration below).
          */
-        private lazy var dataSource: DiffableDataSource.TableViewAdapter<Modern.ColorsDemo.Palette> = DeletionEnabledDataSource(
+        private lazy var dataSource: DiffableDataSource.TableViewAdapter<Modern.ColorsDemo.Palette> = CustomDataSource(
             tableView: self.tableView,
             dataStack: Modern.ColorsDemo.dataStack,
             cellProvider: { (tableView, indexPath, palette) in
@@ -32,21 +32,26 @@ extension Modern.ColorsDemo.UIKit {
         )
         
         /**
-         ⭐️ Sample 2: Once the views are created, we can start binding `ListPublisher` updates to the `DiffableDataSource`. We typically call this at the end of `viewDidLoad`. Note that the `addObserver`'s closure argument will only be called on the succeeding updates, so to immediately display the current values, we need to call `dataSource.apply()` once.
+         ⭐️ Sample 2: Once the views are created, we can start binding `ListPublisher` updates to the `DiffableDataSource`. We typically call this at the end of `viewDidLoad`. Note that the `addObserver`'s closure argument will only be called on the succeeding updates, so to immediately display the current values, we need to call `dataSource.apply()` once. This example inspects the optional `transactionSource` to determine the source of the update which is helpful for debugging or for fine-tuning animations.
          */
         private func startObservingList() {
             
-            self.listPublisher.addObserver(self) { (listPublisher) in
+            let dataSource = self.dataSource
+            self.listPublisher.addObserver(self, notifyInitial: true) { (listPublisher, transactionSource) in
                 
-                self.dataSource.apply(
-                    listPublisher.snapshot,
-                    animatingDifferences: true
-                )
+                switch transactionSource as? Modern.ColorsDemo.TransactionSource {
+                    
+                case .add,
+                     .delete,
+                     .shuffle,
+                     .clear:
+                    dataSource.apply(listPublisher.snapshot, animatingDifferences: true)
+                    
+                case nil,
+                     .refetch:
+                    dataSource.apply(listPublisher.snapshot, animatingDifferences: false)
+                }
             }
-            self.dataSource.apply(
-                listPublisher.snapshot,
-                animatingDifferences: false
-            )
         }
         
         /**
@@ -58,9 +63,11 @@ extension Modern.ColorsDemo.UIKit {
         }
 
         /**
-         ⭐️ Sample 4: This is the custom `DiffableDataSource.TableViewAdapter` subclass we wrote that enabled swipe-to-delete gestures on the `UITableView`.
+         ⭐️ Sample 4: This is the custom `DiffableDataSource.TableViewAdapter` subclass we wrote that enabled swipe-to-delete gestures and section index titles on the `UITableView`.
          */
-        final class DeletionEnabledDataSource: DiffableDataSource.TableViewAdapter<Modern.ColorsDemo.Palette> {
+        final class CustomDataSource: DiffableDataSource.TableViewAdapter<Modern.ColorsDemo.Palette> {
+            
+            // MARK: UITableViewDataSource
 
             override func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCell.EditingStyle, forRowAt indexPath: IndexPath) {
 
@@ -76,6 +83,7 @@ extension Modern.ColorsDemo.UIKit {
 
                             transaction.delete(objectIDs: [itemID])
                         },
+                        sourceIdentifier: Modern.ColorsDemo.TransactionSource.delete,
                         completion: { _ in }
                     )
 
@@ -83,6 +91,16 @@ extension Modern.ColorsDemo.UIKit {
                     break
                 }
             }
+            
+            override func sectionIndexTitles(for tableView: UITableView) -> [String]? {
+                
+                return self.sectionIndexTitlesForAllSections().compactMap({ $0 })
+            }
+            
+            override func tableView(_ tableView: UITableView, sectionForSectionIndexTitle title: String, at index: Int) -> Int {
+                
+                return index
+            }
         }
         
         

Demo/Sources/Demos/Modern/ColorsDemo/Modern.ColorsDemo.swift

@@ -2,6 +2,7 @@
 // Demo
 // Copyright © 2020 John Rommel Estropia, Inc. All rights reserved.
 
+import SwiftUI
 import CoreStore
 
 // MARK: - Modern
@@ -45,7 +46,10 @@ extension Modern {
         
         static let palettesPublisher: ListPublisher<Modern.ColorsDemo.Palette> = Modern.ColorsDemo.dataStack.publishList(
             From<Modern.ColorsDemo.Palette>()
-                .sectionBy(\.$colorGroup)
+                .sectionBy(
+                    \.$colorGroup,
+                    sectionIndexTransformer: { $0?.first?.uppercased() }
+                )
                 .where(Modern.ColorsDemo.filter.whereClause())
                 .orderBy(.ascending(\.$hue))
         )
@@ -56,11 +60,27 @@ extension Modern {
                 
                 try! Modern.ColorsDemo.palettesPublisher.refetch(
                     From<Modern.ColorsDemo.Palette>()
-                        .sectionBy(\.$colorGroup)
+                        .sectionBy(
+                            \.$colorGroup,
+                            sectionIndexTransformer: { $0?.first?.uppercased() }
+                        )
                         .where(self.filter.whereClause())
-                        .orderBy(.ascending(\.$hue))
+                        .orderBy(.ascending(\.$hue)),
+                    sourceIdentifier: TransactionSource.refetch
                 )
             }
         }
+        
+        
+        // MARK: - TransactionSource
+        
+        enum TransactionSource {
+            
+            case add
+            case delete
+            case shuffle
+            case clear
+            case refetch
+        }
     }
 }