SWIFT-823 Use Swift 5.2-compatible way of including system libraries (#466)

Author: kmahar

.swift-version

@@ -1 +1 @@
-5.0
+5.1.4

Package.resolved

@@ -1,18 +1,32 @@
-// swift-tools-version:5.0
+// swift-tools-version:5.1
 import PackageDescription
 let package = Package(
     name: "MongoSwift",
     products: [
         .library(name: "MongoSwift", targets: ["MongoSwift"])
     ],
     dependencies: [
-        .package(url: "https://github.com/mongodb/swift-bson", .upToNextMajor(from: "2.0.0")),
-        .package(url: "https://github.com/mongodb/swift-mongoc", .upToNextMajor(from: "2.0.0")),
         .package(url: "https://github.com/Quick/Nimble.git", .exact("8.0.2"))
     ],
     targets: [
         .target(name: "MongoSwift", dependencies: ["mongoc", "bson"]),
         .target(name: "AtlasConnectivity", dependencies: ["MongoSwift"]),
-        .testTarget(name: "MongoSwiftTests", dependencies: ["MongoSwift", "Nimble", "mongoc"])
+        .testTarget(name: "MongoSwiftTests", dependencies: ["MongoSwift", "Nimble", "mongoc"]),
+        .systemLibrary(
+            name: "mongoc",
+            pkgConfig: "libmongoc-1.0",
+            providers: [
+                .brew(["mongo-c-driver"]),
+                .apt(["libmongoc-dev"])
+            ]
+        ),
+        .systemLibrary(
+            name: "bson",
+            pkgConfig: "libbson-1.0",
+            providers: [
+                .brew(["mongo-c-driver"]),
+                .apt(["libbson-dev"])
+            ]
+        )
     ]
 )

Package.swift

@@ -362,7 +362,7 @@ private class _BSONReferencingEncoder: _BSONEncoder {
         // With a regular encoder, the storage and coding path grow together.
         // A referencing encoder, however, inherits its parents coding path, as well as the key it was created for.
         // We have to take this into account.
-        return self.storage.count == self.codingPath.count - self.encoder.codingPath.count - 1
+        self.storage.count == self.codingPath.count - self.encoder.codingPath.count - 1
     }
 
     /// Finalizes `self` by writing the contents of our storage to the referenced encoder's storage.

Sources/MongoSwift/BSON/BSONEncoder.swift

@@ -61,28 +61,28 @@ extension Int64: CodableNumber {}
 extension Int8: CodableNumber {
     internal var bsonValue: BSONValue? {
         // Int8 always fits in an Int32
-        return Int32(exactly: self)
+        Int32(exactly: self)
     }
 }
 
 extension Int16: CodableNumber {
     internal var bsonValue: BSONValue? {
         // Int16 always fits in an Int32
-        return Int32(exactly: self)
+        Int32(exactly: self)
     }
 }
 
 extension UInt8: CodableNumber {
     internal var bsonValue: BSONValue? {
         // UInt8 always fits in an Int32
-        return Int32(exactly: self)
+        Int32(exactly: self)
     }
 }
 
 extension UInt16: CodableNumber {
     internal var bsonValue: BSONValue? {
         // UInt16 always fits in an Int32
-        return Int32(exactly: self)
+        Int32(exactly: self)
     }
 }
 
@@ -198,6 +198,6 @@ extension Float: CodableNumber {
 
     internal var bsonValue: BSONValue? {
         // a Float can always be represented as a Double
-        return Double(exactly: self)
+        Double(exactly: self)
     }
 }

Sources/MongoSwift/BSON/CodableNumber.swift

@@ -55,6 +55,6 @@ extension Document: Collection {
     /// held within. This method does not guarantee constant-time (O(1)) access.
     public subscript(bounds: Range<Index>) -> Document {
         // TODO: SWIFT-252 should provide a more efficient implementation for this.
-        return DocumentIterator.subsequence(of: self, startIndex: bounds.lowerBound, endIndex: bounds.upperBound)
+        DocumentIterator.subsequence(of: self, startIndex: bounds.lowerBound, endIndex: bounds.upperBound)
     }
 }

Sources/MongoSwift/BSON/Document+Collection.swift

@@ -43,7 +43,7 @@ public struct MongoCollection<T: Codable> {
     /// The name of this collection.
     public var name: String {
         // safe to force unwrap as collection name is always present for a collection namespace.
-        return self.namespace.collection! // swiftlint:disable:this force_unwrapping
+        self.namespace.collection! // swiftlint:disable:this force_unwrapping
     }
 
     /// The `ReadConcern` set on this collection, or `nil` if one is not set.

Sources/MongoSwift/MongoCollection.swift

@@ -184,7 +184,7 @@ public struct ServerDescription {
 extension ServerDescription: Equatable {
     public static func == (lhs: ServerDescription, rhs: ServerDescription) -> Bool {
         // Compare everything except `error` it is always nil and `MongoError`s are not `Equatable`
-        return lhs.connectionId == rhs.connectionId &&
+        lhs.connectionId == rhs.connectionId &&
             lhs.roundTripTime == rhs.roundTripTime &&
             lhs.lastWriteDate == rhs.lastWriteDate &&
             lhs.opTime == rhs.opTime &&
@@ -274,7 +274,7 @@ public struct TopologyDescription {
     /// Returns `true` if the topology has a readable server available, and `false` otherwise.
     public func hasReadableServer() -> Bool {
         // (this function should take in an optional ReadPreference, but we have yet to implement that type.)
-        return [.single, .replicaSetWithPrimary, .sharded].contains(self.type)
+        [.single, .replicaSetWithPrimary, .sharded].contains(self.type)
     }
 
     /// Returns `true` if the topology has a writable server available, and `false` otherwise.
@@ -304,7 +304,7 @@ public struct TopologyDescription {
 extension TopologyDescription: Equatable {
     public static func == (lhs: TopologyDescription, rhs: TopologyDescription) -> Bool {
         // Compare everything except `error` it is always nil and `MongoError`s are not `Equatable`
-        return lhs.type == rhs.type &&
+        lhs.type == rhs.type &&
             lhs.setName == rhs.setName &&
             lhs.maxSetVersion == rhs.maxSetVersion &&
             lhs.maxElectionId == rhs.maxElectionId &&

Sources/MongoSwift/SDAM.swift

@@ -0,0 +1,8 @@
+#define BCON_H_
+#include <bson.h>
+
+uint32_t _bson_get_len(const bson_t *bson)
+{
+    BSON_ASSERT (bson);
+    return bson->len;
+}

Sources/bson/libbson.h

@@ -0,0 +1,5 @@
+module bson [system] {
+    header "libbson.h"
+    link "bson-1.0"
+    export *
+}