SWIFT-1061 Update main branch to support matrix testing (#604)

This also completes SWIFT-763.

Author: patrickfreed

.evergreen/install-swift.sh

@@ -7,6 +7,10 @@ PROJECT_DIRECTORY=${PROJECT_DIRECTORY:-$PWD}
 SWIFT_VERSION=${SWIFT_VERSION:-5.1.5}
 INSTALL_DIR="${PROJECT_DIRECTORY}/opt"
 
+# this is set by drivers-matrix-testing, and it's a special variable used in swiftenv
+# leaving it set messes with the installation
+unset PLATFORM
+
 export SWIFTENV_ROOT="${INSTALL_DIR}/swiftenv"
 export PATH="${SWIFTENV_ROOT}/bin:$PATH"
 

.evergreen/run-tests.sh

@@ -5,13 +5,14 @@ set -o errexit  # Exit the script with error if any of the commands fail
 # variables
 PROJECT_DIRECTORY=${PROJECT_DIRECTORY:-$PWD}
 MONGODB_URI=${MONGODB_URI:-"NO_URI_PROVIDED"}
-SWIFT_VERSION=${SWIFT_VERSION:-5.1}
+SWIFT_VERSION=${SWIFT_VERSION:-5.2.5}
 INSTALL_DIR="${PROJECT_DIRECTORY}/opt"
 TOPOLOGY=${TOPOLOGY:-single}
 OS=$(uname -s | tr '[:upper:]' '[:lower:]')
 EXTRA_FLAGS="-Xlinker -rpath -Xlinker ${INSTALL_DIR}/lib"
 RAW_TEST_RESULTS="${PROJECT_DIRECTORY}/rawTestResults"
 XML_TEST_RESULTS="${PROJECT_DIRECTORY}/testResults.xml"
+INSTALL_DEPS=${INSTALL_DEPS:-"false"}
 
 # ssl setup
 SSL=${SSL:-nossl}
@@ -20,6 +21,13 @@ if [ "$SSL" != "nossl" ]; then
    export SSL_CA_FILE="$DRIVERS_TOOLS/.evergreen/x509gen/ca.pem"
 fi
 
+# if dependencies were not installed separately, do so now.
+# this is used for continous matrix testing
+if [ "$INSTALL_DEPS" == "true" ]; then
+    SWIFT_VERSION=${SWIFT_VERSION} \
+      sh ${PROJECT_DIRECTORY}/.evergreen/install-dependencies.sh
+fi
+
 # enable swiftenv
 export SWIFTENV_ROOT="${INSTALL_DIR}/swiftenv"
 export PATH="${SWIFTENV_ROOT}/bin:$PATH"

Sources/MongoSwift/MongoCollection+Indexes.swift

@@ -51,7 +51,9 @@ public struct IndexOptions: Codable {
     /// Optionally specifies the precision of the stored geo hash in the 2d index, from 1 to 32.
     public var bits: Int?
 
-    /// Optionally specifies the number of units within which to group the location values in a geo haystack index.
+    /// Optionally specifies the number of units within which to group the location values in a geoHaystack index.
+    /// Note: geoHaystack indexes are deprecated in MongoDB 4.4 and will be removed in a future version of the
+    /// server.
     public var bucketSize: Int?
 
     /// Optionally specifies a collation to use for the index in MongoDB 3.4 and higher. If not specified, no collation