Evergreen: Fix versions and add Scala 2.13

SCALA-506

Author: rozza

.evergreen/config.yml

@@ -257,15 +257,6 @@ functions:
           ${PREPARE_SHELL}
           echo '{"results": [{ "status": "FAIL", "test_file": "Build", "log_raw": "No test-results.json found was created"  } ]}' > ${PROJECT_DIRECTORY}/test-results.json
 
-  "install dependencies":
-    type: test
-    params:
-      working_dir: "src"
-      script: |
-        ${PREPARE_SHELL}
-        file="${PROJECT_DIRECTORY}/.evergreen/install-dependencies.sh"
-        [ -f ${file} ] && sh ${file} || echo "${file} not available, skipping"
-
   "run static checks":
     - command: shell.exec
       type: test
@@ -313,7 +304,7 @@ functions:
           PROJECT_DIRECTORY=${PROJECT_DIRECTORY} NEXUS_USERNAME=${nexus_username} NEXUS_PASSWORD=${nexus_password} SIGNING_PASSWORD=${signing_password} SIGNING_KEY_ID=${signing_key_id} RING_FILE_GPG_BASE64=${ring_file_gpg_base64} .evergreen/publish-snapshots.sh
 
 hosts: &hosts
- - "rhel62-small"
+ - "rhel70-small"
 
 pre:
   - func: "fetch source"
@@ -322,7 +313,6 @@ pre:
   - func: "fix absolute paths"
   - func: "init test-results"
   - func: "make files executable"
-  - func: "install dependencies"
 
 post:
   # Removed, causing timeouts
@@ -401,11 +391,15 @@ axes:
       - id: "2.11"
         display_name: "2.11"
         variables:
-           SCALA_VERSION: "2.11.11"
+           SCALA_VERSION: "2.11.12"
       - id: "2.12"
         display_name: "2.12"
         variables:
-           SCALA_VERSION: "2.12.2"
+           SCALA_VERSION: "2.12.8"
+      - id: "2.13"
+        display_name: "2.13"
+        variables:
+          SCALA_VERSION: "2.13.0"
 
   - id: "streamType"
     display_name: "streamType"

docs/reference/content/changelog.md

@@ -12,6 +12,7 @@ Changes between released versions
 
 ### 2.7.0
   * Updated MongoDB Driver Async to 3.11.0
+  * Added support for Scala 2.13 [SCALA-506](https://jira.mongodb.org/browse/SCALA-506)
   * Updated DEFAULT_CODEC_REGISTRY order, as upstream BsonCodec captures all Bson instances and priority needs to be lower.
   * Support $merge pipeline stage in aggregations [SCALA-473](https://jira.mongodb.org/browse/SCALA-473)
   * Deprecated BsonArray.apply(Iterable[BsonValue]) added BsonArray.fromIterable [SCALA-531](https://jira.mongodb.org/browse/SCALA-531)

driver/src/it/scala/org/mongodb/scala/DocumentationChangeStreamExampleSpec.scala

@@ -114,7 +114,7 @@ class DocumentationChangeStreamExampleSpec extends RequiresMongoDBISpec with Fut
   }
 
   // Implicit functions that execute the Observable and return the results
-  val waitDuration = Duration(5, "seconds")
+  val waitDuration = Duration(60, "seconds")
 
   implicit class ObservableExecutor[T](observable: Observable[T]) {
     def execute(): Seq[T] = Await.result(observable, waitDuration)

project/MongoScalaBuild.scala

@@ -59,11 +59,7 @@ object MongoScalaBuild extends Build {
   val scalacOptionsTest: Seq[String] = Seq( "-unchecked", "-deprecation", "-feature", "-Xlint:-missing-interpolator,_", "-Xcheckinit")
 
   def scalacOptionsVersion(scalaVersion: String): Seq[String] = {
-    Seq( "-unchecked", "-deprecation", "-feature", "-Ywarn-dead-code"
-      /*,"-Xfatal-warnings", "-Ymacro-debug-verbose", "-Xlog-implicits", "-Yinfer-debug", "-Xprint:typer"*/) ++ (scalaVersion match {
-      case "2.12.6" => Seq("-Xlint:-unused,-missing-interpolator,_" /*, "-Ywarn-unused:imports,privates,locals,-implicits,-params"*/)
-      case _ => Seq("-language:existentials", "-Xlint:-missing-interpolator,_")
-    })
+    Seq( "-unchecked", "-deprecation", "-feature", "-Ywarn-dead-code", "-language:existentials", "-Xlint:-missing-interpolator")
   }
 
   val versionSettings = Versioning.settings(baseVersion)