Core: conform our identity protocol to Swift.Identifiable

AppwiseCore.podspec

@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
 		:type => 'MIT',
 		:file => 'LICENSE'
 	}
-	s.ios.deployment_target = '10.0'
+	s.ios.deployment_target = '13.0'
 	s.swift_version = '5.0'
 
 	# files

CHANGELOG.md

@@ -21,6 +21,7 @@ All notable changes to this project will be documented in this file.
 * Core: add `requestVoid` method to network client.
 * Core: default error parser now ignores `.explicitlyCancelled` (for cancelled requests).
 * Core: result "cancellation" now uses Swift's built-in `CancellationError` type if available.
+* Core: `TaggedIdentifiable` protocol now conforms to Swift's own `Identifiable` protocol.
 * XcodeGen: added a template for shared frameworks.
 
 ### Bug Fixes

Sources/Core/Identity.swift

@@ -18,24 +18,29 @@ public protocol _TaggedIdentifiable {
 	// Note: once we remove `OptionalIdentifiable`, unify this protocol with `TaggedIdentifiable` below.
 
 	/// The backing raw type of this type's identifier.
-	associatedtype RawIdentifier
+	associatedtype RawIdentifier: Hashable
 
 	/// The object type (hack needed to support subclasses)
 	associatedtype IdentifierObjectType: _TaggedIdentifiable = Self
 
+	/// Shorthand type alias for this type's identifier.
+	typealias TaggedID = Identifier<IdentifierObjectType>
+
 	// swiftlint:disable type_name
 	/// Shorthand type alias for this type's identifier.
-	typealias ID = Identifier<IdentifierObjectType>
+	///
+	/// - Warning: Prefer `TaggedID` to avoid ambiguity errors.
+	typealias ID = TaggedID
 	// swiftlint:enable type_name
 }
 
 /// Protocol used to mark a given type as being identifiable, meaning
 /// that it has a type-safe identifier, backed by a raw value, which
 /// defaults to String.
-public protocol TaggedIdentifiable: _TaggedIdentifiable {
+public protocol TaggedIdentifiable<RawIdentifier>: _TaggedIdentifiable, Swift.Identifiable {
 	// swiftlint:disable identifier_name
 	/// The ID of this instance.
-	var id: ID { get }
+	var id: TaggedID { get }
 	// swiftlint:enable identifier_name
 }
 
@@ -138,7 +143,6 @@ public typealias Identifiable = TaggedIdentifiable
 @available(*, deprecated, message: "Will be removed in next major version")
 public protocol OptionalIdentifiable: _TaggedIdentifiable {
 	// swiftlint:disable identifier_name
-	/// The ID of this instance.
-	var id: ID? { get }
+	var id: TaggedID? { get }
 	// swiftlint:enable identifier_name
 }

Sources/CoreData/Repository/SingleObjectRepository.swift

@@ -8,18 +8,18 @@ import CoreData
 public protocol SingleObjectRepository {
 	associatedtype ObjectType: NSFetchRequestResult, _TaggedIdentifiable
 
-	var objectID: Identifier<ObjectType> { get }
+	var objectID: ObjectType.TaggedID { get }
 	var context: NSManagedObjectContext { get }
 	var object: ObjectType? { get }
 
-	init(objectID: Identifier<ObjectType>, context: NSManagedObjectContext)
+	init(objectID: ObjectType.TaggedID, context: NSManagedObjectContext)
 	func refresh(then handler: @escaping (Result<ObjectType, Error>) -> Void)
 }
 
 // MARK: - Default implementations
 
 public extension SingleObjectRepository {
-	init(objectID: Identifier<ObjectType>) {
+	init(objectID: ObjectType.TaggedID) {
 		self.init(objectID: objectID, context: DB.shared.view)
 	}