Merge branch 'release/2.5.0'

danthorpe · Mar 25, 2016 · f8644c9 · f8644c9
2 parents dd9044c + 0f97500
commit f8644c9
Show file tree

Hide file tree

Showing 14 changed files with 98 additions and 93 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 2.5.0
+1. [[YDB-84](https://github.com/danthorpe/YapDatabaseExtensions/pull/85)]: Updates to Swift 2.2
+
+No significant changes, just updated for Swift 2.2 :)
+
 # 2.4.0
 1. [[YDB-73](https://github.com/danthorpe/YapDatabaseExtensions/pull/73), [YDB-77](https://github.com/danthorpe/YapDatabaseExtensions/pull/77)]: Improvements to README and documentation. Thanks [@cdzombak](https://github.com/cdzombak)!
 2. [[YDB-74](https://github.com/danthorpe/YapDatabaseExtensions/pull/74)]: Improvements to CI & automation.

diff --git a/Cartfile b/Cartfile
@@ -1,2 +1,2 @@
-github "danthorpe/ValueCoding" == 1.2.0
+github "danthorpe/ValueCoding"
 github "yapstudios/YapDatabase"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,3 +1,3 @@
 github "CocoaLumberjack/CocoaLumberjack" "2.2.0"
-github "danthorpe/ValueCoding" "1.2.0"
+github "danthorpe/ValueCoding" "1.3.0"
 github "yapstudios/YapDatabase" "2.8.3"
diff --git a/Tests/Shared/ObjectWithNoMetadataTests.swift b/Tests/Shared/ObjectWithNoMetadataTests.swift
@@ -300,7 +300,7 @@ class Functional_Write_ObjectWithNoMetadataTests: ObjectWithNoMetadataTests {
 
     func test__connection__async_write_item() {
         var result: TypeUnderTest!
-        let expectation = expectationWithDescription("Test: \(__FUNCTION__)")
+        let expectation = expectationWithDescription("Test: \(#function)")
         connection.asyncWrite(item) { tmp in
             result = tmp
             expectation.fulfill()
@@ -312,7 +312,7 @@ class Functional_Write_ObjectWithNoMetadataTests: ObjectWithNoMetadataTests {
 
     func test__connection__async_write_items() {
         var result: [TypeUnderTest] = []
-        let expectation = expectationWithDescription("Test: \(__FUNCTION__)")
+        let expectation = expectationWithDescription("Test: \(#function)")
         connection.asyncWrite(items) { received in
             result = received
             expectation.fulfill()
@@ -352,7 +352,7 @@ class Functional_Remove_ObjectWithNoMetadataTests: ObjectWithNoMetadataTests {
     }
 
     func test__connection_async_remove_item() {
-        let expectation = expectationWithDescription("Test: \(__FUNCTION__)")
+        let expectation = expectationWithDescription("Test: \(#function)")
         configureForReadingSingle()
         connection.asyncRemove(item) {
             expectation.fulfill()
@@ -363,7 +363,7 @@ class Functional_Remove_ObjectWithNoMetadataTests: ObjectWithNoMetadataTests {
     }
 
     func test__connection_async_remove_items() {
-        let expectation = expectationWithDescription("Test: \(__FUNCTION__)")
+        let expectation = expectationWithDescription("Test: \(#function)")
         configureForReadingMultiple()
         connection.asyncRemove(items) {
             expectation.fulfill()
@@ -664,7 +664,7 @@ class Persistable_Write_ObjectWithNoMetadataTests: ObjectWithNoMetadataTests {
     }
 
     func test__item_persistable__write_async_using_connection() {
-        let expectation = expectationWithDescription("Test: \(__FUNCTION__)")
+        let expectation = expectationWithDescription("Test: \(#function)")
         var result: TypeUnderTest! = nil
 
         item.asyncWrite(connection) { tmp in
@@ -677,7 +677,7 @@ class Persistable_Write_ObjectWithNoMetadataTests: ObjectWithNoMetadataTests {
     }
 
     func test__item_persistable__write_using_opertion() {
-        let expectation = expectationWithDescription("Test: \(__FUNCTION__)")
+        let expectation = expectationWithDescription("Test: \(#function)")
 
         let operation = item.writeOperation(connection)
         operation.completionBlock = {
@@ -703,7 +703,7 @@ class Persistable_Write_ObjectWithNoMetadataTests: ObjectWithNoMetadataTests {
     }
 
     func test__items_persistable__write_async_using_connection() {
-        let expectation = expectationWithDescription("Test: \(__FUNCTION__)")
+        let expectation = expectationWithDescription("Test: \(#function)")
         var result: [TypeUnderTest] = []
 
         items.asyncWrite(connection) { tmp in
@@ -716,7 +716,7 @@ class Persistable_Write_ObjectWithNoMetadataTests: ObjectWithNoMetadataTests {
     }
 
     func test__items_persistable__write_using_opertion() {
-        let expectation = expectationWithDescription("Test: \(__FUNCTION__)")
+        let expectation = expectationWithDescription("Test: \(#function)")
 
         let operation = items.writeOperation(connection)
         operation.completionBlock = {
@@ -748,7 +748,7 @@ class Persistable_Remove_ObjectWithNoMetadataTests: ObjectWithNoMetadataTests {
     }
 
     func test__connection_async_remove_item() {
-        let expectation = expectationWithDescription("Test: \(__FUNCTION__)")
+        let expectation = expectationWithDescription("Test: \(#function)")
         configureForReadingSingle()
         item.asyncRemove(connection) {
             expectation.fulfill()
@@ -759,7 +759,7 @@ class Persistable_Remove_ObjectWithNoMetadataTests: ObjectWithNoMetadataTests {
     }
 
     func test__connection_operation_remove_item() {
-        let expectation = expectationWithDescription("Test: \(__FUNCTION__)")
+        let expectation = expectationWithDescription("Test: \(#function)")
         configureForReadingSingle()
         let operation = item.removeOperation(connection)
         operation.completionBlock = {
@@ -786,7 +786,7 @@ class Persistable_Remove_ObjectWithNoMetadataTests: ObjectWithNoMetadataTests {
     }
 
     func test__connection_async_remove_items() {
-        let expectation = expectationWithDescription("Test: \(__FUNCTION__)")
+        let expectation = expectationWithDescription("Test: \(#function)")
         configureForReadingMultiple()
         items.asyncRemove(connection) {
             expectation.fulfill()
@@ -797,7 +797,7 @@ class Persistable_Remove_ObjectWithNoMetadataTests: ObjectWithNoMetadataTests {
     }
 
     func test__connection_operation_remove_items() {
-        let expectation = expectationWithDescription("Test: \(__FUNCTION__)")
+        let expectation = expectationWithDescription("Test: \(#function)")
         configureForReadingMultiple()
         let operation = items.removeOperation(connection)
         operation.completionBlock = {

diff --git a/Tests/Shared/ObjectWithObjectMetadataTests.swift b/Tests/Shared/ObjectWithObjectMetadataTests.swift
@@ -302,7 +302,7 @@ class Functional_Write_ObjectWithObjectMetadataTests: ObjectWithObjectMetadataTe
 
     func test__connection__async_write_item() {
         var result: TypeUnderTest!
-        let expectation = expectationWithDescription("Test: \(__FUNCTION__)")
+        let expectation = expectationWithDescription("Test: \(#function)")
         connection.asyncWrite(item) { tmp in
             result = tmp
             expectation.fulfill()
@@ -314,7 +314,7 @@ class Functional_Write_ObjectWithObjectMetadataTests: ObjectWithObjectMetadataTe
 
     func test__connection__async_write_items() {
         var result: [TypeUnderTest] = []
-        let expectation = expectationWithDescription("Test: \(__FUNCTION__)")
+        let expectation = expectationWithDescription("Test: \(#function)")
         connection.asyncWrite(items) { received in
             result = received
             expectation.fulfill()
@@ -354,7 +354,7 @@ class Functional_Remove_ObjectWithObjectMetadataTests: ObjectWithObjectMetadataT
     }
 
     func test__connection_async_remove_item() {
-        let expectation = expectationWithDescription("Test: \(__FUNCTION__)")
+        let expectation = expectationWithDescription("Test: \(#function)")
         configureForReadingSingle()
         connection.asyncRemove(item) {
             expectation.fulfill()
@@ -365,7 +365,7 @@ class Functional_Remove_ObjectWithObjectMetadataTests: ObjectWithObjectMetadataT
     }
 
     func test__connection_async_remove_items() {
-        let expectation = expectationWithDescription("Test: \(__FUNCTION__)")
+        let expectation = expectationWithDescription("Test: \(#function)")
         configureForReadingMultiple()
         connection.asyncRemove(items) {
             expectation.fulfill()
@@ -666,7 +666,7 @@ class Persistable_Write_ObjectWithObjectMetadataTests: ObjectWithObjectMetadataT
     }
 
     func test__item_persistable__write_async_using_connection() {
-        let expectation = expectationWithDescription("Test: \(__FUNCTION__)")
+        let expectation = expectationWithDescription("Test: \(#function)")
         var result: TypeUnderTest! = nil
 
         item.asyncWrite(connection) { tmp in
@@ -679,7 +679,7 @@ class Persistable_Write_ObjectWithObjectMetadataTests: ObjectWithObjectMetadataT
     }
 
     func test__item_persistable__write_using_opertion() {
-        let expectation = expectationWithDescription("Test: \(__FUNCTION__)")
+        let expectation = expectationWithDescription("Test: \(#function)")
 
         let operation = item.writeOperation(connection)
         operation.completionBlock = {
@@ -705,7 +705,7 @@ class Persistable_Write_ObjectWithObjectMetadataTests: ObjectWithObjectMetadataT
     }
 
     func test__items_persistable__write_async_using_connection() {
-        let expectation = expectationWithDescription("Test: \(__FUNCTION__)")
+        let expectation = expectationWithDescription("Test: \(#function)")
         var result: [TypeUnderTest] = []
 
         items.asyncWrite(connection) { tmp in
@@ -718,7 +718,7 @@ class Persistable_Write_ObjectWithObjectMetadataTests: ObjectWithObjectMetadataT
     }
 
     func test__items_persistable__write_using_opertion() {
-        let expectation = expectationWithDescription("Test: \(__FUNCTION__)")
+        let expectation = expectationWithDescription("Test: \(#function)")
 
         let operation = items.writeOperation(connection)
         operation.completionBlock = {
@@ -750,7 +750,7 @@ class Persistable_Remove_ObjectWithObjectMetadataTests: ObjectWithObjectMetadata
     }
 
     func test__connection_async_remove_item() {
-        let expectation = expectationWithDescription("Test: \(__FUNCTION__)")
+        let expectation = expectationWithDescription("Test: \(#function)")
         configureForReadingSingle()
         item.asyncRemove(connection) {
             expectation.fulfill()
@@ -761,7 +761,7 @@ class Persistable_Remove_ObjectWithObjectMetadataTests: ObjectWithObjectMetadata
     }
 
     func test__connection_operation_remove_item() {
-        let expectation = expectationWithDescription("Test: \(__FUNCTION__)")
+        let expectation = expectationWithDescription("Test: \(#function)")
         configureForReadingSingle()
         let operation = item.removeOperation(connection)
         operation.completionBlock = {
@@ -788,7 +788,7 @@ class Persistable_Remove_ObjectWithObjectMetadataTests: ObjectWithObjectMetadata
     }
 
     func test__connection_async_remove_items() {
-        let expectation = expectationWithDescription("Test: \(__FUNCTION__)")
+        let expectation = expectationWithDescription("Test: \(#function)")
         configureForReadingMultiple()
         items.asyncRemove(connection) {
             expectation.fulfill()
@@ -799,7 +799,7 @@ class Persistable_Remove_ObjectWithObjectMetadataTests: ObjectWithObjectMetadata
     }
 
     func test__connection_operation_remove_items() {
-        let expectation = expectationWithDescription("Test: \(__FUNCTION__)")
+        let expectation = expectationWithDescription("Test: \(#function)")
         configureForReadingMultiple()
         let operation = items.removeOperation(connection)
         operation.completionBlock = {

diff --git a/Tests/Shared/ObjectWithValueMetadataTests.swift b/Tests/Shared/ObjectWithValueMetadataTests.swift
@@ -302,7 +302,7 @@ class Functional_Write_ObjectWithValueMetadataTests: ObjectWithValueMetadataTest
 
     func test__connection__async_write_item() {
         var result: TypeUnderTest!
-        let expectation = expectationWithDescription("Test: \(__FUNCTION__)")
+        let expectation = expectationWithDescription("Test: \(#function)")
         connection.asyncWrite(item) { tmp in
             result = tmp
             expectation.fulfill()
@@ -314,7 +314,7 @@ class Functional_Write_ObjectWithValueMetadataTests: ObjectWithValueMetadataTest
 
     func test__connection__async_write_items() {
         var result: [TypeUnderTest] = []
-        let expectation = expectationWithDescription("Test: \(__FUNCTION__)")
+        let expectation = expectationWithDescription("Test: \(#function)")
         connection.asyncWrite(items) { received in
             result = received
             expectation.fulfill()
@@ -354,7 +354,7 @@ class Functional_Remove_ObjectWithValueMetadataTests: ObjectWithValueMetadataTes
     }
 
     func test__connection_async_remove_item() {
-        let expectation = expectationWithDescription("Test: \(__FUNCTION__)")
+        let expectation = expectationWithDescription("Test: \(#function)")
         configureForReadingSingle()
         connection.asyncRemove(item) {
             expectation.fulfill()
@@ -365,7 +365,7 @@ class Functional_Remove_ObjectWithValueMetadataTests: ObjectWithValueMetadataTes
     }
 
     func test__connection_async_remove_items() {
-        let expectation = expectationWithDescription("Test: \(__FUNCTION__)")
+        let expectation = expectationWithDescription("Test: \(#function)")
         configureForReadingMultiple()
         connection.asyncRemove(items) {
             expectation.fulfill()
@@ -666,7 +666,7 @@ class Persistable_Write_ObjectWithValueMetadataTests: ObjectWithValueMetadataTes
     }
 
     func test__item_persistable__write_async_using_connection() {
-        let expectation = expectationWithDescription("Test: \(__FUNCTION__)")
+        let expectation = expectationWithDescription("Test: \(#function)")
         var result: TypeUnderTest! = nil
 
         item.asyncWrite(connection) { tmp in
@@ -679,7 +679,7 @@ class Persistable_Write_ObjectWithValueMetadataTests: ObjectWithValueMetadataTes
     }
 
     func test__item_persistable__write_using_opertion() {
-        let expectation = expectationWithDescription("Test: \(__FUNCTION__)")
+        let expectation = expectationWithDescription("Test: \(#function)")
 
         let operation = item.writeOperation(connection)
         operation.completionBlock = {
@@ -705,7 +705,7 @@ class Persistable_Write_ObjectWithValueMetadataTests: ObjectWithValueMetadataTes
     }
 
     func test__items_persistable__write_async_using_connection() {
-        let expectation = expectationWithDescription("Test: \(__FUNCTION__)")
+        let expectation = expectationWithDescription("Test: \(#function)")
         var result: [TypeUnderTest] = []
 
         items.asyncWrite(connection) { tmp in
@@ -718,7 +718,7 @@ class Persistable_Write_ObjectWithValueMetadataTests: ObjectWithValueMetadataTes
     }
 
     func test__items_persistable__write_using_opertion() {
-        let expectation = expectationWithDescription("Test: \(__FUNCTION__)")
+        let expectation = expectationWithDescription("Test: \(#function)")
 
         let operation = items.writeOperation(connection)
         operation.completionBlock = {
@@ -750,7 +750,7 @@ class Persistable_Remove_ObjectWithValueMetadataTests: ObjectWithValueMetadataTe
     }
 
     func test__connection_async_remove_item() {
-        let expectation = expectationWithDescription("Test: \(__FUNCTION__)")
+        let expectation = expectationWithDescription("Test: \(#function)")
         configureForReadingSingle()
         item.asyncRemove(connection) {
             expectation.fulfill()
@@ -761,7 +761,7 @@ class Persistable_Remove_ObjectWithValueMetadataTests: ObjectWithValueMetadataTe
     }
 
     func test__connection_operation_remove_item() {
-        let expectation = expectationWithDescription("Test: \(__FUNCTION__)")
+        let expectation = expectationWithDescription("Test: \(#function)")
         configureForReadingSingle()
         let operation = item.removeOperation(connection)
         operation.completionBlock = {
@@ -788,7 +788,7 @@ class Persistable_Remove_ObjectWithValueMetadataTests: ObjectWithValueMetadataTe
     }
 
     func test__connection_async_remove_items() {
-        let expectation = expectationWithDescription("Test: \(__FUNCTION__)")
+        let expectation = expectationWithDescription("Test: \(#function)")
         configureForReadingMultiple()
         items.asyncRemove(connection) {
             expectation.fulfill()
@@ -799,7 +799,7 @@ class Persistable_Remove_ObjectWithValueMetadataTests: ObjectWithValueMetadataTe
     }
 
     func test__connection_operation_remove_items() {
-        let expectation = expectationWithDescription("Test: \(__FUNCTION__)")
+        let expectation = expectationWithDescription("Test: \(#function)")
         configureForReadingMultiple()
         let operation = items.removeOperation(connection)
         operation.completionBlock = {