TouchInstinct
/
TIDAORealm
312
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Swift 5.2

This commit is contained in:
Ivan Vavilov 2020-03-26 10:20:09 +03:00
parent 67edd7f222
commit a74d933bdc
12 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DAO.podspec
View File

@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'DAO'
s.version = '1.3.12'
s.version = '1.3.13'
s.summary = 'DAO Library'
s.description = 'Library provides easy way to cache entities.'
s.homepage = 'https://github.com/RedMadRobot/DAO'
@ -8,7 +8,7 @@ Pod::Spec.new do |s|
s.author = { 'vani2' => 'iv@redmadrobot.com', 'hoppus' => 'e.popov@redmadrobot.com' }
s.source = { :git => 'https://github.com/RedMadRobot/DAO.git', :tag => s.version, :submodules => true }
s.platform = :ios, '9.0'
s.swift_version = '5.0'
s.swift_version = '5.2'
s.source_files = 'DAO/Classes/Core/**/*'
s.subspec 'Realm' do |r|

8
DAO.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist Normal file
View File

@ -0,0 +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>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>

2
Example/CoreDataDAOTests/CoreDataDAOEntityTests.swift
View File

@ -14,7 +14,7 @@ import CoreData
final class CoreDataDAOEntityTests: XCTestCase {
private var dao: CoreDataDAO<CDEntity, Entity>!
private var dao: CoreDataDAO<Entity, CDEntity>!
override func setUp() {
super.setUp()

2
Example/CoreDataDAOTests/CoreDataDAOFoldersTests.swift
View File

@ -14,7 +14,7 @@ import CoreData
final class CoreDataDAOFoldersTests: XCTestCase {
private var dao: CoreDataDAO<CDFolder, Folder>!
private var dao: CoreDataDAO<Folder, CDFolder>!
override func setUp() {
super.setUp()

4
Example/CoreDataDAOTests/CoreDataDAOManyDAOTests.swift
View File

@ -14,8 +14,8 @@ import CoreData
final class CoreDataDAOManyDAOTests: XCTestCase {
private var messagesDAO: CoreDataDAO<CDMessage, Message>!
private var folderDAO: CoreDataDAO<CDFolder, Folder>!
private var messagesDAO: CoreDataDAO<Message, CDMessage>!
private var folderDAO: CoreDataDAO<Folder, CDFolder>!
override func setUp() {
super.setUp()

2
Example/CoreDataDAOTests/CoreDataDAOMessagesTests.swift
View File

@ -14,7 +14,7 @@ import CoreData
final class CoreDataDAOMessagesTests: XCTestCase {
private var dao: CoreDataDAO<CDMessage, Message>!
private var dao: CoreDataDAO<Message, CDMessage>!
override func setUp() {
super.setUp()

2
Example/DAO/Classes/Business Logic/Helper/DAO/CoreDataTranslator/CDEntityTranslator.swift
View File

@ -9,7 +9,7 @@
import DAO
import CoreData
class CDEntityTranslator: CoreDataTranslator<CDEntity, Entity> {
class CDEntityTranslator: CoreDataTranslator<Entity, CDEntity> {
override func fill(_ entity: Entity, fromEntry: CDEntity) {
entity.entityId = fromEntry.entryId

2
Example/DAO/Classes/Business Logic/Helper/DAO/CoreDataTranslator/CDFolderTranslator.swift
View File

@ -10,7 +10,7 @@ import DAO
import CoreData
class CDFolderTranslator: CoreDataTranslator<CDFolder, Folder> {
class CDFolderTranslator: CoreDataTranslator<Folder, CDFolder> {
required init() {}

2
Example/DAO/Classes/Business Logic/Helper/DAO/CoreDataTranslator/CDMessageTranslator.swift
View File

@ -10,7 +10,7 @@ import DAO
import CoreData
class CDMessageTranslator: CoreDataTranslator<CDMessage, Message> {
class CDMessageTranslator: CoreDataTranslator<Message, CDMessage> {
override func fill(_ entity: Message?, fromEntry entry: CDMessage) {
entity?.entityId = entry.entryId

11
Example/DAO/Classes/Model/Folder.swift
View File

@ -28,17 +28,16 @@ class Folder: Entity {
super.init()
}
override func equals<T>(_ other: T) -> Bool where T : Folder {
return (super.equals(other)) && self.name == other.name && self.messagesArrayEquals(other.messages)
override func equals<T>(_ other: T) -> Bool where T : Entity {
guard let other = other as? Folder else { return false }
return super.equals(other) && name == other.name && messagesArrayEquals(other.messages)
}
fileprivate func messagesArrayEquals(_ otherMessages: [Message]) -> Bool {
if (self.messages.count != otherMessages.count) { return false }
if messages.count != otherMessages.count { return false }
for message in otherMessages {
if (!messages.contains(message)) { return false }
if !messages.contains(message) { return false }
}
return true
}

10
Example/DAO/Classes/Model/Message.swift
View File

@ -13,19 +13,17 @@ class Message: Entity {
var text: String?
init(entityId: String, text: String?)
{
init(entityId: String, text: String?) {
self.text = text
super.init(entityId: entityId)
}
required init()
{
required init() {
super.init()
}
override func equals<T>(_ other: T) -> Bool where T: Message
{
override func equals<T>(_ other: T) -> Bool where T: Entity {
guard let other = other as? Message else { return false }
return super.equals(other) && self.text == other.text
}
}

16
Example/Podfile.lock
View File

@ -1,9 +1,9 @@
PODS:
- DAO (1.3.9):
- DAO/CoreData (= 1.3.9)
- DAO/Realm (= 1.3.9)
- DAO/CoreData (1.3.9)
- DAO/Realm (1.3.9):
- DAO (1.3.13):
- DAO/CoreData (= 1.3.13)
- DAO/Realm (= 1.3.13)
- DAO/CoreData (1.3.13)
- DAO/Realm (1.3.13):
- RealmSwift (~> 3.15)
- Realm (3.17.3):
- Realm/Headers (= 3.17.3)
@ -15,7 +15,7 @@ DEPENDENCIES:
- DAO (from `../`)
SPEC REPOS:
https://github.com/cocoapods/specs.git:
https://github.com/CocoaPods/Specs.git:
- Realm
- RealmSwift
@ -24,10 +24,10 @@ EXTERNAL SOURCES:
:path: "../"
SPEC CHECKSUMS:
DAO: 6e1b46bf6e46cc5fe1d3931536d1f4aa93fcb8e7
DAO: ef8b5dd7d1e62ad7e34e5905e8a224903a1d45f8
Realm: 5a1d9d47bfc101dd597668b1a8af4288a2557f6d
RealmSwift: b7fdc2d18616621c31df5c7a398a45a2163f8eb0
PODFILE CHECKSUM: 304d7b9f54070467c355fe795db431630f017f61
COCOAPODS: 1.7.5
COCOAPODS: 1.9.1