From 3317867a2f9709b8e3384488be8fffdae740733c Mon Sep 17 00:00:00 2001 From: John Estropia Date: Sat, 5 Mar 2022 11:31:36 +0900 Subject: [PATCH] Fix warnings for Xcode 13.3 beta --- CoreStore.xcodeproj/project.pbxproj | 24 +++++++++---------- .../⭐️TimeZonesDemo/Modern.TimeZonesDemo.ListView.swift | 2 +- Sources/CoreStoreSchema.swift | 2 +- Sources/NSEntityDescription+Migration.swift | 16 ++++++------- Sources/NSManagedObjectModel+Migration.swift | 8 +++---- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/CoreStore.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj index 67f485d..f4ef7fb 100644 --- a/CoreStore.xcodeproj/project.pbxproj +++ b/CoreStore.xcodeproj/project.pbxproj @@ -2059,9 +2059,9 @@ isa = PBXNativeTarget; buildConfigurationList = 2F03A54319C5C6DA005002A5 /* Build configuration list for PBXNativeTarget "CoreStore iOS" */; buildPhases = ( + 2F03A52D19C5C6DA005002A5 /* Headers */, 2F03A52B19C5C6DA005002A5 /* Sources */, 2F03A52C19C5C6DA005002A5 /* Frameworks */, - 2F03A52D19C5C6DA005002A5 /* Headers */, 2F03A52E19C5C6DA005002A5 /* Resources */, ); buildRules = ( @@ -2095,9 +2095,9 @@ isa = PBXNativeTarget; buildConfigurationList = 82BA189E1C4BBCBA00A0916E /* Build configuration list for PBXNativeTarget "CoreStore tvOS" */; buildPhases = ( + 82BA18861C4BBCBA00A0916E /* Headers */, 82BA18841C4BBCBA00A0916E /* Sources */, 82BA18851C4BBCBA00A0916E /* Frameworks */, - 82BA18861C4BBCBA00A0916E /* Headers */, 82BA18871C4BBCBA00A0916E /* Resources */, ); buildRules = ( @@ -2131,9 +2131,9 @@ isa = PBXNativeTarget; buildConfigurationList = B52DD18C1BE1F8CD00949AFE /* Build configuration list for PBXNativeTarget "CoreStore OSX" */; buildPhases = ( + B52DD1711BE1F8CC00949AFE /* Headers */, B52DD16F1BE1F8CC00949AFE /* Sources */, B52DD1701BE1F8CC00949AFE /* Frameworks */, - B52DD1711BE1F8CC00949AFE /* Headers */, B52DD1721BE1F8CC00949AFE /* Resources */, ); buildRules = ( @@ -2167,9 +2167,9 @@ isa = PBXNativeTarget; buildConfigurationList = B56321741BD65082006C9394 /* Build configuration list for PBXNativeTarget "CoreStore watchOS" */; buildPhases = ( + B563216C1BD65082006C9394 /* Headers */, B563216A1BD65082006C9394 /* Sources */, B563216B1BD65082006C9394 /* Frameworks */, - B563216C1BD65082006C9394 /* Headers */, B563216D1BD65082006C9394 /* Resources */, ); buildRules = ( @@ -3435,7 +3435,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 8.1.0; + MARKETING_VERSION = 8.1.1; OTHER_LDFLAGS = ( "-weak_framework", Combine, @@ -3458,7 +3458,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 8.1.0; + MARKETING_VERSION = 8.1.1; OTHER_LDFLAGS = ( "-weak_framework", Combine, @@ -3516,7 +3516,7 @@ GCC_NO_COMMON_BLOCKS = YES; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 8.1.0; + MARKETING_VERSION = 8.1.1; OTHER_LDFLAGS = ( "-weak_framework", Combine, @@ -3543,7 +3543,7 @@ GCC_NO_COMMON_BLOCKS = YES; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 8.1.0; + MARKETING_VERSION = 8.1.1; OTHER_LDFLAGS = ( "-weak_framework", Combine, @@ -3607,7 +3607,7 @@ GCC_NO_COMMON_BLOCKS = YES; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 8.1.0; + MARKETING_VERSION = 8.1.1; OTHER_LDFLAGS = ( "-weak_framework", Combine, @@ -3636,7 +3636,7 @@ GCC_NO_COMMON_BLOCKS = YES; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 8.1.0; + MARKETING_VERSION = 8.1.1; OTHER_LDFLAGS = ( "-weak_framework", Combine, @@ -3700,7 +3700,7 @@ GCC_NO_COMMON_BLOCKS = YES; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 8.1.0; + MARKETING_VERSION = 8.1.1; OTHER_LDFLAGS = ( "-weak_framework", Combine, @@ -3729,7 +3729,7 @@ GCC_NO_COMMON_BLOCKS = YES; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 8.1.0; + MARKETING_VERSION = 8.1.1; OTHER_LDFLAGS = ( "-weak_framework", Combine, diff --git a/Demo/⭐️Sources/⭐️Demos/⭐️Modern/⭐️TimeZonesDemo/Modern.TimeZonesDemo.ListView.swift b/Demo/⭐️Sources/⭐️Demos/⭐️Modern/⭐️TimeZonesDemo/Modern.TimeZonesDemo.ListView.swift index ad8046c..3037da0 100644 --- a/Demo/⭐️Sources/⭐️Demos/⭐️Modern/⭐️TimeZonesDemo/Modern.TimeZonesDemo.ListView.swift +++ b/Demo/⭐️Sources/⭐️Demos/⭐️Modern/⭐️TimeZonesDemo/Modern.TimeZonesDemo.ListView.swift @@ -32,7 +32,7 @@ extension Modern.TimeZonesDemo { self.values = array.map { ( title: String(describing: $0), - dsubtitleetail: String(reflecting: type(of: $0)) + subtitle: String(reflecting: type(of: $0)) ) } diff --git a/Sources/CoreStoreSchema.swift b/Sources/CoreStoreSchema.swift index f7a617c..dd26d94 100644 --- a/Sources/CoreStoreSchema.swift +++ b/Sources/CoreStoreSchema.swift @@ -269,7 +269,7 @@ public final class CoreStoreSchema: DynamicSchema { initializer: (DynamicEntity, ModelVersion) -> ( entity: NSEntityDescription, customGetterSetterByKeyPaths: [KeyPathString: CoreStoreManagedObject.CustomGetterSetter], - customInitializersByEntity: [KeyPathString: CoreStoreManagedObject.CustomInitializer], + customInitializerByKeyPaths: [KeyPathString: CoreStoreManagedObject.CustomInitializer], fieldCoders: [KeyPathString: Internals.AnyFieldCoder] ) ) -> ( diff --git a/Sources/NSEntityDescription+Migration.swift b/Sources/NSEntityDescription+Migration.swift index 4ba9c26..d10aa4a 100644 --- a/Sources/NSEntityDescription+Migration.swift +++ b/Sources/NSEntityDescription+Migration.swift @@ -36,9 +36,9 @@ extension NSEntityDescription { return self.attributesByName.reduce( into: [:], - { (result, attribute: (name: String, description: NSAttributeDescription)) in + { (result, attribute: (key: String, value: NSAttributeDescription)) in - result[attribute.name] = (attribute.description, attribute.description.versionHash) + result[attribute.key] = (attribute.value, attribute.value.versionHash) } ) } @@ -48,9 +48,9 @@ extension NSEntityDescription { return self.attributesByName.reduce( into: [:], - { (result, attribute: (name: String, description: NSAttributeDescription)) in + { (result, attribute: (key: String, value: NSAttributeDescription)) in - result[attribute.description.renamingIdentifier ?? attribute.name] = (attribute.description, attribute.description.versionHash) + result[attribute.value.renamingIdentifier ?? attribute.key] = (attribute.value, attribute.value.versionHash) } ) } @@ -60,9 +60,9 @@ extension NSEntityDescription { return self.relationshipsByName.reduce( into: [:], - { (result, relationship: (name: String, description: NSRelationshipDescription)) in + { (result, relationship: (key: String, value: NSRelationshipDescription)) in - result[relationship.name] = (relationship.description, relationship.description.versionHash) + result[relationship.key] = (relationship.value, relationship.value.versionHash) } ) } @@ -72,9 +72,9 @@ extension NSEntityDescription { return self.relationshipsByName.reduce( into: [:], - { (result, relationship: (name: String, description: NSRelationshipDescription)) in + { (result, relationship: (key: String, value: NSRelationshipDescription)) in - result[relationship.description.renamingIdentifier ?? relationship.name] = (relationship.description, relationship.description.versionHash) + result[relationship.value.renamingIdentifier ?? relationship.key] = (relationship.value, relationship.value.versionHash) } ) } diff --git a/Sources/NSManagedObjectModel+Migration.swift b/Sources/NSManagedObjectModel+Migration.swift index d602320..b024c3a 100644 --- a/Sources/NSManagedObjectModel+Migration.swift +++ b/Sources/NSManagedObjectModel+Migration.swift @@ -36,9 +36,9 @@ extension NSManagedObjectModel { return self.entitiesByName.reduce( into: [:], - { (result, entity: (name: String, description: NSEntityDescription)) in + { (result, entity: (key: String, value: NSEntityDescription)) in - result[entity.name] = (entity.description, entity.description.versionHash) + result[entity.key] = (entity.value, entity.value.versionHash) } ) } @@ -48,9 +48,9 @@ extension NSManagedObjectModel { return self.entitiesByName.reduce( into: [:], - { (result, entity: (name: String, description: NSEntityDescription)) in + { (result, entity: (key: String, value: NSEntityDescription)) in - result[entity.description.renamingIdentifier ?? entity.name] = (entity.description, entity.description.versionHash) + result[entity.value.renamingIdentifier ?? entity.key] = (entity.value, entity.value.versionHash) } ) }