Add Swift 5.0 and 5.1 CI tests. Fix compile warning under Swift 5.x.

Author: Simon Pilkington

.gitignore

@@ -1,5 +1,6 @@
 build
 .DS_Store
 .build/
+.swiftpm/
 *.xcodeproj
 *~

.travis.yml

@@ -1,6 +1,26 @@
 # Matrix of required of OS and Swift releases
 matrix:
   include:
+    - os: linux
+      dist: xenial
+      sudo: required
+      services: docker
+      env: DOCKER_IMAGE_TAG=swift:5.1-bionic USE_SWIFT_LINT=no
+    - os: linux
+      dist: xenial
+      sudo: required
+      services: docker
+      env: DOCKER_IMAGE_TAG=swift:5.1-xenial USE_SWIFT_LINT=no
+    - os: linux
+      dist: xenial
+      sudo: required
+      services: docker
+      env: DOCKER_IMAGE_TAG=swift:5.0.1-bionic USE_SWIFT_LINT=yes
+    - os: linux
+      dist: xenial
+      sudo: required
+      services: docker
+      env: DOCKER_IMAGE_TAG=swift:5.0.1-xenial USE_SWIFT_LINT=yes
     - os: linux
       dist: xenial
       sudo: required

CITests/run

@@ -1,10 +1,13 @@
 #!/bin/bash
 set -e
 
-swiftLintVersion=0.29.0
+swiftLintVersion=0.33.0
 
 USE_SWIFT_LINT=$1
 
+apt-get update
+apt-get -y install libssl-dev libz-dev
+
 workspaceRoot=($PWD)
 srcRoot=$workspaceRoot/sources
 mkdir -p $srcRoot

README.md

@@ -9,6 +9,12 @@
 <a href="http://swift.org">
 <img src="https://img.shields.io/badge/swift-4.2-orange.svg?style=flat" alt="Swift 4.1 Compatible">
 </a>
+<a href="http://swift.org">
+<img src="https://img.shields.io/badge/swift-5.0-orange.svg?style=flat" alt="Swift 5.0 Compatible">
+</a>
+<a href="http://swift.org">
+<img src="https://img.shields.io/badge/swift-5.1-orange.svg?style=flat" alt="Swift 5.1 Compatible">
+</a>
 <a href="https://gitter.im/SmokeServerSide">
 <img src="https://img.shields.io/badge/chat-on%20gitter-ee115e.svg?style=flat" alt="Join the Smoke Server Side community on gitter">
 </a>

Sources/SmokeDynamoDB/AWSDynamoDBKeysProjection+DynamoDBKeysProjectionAsync.swift

@@ -24,7 +24,7 @@ import LoggerAPI
 /// DynamoDBKeysProjection conformance async functions
 public extension AWSDynamoDBKeysProjection {
 
-    public func queryAsync<AttributesType>(
+    func queryAsync<AttributesType>(
         forPartitionKey partitionKey: String,
         sortKeyCondition: AttributeCondition?,
         completion: @escaping (HTTPResult<[CompositePrimaryKey<AttributesType>]>) -> ())
@@ -76,7 +76,7 @@ public extension AWSDynamoDBKeysProjection {
                           completion: handleQueryResult)
     }
 
-    public func queryAsync<AttributesType>(
+    func queryAsync<AttributesType>(
         forPartitionKey partitionKey: String,
         sortKeyCondition: AttributeCondition?,
         limit: Int?,

Sources/SmokeDynamoDB/AWSDynamoDBKeysProjection+DynamoDBKeysProjectionSync.swift

@@ -24,7 +24,7 @@ import LoggerAPI
 /// DynamoDBKeysProjection conformance sync functions
 public extension AWSDynamoDBKeysProjection {
 
-    public func querySync<AttributesType>(forPartitionKey partitionKey: String,
+    func querySync<AttributesType>(forPartitionKey partitionKey: String,
                                           sortKeyCondition: AttributeCondition?) throws
         -> [CompositePrimaryKey<AttributesType>] {
 
@@ -50,7 +50,7 @@ public extension AWSDynamoDBKeysProjection {
         }
     }
 
-    public func querySync<AttributesType>(forPartitionKey partitionKey: String,
+    func querySync<AttributesType>(forPartitionKey partitionKey: String,
                                           sortKeyCondition: AttributeCondition?,
                                           limit: Int?,
                                           exclusiveStartKey: String?) throws

Sources/SmokeDynamoDB/AWSDynamoDBTable+DynamoDBTableAsync.swift

@@ -24,7 +24,7 @@ import LoggerAPI
 /// DynamoDBTable conformance async functions
 public extension AWSDynamoDBTable {
 
-    public func insertItemAsync<AttributesType, ItemType>(_ item: TypedDatabaseItem<AttributesType, ItemType>,
+    func insertItemAsync<AttributesType, ItemType>(_ item: TypedDatabaseItem<AttributesType, ItemType>,
                                                           completion: @escaping (Error?) -> ())
         throws where AttributesType: PrimaryKeyAttributes, ItemType: Decodable, ItemType: Encodable {
             let putItemInput = try getInputForInsert(item)
@@ -33,7 +33,7 @@ public extension AWSDynamoDBTable {
                              completion: completion)
     }
 
-    public func clobberItemAsync<AttributesType, ItemType>(_ item: TypedDatabaseItem<AttributesType, ItemType>,
+    func clobberItemAsync<AttributesType, ItemType>(_ item: TypedDatabaseItem<AttributesType, ItemType>,
                                                            completion: @escaping (Error?) -> ())
         throws where AttributesType: PrimaryKeyAttributes, ItemType: Decodable, ItemType: Encodable {
             let attributes = try getAttributes(forItem: item)
@@ -44,7 +44,7 @@ public extension AWSDynamoDBTable {
             try putItemAsync(forInput: putItemInput, withKey: item.compositePrimaryKey, completion: completion)
     }
 
-    public func updateItemAsync<AttributesType, ItemType>(newItem: TypedDatabaseItem<AttributesType, ItemType>,
+    func updateItemAsync<AttributesType, ItemType>(newItem: TypedDatabaseItem<AttributesType, ItemType>,
                                                           existingItem: TypedDatabaseItem<AttributesType, ItemType>,
                                                           completion: @escaping (Error?) -> ())
         throws where AttributesType: PrimaryKeyAttributes, ItemType: Decodable, ItemType: Encodable {
@@ -53,7 +53,7 @@ public extension AWSDynamoDBTable {
             try putItemAsync(forInput: putItemInput, withKey: newItem.compositePrimaryKey, completion: completion)
     }
 
-    public func getItemAsync<AttributesType, ItemType>(forKey key: CompositePrimaryKey<AttributesType>,
+    func getItemAsync<AttributesType, ItemType>(forKey key: CompositePrimaryKey<AttributesType>,
                                                        completion: @escaping (HTTPResult<TypedDatabaseItem<AttributesType, ItemType>?>) -> ())
         throws where AttributesType: PrimaryKeyAttributes, ItemType: Decodable, ItemType: Encodable {
             let putItemInput = try getInputForGetItem(forKey: key)
@@ -83,7 +83,7 @@ public extension AWSDynamoDBTable {
             }
     }
 
-    public func deleteItemAsync<AttributesType>(forKey key: CompositePrimaryKey<AttributesType>,
+    func deleteItemAsync<AttributesType>(forKey key: CompositePrimaryKey<AttributesType>,
                                                 completion: @escaping (Error?) -> ())
         throws where AttributesType: PrimaryKeyAttributes {
             let deleteItemInput = try getInputForDeleteItem(forKey: key)
@@ -100,7 +100,7 @@ public extension AWSDynamoDBTable {
             }
     }
 
-    public func queryAsync<AttributesType, PossibleTypes>(
+    func queryAsync<AttributesType, PossibleTypes>(
             forPartitionKey partitionKey: String,
             sortKeyCondition: AttributeCondition?,
             completion: @escaping (HTTPResult<[PolymorphicDatabaseItem<AttributesType, PossibleTypes>]>) -> ())
@@ -152,7 +152,7 @@ public extension AWSDynamoDBTable {
                           completion: handleQueryResult)
     }
 
-    public func queryAsync<AttributesType, PossibleTypes>(
+    func queryAsync<AttributesType, PossibleTypes>(
             forPartitionKey partitionKey: String,
             sortKeyCondition: AttributeCondition?,
             limit: Int, exclusiveStartKey: String?,

Sources/SmokeDynamoDB/AWSDynamoDBTable+DynamoDBTableSync.swift

@@ -24,13 +24,13 @@ import LoggerAPI
 /// DynamoDBTable conformance sync functions
 public extension AWSDynamoDBTable {
 
-    public func insertItemSync<AttributesType, ItemType>(_ item: TypedDatabaseItem<AttributesType, ItemType>) throws {
+    func insertItemSync<AttributesType, ItemType>(_ item: TypedDatabaseItem<AttributesType, ItemType>) throws {
         let putItemInput = try getInputForInsert(item)
 
         try putItemSync(forInput: putItemInput, withKey: item.compositePrimaryKey)
     }
 
-    public func clobberItemSync<AttributesType, ItemType>(_ item: TypedDatabaseItem<AttributesType, ItemType>) throws {
+    func clobberItemSync<AttributesType, ItemType>(_ item: TypedDatabaseItem<AttributesType, ItemType>) throws {
         let attributes = try getAttributes(forItem: item)
 
         let putItemInput = DynamoDBModel.PutItemInput(item: attributes,
@@ -39,14 +39,14 @@ public extension AWSDynamoDBTable {
         try putItemSync(forInput: putItemInput, withKey: item.compositePrimaryKey)
     }
 
-    public func updateItemSync<AttributesType, ItemType>(newItem: TypedDatabaseItem<AttributesType, ItemType>,
+    func updateItemSync<AttributesType, ItemType>(newItem: TypedDatabaseItem<AttributesType, ItemType>,
                                                          existingItem: TypedDatabaseItem<AttributesType, ItemType>) throws {
         let putItemInput = try getInputForUpdateItem(newItem: newItem, existingItem: existingItem)
 
         try putItemSync(forInput: putItemInput, withKey: newItem.compositePrimaryKey)
     }
 
-    public func getItemSync<AttributesType, ItemType>(forKey key: CompositePrimaryKey<AttributesType>) throws
+    func getItemSync<AttributesType, ItemType>(forKey key: CompositePrimaryKey<AttributesType>) throws
         -> TypedDatabaseItem<AttributesType, ItemType>? {
             let putItemInput = try getInputForGetItem(forKey: key)
 
@@ -64,14 +64,14 @@ public extension AWSDynamoDBTable {
             }
     }
 
-    public func deleteItemSync<AttributesType>(forKey key: CompositePrimaryKey<AttributesType>) throws {
+    func deleteItemSync<AttributesType>(forKey key: CompositePrimaryKey<AttributesType>) throws {
         let deleteItemInput = try getInputForDeleteItem(forKey: key)
 
         Log.verbose("dynamodb.deleteItem with key: \(key) and table name \(targetTableName)")
         _ = try dynamodb.deleteItemSync(input: deleteItemInput)
     }
 
-    public func querySync<AttributesType, PossibleTypes>(forPartitionKey partitionKey: String,
+    func querySync<AttributesType, PossibleTypes>(forPartitionKey partitionKey: String,
                                                          sortKeyCondition: AttributeCondition?) throws
         -> [PolymorphicDatabaseItem<AttributesType, PossibleTypes>] {
 
@@ -97,7 +97,7 @@ public extension AWSDynamoDBTable {
         }
     }
 
-    public func querySync<AttributesType, PossibleTypes>(forPartitionKey partitionKey: String,
+    func querySync<AttributesType, PossibleTypes>(forPartitionKey partitionKey: String,
                                                          sortKeyCondition: AttributeCondition?,
                                                          limit: Int,
                                                          exclusiveStartKey: String?) throws

Sources/SmokeDynamoDB/DynamoDBTable+clobberVersionedItemWithHistoricalRow.swift

@@ -34,7 +34,7 @@ public extension DynamoDBTable {
         - generateSortKey: generator to provide a sort key for a provided
                            version number.
      */
-    public func clobberVersionedItemWithHistoricalRowSync<AttributesType: PrimaryKeyAttributes, ItemType: Codable>(
+    func clobberVersionedItemWithHistoricalRowSync<AttributesType: PrimaryKeyAttributes, ItemType: Codable>(
         forPrimaryKey partitionKey: String,
         andHistoricalKey historicalKey: String,
         item: ItemType,
@@ -87,7 +87,7 @@ public extension DynamoDBTable {
                            version number.
      - completion: completion handler providing an error that was thrown or nil
      */
-    public func clobberVersionedItemWithHistoricalRowAsync<AttributesType: PrimaryKeyAttributes, ItemType: Codable>(
+    func clobberVersionedItemWithHistoricalRowAsync<AttributesType: PrimaryKeyAttributes, ItemType: Codable>(
         forPrimaryKey partitionKey: String,
         andHistoricalKey historicalKey: String,
         item: ItemType,

Sources/SmokeDynamoDB/DynamoDBTable+conditionallyUpdateItem.swift

@@ -34,7 +34,7 @@ public extension DynamoDBTable {
          withRetries: the number of times to attempt to retry the update before failing.
          updatedPayloadProvider: the provider that will return updated payloads.
      */
-    public func conditionallyUpdateItemSync<AttributesType, ItemType: Codable>(
+    func conditionallyUpdateItemSync<AttributesType, ItemType: Codable>(
         forKey key: CompositePrimaryKey<AttributesType>,
         withRetries retries: Int = 10,
         updatedPayloadProvider: (ItemType) throws -> ItemType) throws {
@@ -64,7 +64,7 @@ public extension DynamoDBTable {
         }
     }
 
-    public func conditionallyUpdateItemAsync<AttributesType, ItemType: Codable>(
+    func conditionallyUpdateItemAsync<AttributesType, ItemType: Codable>(
         forKey key: CompositePrimaryKey<AttributesType>,
         withRetries retries: Int = 10,
         updatedPayloadProvider: @escaping (ItemType) throws -> ItemType,

Sources/SmokeDynamoDB/DynamoDBTableHistoricalItemExtensions.swift

@@ -26,13 +26,13 @@ public extension DynamoDBTable {
      * Historical items exist across multiple rows. This method provides an interface to record all
      * rows in a single call.
      */
-    public func insertItemWithHistoricalRowSync<AttributesType, ItemType>(primaryItem: TypedDatabaseItem<AttributesType, ItemType>,
+    func insertItemWithHistoricalRowSync<AttributesType, ItemType>(primaryItem: TypedDatabaseItem<AttributesType, ItemType>,
                                                                           historicalItem: TypedDatabaseItem<AttributesType, ItemType>) throws {
         try insertItemSync(primaryItem)
         try insertItemSync(historicalItem)
     }
 
-    public func insertItemWithHistoricalRowAsync<AttributesType, ItemType>(primaryItem: TypedDatabaseItem<AttributesType, ItemType>,
+    func insertItemWithHistoricalRowAsync<AttributesType, ItemType>(primaryItem: TypedDatabaseItem<AttributesType, ItemType>,
                                                                            historicalItem: TypedDatabaseItem<AttributesType, ItemType>,
                                                                            completion: @escaping (Error?) -> ()) throws {
         try insertItemAsync(primaryItem) { error in
@@ -48,14 +48,14 @@ public extension DynamoDBTable {
         }
     }
 
-    public func updateItemWithHistoricalRowSync<AttributesType, ItemType>(primaryItem: TypedDatabaseItem<AttributesType, ItemType>,
+    func updateItemWithHistoricalRowSync<AttributesType, ItemType>(primaryItem: TypedDatabaseItem<AttributesType, ItemType>,
                                                                           existingItem: TypedDatabaseItem<AttributesType, ItemType>,
                                                                           historicalItem: TypedDatabaseItem<AttributesType, ItemType>) throws {
         try updateItemSync(newItem: primaryItem, existingItem: existingItem)
         try insertItemSync(historicalItem)
     }
 
-    public func updateItemWithHistoricalRowAsync<AttributesType, ItemType>(primaryItem: TypedDatabaseItem<AttributesType, ItemType>,
+    func updateItemWithHistoricalRowAsync<AttributesType, ItemType>(primaryItem: TypedDatabaseItem<AttributesType, ItemType>,
                                                                            existingItem: TypedDatabaseItem<AttributesType, ItemType>,
                                                                            historicalItem: TypedDatabaseItem<AttributesType, ItemType>,
                                                                            completion: @escaping (Error?) -> ()) throws {
@@ -84,7 +84,7 @@ public extension DynamoDBTable {
      * Clobbering a historical item requires knowledge of existing rows to accurately record
      * historical data.
      */
-    public func clobberItemWithHistoricalRowSync<AttributesType, ItemType>(
+    func clobberItemWithHistoricalRowSync<AttributesType, ItemType>(
             primaryItemProvider: (TypedDatabaseItem<AttributesType, ItemType>?) -> TypedDatabaseItem<AttributesType, ItemType>,
             historicalItemProvider: (TypedDatabaseItem<AttributesType, ItemType>) -> TypedDatabaseItem<AttributesType, ItemType>,
             withRetries retries: Int = 10) throws {
@@ -132,7 +132,7 @@ public extension DynamoDBTable {
      * Clobbering a historical item requires knowledge of existing rows to accurately record
      * historical data.
      */
-    public func clobberItemWithHistoricalRowAsync<AttributesType, ItemType>(
+    func clobberItemWithHistoricalRowAsync<AttributesType, ItemType>(
             primaryItemProvider: @escaping (TypedDatabaseItem<AttributesType, ItemType>?) -> TypedDatabaseItem<AttributesType, ItemType>,
             historicalItemProvider: @escaping (TypedDatabaseItem<AttributesType, ItemType>) -> TypedDatabaseItem<AttributesType, ItemType>,
             withRetries retries: Int = 10,
@@ -201,7 +201,7 @@ public extension DynamoDBTable {
         - primaryItemProvider: Function to provide the updated item or throw if the current item can't be updated.
         - historicalItemProvider: Function to provide the historical item for the primary item.
      */
-    public func conditionallyUpdateItemWithHistoricalRowSync<AttributesType, ItemType>(
+    func conditionallyUpdateItemWithHistoricalRowSync<AttributesType, ItemType>(
         compositePrimaryKey: CompositePrimaryKey<AttributesType>,
         primaryItemProvider: (TypedDatabaseItem<AttributesType, ItemType>) throws -> TypedDatabaseItem<AttributesType, ItemType>,
         historicalItemProvider: (TypedDatabaseItem<AttributesType, ItemType>) -> TypedDatabaseItem<AttributesType, ItemType>,
@@ -290,7 +290,7 @@ public extension DynamoDBTable {
         - primaryItemProvider: Function to provide the updated item or throw if the current item can't be updated.
         - historicalItemProvider: Function to provide the historical item for the primary item.
      */
-    public func conditionallyUpdateItemWithHistoricalRowAsync<AttributesType, ItemType>(
+    func conditionallyUpdateItemWithHistoricalRowAsync<AttributesType, ItemType>(
         forPrimaryKey compositePrimaryKey: CompositePrimaryKey<AttributesType>,
         primaryItemProvider: @escaping (TypedDatabaseItem<AttributesType, ItemType>) throws -> TypedDatabaseItem<AttributesType, ItemType>,
         historicalItemProvider: @escaping (TypedDatabaseItem<AttributesType, ItemType>) -> TypedDatabaseItem<AttributesType, ItemType>,

Sources/SmokeDynamoDB/String+DynamoDBKey.swift

@@ -20,13 +20,13 @@ import Foundation
 /// Extension for Arrays of Strings
 public extension Array where Element == String {
     // Transforms the Array into a Dynamo key - putting dots between each element.
-    public var dynamodbKey: String {
+    var dynamodbKey: String {
         // return all elements joined with dots
         return self.joined(separator: ".")
     }
 
     // Transforms an Array into a DynamoDB key prefix - a DynamoDB key with a dot on the end.
-    public var dynamodbKeyPrefix: String {
+    var dynamodbKeyPrefix: String {
 
         let dynamodbKey = self.dynamodbKey
         if dynamodbKey.count == 0 {