Build: Travis updates and build fixes.

rozza · rozza · commit 1c3830dfbdca · 2017-08-22T12:02:45.000+01:00
Updated travis.yml to MongoDB 3.4
Updated to latest sbt-extras wrapper
Fixed new travis gradle issue with the publish task
diff --git a/.travis.yml b/.travis.yml
@@ -27,33 +27,22 @@ matrix:
         jdk: oraclejdk7
 
 env:
-  global:
-    - MONGO_REPO="http://repo.mongodb.com/apt/ubuntu"
-    - REPO_TYPE="precise/mongodb-enterprise/3.0 multiverse"
-    - SOURCES_LOC="/etc/apt/sources.list.d/mongodb-enterprise.list"
-    - KEY_SERVER="hkp://keyserver.ubuntu.com:80"
-    - MONGOD_PARAMS="--setParameter=enableTestCommands=1"
-    - MONGOD_OPTS="--dbpath ./data --fork --logpath mongod.log ${MONGOD_PARAMS}"
-    - TERM=dumb
-
-before_install:
-    # MongoDB Enterprise Edition 3.0
-    - sudo apt-key adv --keyserver ${KEY_SERVER} --recv 7F0CEB10
-    - echo "deb ${MONGO_REPO} ${REPO_TYPE}" | sudo tee ${SOURCES_LOC}
-
-    # Update all the repositories
-    - sudo apt-get update -qq
+  matrix:
+    - MONGODB=3.4.3
+
 
 install:
-    # Install MongoDB Enterprise
-    - sudo apt-get install mongodb-enterprise-server
-    - sudo stop mongod
-    - mkdir data
+  - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz
+  - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz
+  - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --version
 
 before_script:
-    - mongod ${MONGOD_OPTS}
-
+  - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data
+  - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork
+  - echo $TRAVIS_SCALA_VERSION
 
 script:
   - ./sbt ++$TRAVIS_SCALA_VERSION check
 
+after_script:
+  - pkill mongod
diff --git a/bson/src/test/scala/org/mongodb/scala/bson/collections/DocumentImplicitTypeConversion.scala b/bson/src/test/scala/org/mongodb/scala/bson/collections/DocumentImplicitTypeConversion.scala
@@ -16,8 +16,6 @@
 
 package org.mongodb.scala.bson.collections
 
-import scala.language.implicitConversions
-
 import org.mongodb.scala.bson._
 import org.mongodb.scala.bson.collection.immutable.Document
 import org.mongodb.scala.bson.collection.mutable
diff --git a/bson/src/test/scala/org/mongodb/scala/bson/collections/MutableDocumentSpec.scala b/bson/src/test/scala/org/mongodb/scala/bson/collections/MutableDocumentSpec.scala
@@ -16,8 +16,6 @@
 
 package org.mongodb.scala.bson.collections
 
-import scala.language.postfixOps
-
 import scala.collection.mutable
 
 import org.bson.json.JsonParseException
diff --git a/driver/src/it/scala/org/mongodb/scala/DocumentationExampleSpec.scala b/driver/src/it/scala/org/mongodb/scala/DocumentationExampleSpec.scala
@@ -16,18 +16,19 @@
 
 package org.mongodb.scala
 
+import scala.collection.JavaConverters._
 import scala.concurrent.Await
 import scala.concurrent.duration.Duration
-import scala.collection.JavaConverters._
-import scala.language.implicitConversions
+
 import org.mongodb.scala.bson.conversions.Bson
 import org.mongodb.scala.bson.{BsonArray, BsonDocument, BsonNull, BsonString, BsonValue}
 
 // imports required for filters, projections and updates
 import org.bson.BsonType
-import org.mongodb.scala.model.Filters.{all, and, bsonType, elemMatch, equal, exists, gt, in, lt, lte, or, regex, size}
+
+import org.mongodb.scala.model.Filters.{and, bsonType, elemMatch, exists, gt, in, lt, lte, or}
+import org.mongodb.scala.model.Projections.{exclude, excludeId, fields, slice}
 import org.mongodb.scala.model.Updates.{combine, currentDate, set}
-import org.mongodb.scala.model.Projections.{include, exclude, excludeId, fields, slice}
 // end required filters, projections and updates imports
 
 
diff --git a/driver/src/it/scala/org/mongodb/scala/SmokeTestISpec.scala b/driver/src/it/scala/org/mongodb/scala/SmokeTestISpec.scala
@@ -16,8 +16,6 @@
 
 package org.mongodb.scala
 
-import scala.language.implicitConversions
-
 import org.bson.BsonString
 
 
@@ -29,7 +27,7 @@ class SmokeTestISpec extends RequiresMongoDBISpec {
       val document = Document("_id" -> 1)
       val updatedDocument = Document("_id" -> 1, "a" -> 1)
 
-      val names = client.listDatabaseNames().futureValue
+      client.listDatabaseNames().futureValue
 
       info("Creating a collection")
       val created = database.createCollection(collectionName).futureValue
diff --git a/driver/src/test/scala/org/mongodb/scala/ApiAliasAndCompanionSpec.scala b/driver/src/test/scala/org/mongodb/scala/ApiAliasAndCompanionSpec.scala
@@ -101,7 +101,7 @@ class ApiAliasAndCompanionSpec extends FlatSpec with Matchers {
       .map(_.getSimpleName).toSet -- javaExclusions
 
     val scalaPackageName = "org.mongodb.scala.connection"
-    val local = currentMirror.staticPackage("org.mongodb.scala.connection").info.decls.map(_.name.toString).toSet - "package"
+    val local = currentMirror.staticPackage(scalaPackageName).info.decls.map(_.name.toString).toSet - "package"
 
     diff(local, wrapped) shouldBe empty
   }
diff --git a/driver/src/test/scala/org/mongodb/scala/MongoClientSpec.scala b/driver/src/test/scala/org/mongodb/scala/MongoClientSpec.scala
@@ -72,7 +72,7 @@ class MongoClientSpec extends FlatSpec with Matchers with MockFactory {
 
   it should "accept MongoDriverInformation" in {
     val driverInformation = MongoDriverInformation.builder().driverName("test").driverVersion("1.2.0").build()
-    val mongoClient = MongoClient("mongodb://localhost", Some(driverInformation))
+    MongoClient("mongodb://localhost", Some(driverInformation))
   }
 
   it should "call the underlying getSettings" in {
diff --git a/driver/src/test/scala/org/mongodb/scala/MongoDriverInformationSpec.scala b/driver/src/test/scala/org/mongodb/scala/MongoDriverInformationSpec.scala
@@ -18,8 +18,6 @@ package org.mongodb.scala
 
 import java.lang.reflect.Modifier.isStatic
 
-import com.mongodb.client.{MongoDriverInformation => JMongoDriverInformation}
-
 import org.scalatest.{FlatSpec, Matchers}
 
 class MongoDriverInformationSpec extends FlatSpec with Matchers {
diff --git a/driver/src/test/scala/org/mongodb/scala/gridfs/GridFSFindObservableSpec.scala b/driver/src/test/scala/org/mongodb/scala/gridfs/GridFSFindObservableSpec.scala
@@ -23,7 +23,7 @@ import scala.concurrent.duration.Duration
 import com.mongodb.async.client.MongoIterable
 import com.mongodb.async.client.gridfs.GridFSFindIterable
 
-import org.mongodb.scala.{Document, Observer, Subscription}
+import org.mongodb.scala.Document
 import org.scalamock.scalatest.proxy.MockFactory
 import org.scalatest.{FlatSpec, Matchers}
 
@@ -49,12 +49,6 @@ class GridFSFindObservableSpec extends FlatSpec with Matchers with MockFactory {
     val maxTime = Duration(10, "second") //scalatyle:ignore
     val skip = 5
     val sort = Document("{_id: 1}")
-    val observer = new Observer[GridFSFile]() {
-      override def onError(throwable: Throwable): Unit = {}
-      override def onSubscribe(subscription: Subscription): Unit = subscription.request(Long.MaxValue)
-      override def onComplete(): Unit = {}
-      override def onNext(doc: GridFSFile): Unit = {}
-    }
 
     wrapper.expects('batchSize)(batchSize).once()
     wrapper.expects('filter)(filter).once()
diff --git a/driver/src/test/scala/org/mongodb/scala/internal/ScalaObservableSpec.scala b/driver/src/test/scala/org/mongodb/scala/internal/ScalaObservableSpec.scala
@@ -34,7 +34,7 @@ import org.scalatest.{FlatSpec, Matchers}
 class ScalaObservableSpec extends FlatSpec with Matchers {
 
   "ScalaObservable" should "allow for inline subscription" in {
-    var results = ArrayBuffer[Int]()
+    val results = ArrayBuffer[Int]()
     observable().subscribe((res: Int) => results += res)
     results should equal(1 to 100)
 
@@ -48,14 +48,14 @@ class ScalaObservableSpec extends FlatSpec with Matchers {
   }
 
   it should "have a foreach method" in {
-    var results = ArrayBuffer[Int]()
+    val results = ArrayBuffer[Int]()
     observable().foreach((res: Int) => results += res)
     results should equal(1 to 100)
   }
 
   it should "have a transform method" in {
     var completed = false
-    var results = ArrayBuffer[String]()
+    val results = ArrayBuffer[String]()
     observable[Int]()
       .transform((res: Int) => res.toString, (ex: Throwable) => ex)
       .subscribe((s: String) => results += s, (t: Throwable) => (), () => completed = true)
@@ -74,7 +74,7 @@ class ScalaObservableSpec extends FlatSpec with Matchers {
   }
 
   it should "have a map method" in {
-    var results = ArrayBuffer[String]()
+    val results = ArrayBuffer[String]()
     var completed = false
     observable[Int]()
       .map((res: Int) => res.toString)
@@ -87,7 +87,7 @@ class ScalaObservableSpec extends FlatSpec with Matchers {
     def myObservable(fail: Boolean = false): Observable[String] =
       observable[Int](fail = fail).flatMap((res: Int) => observable(List(res.toString)))
 
-    var results = ArrayBuffer[String]()
+    val results = ArrayBuffer[String]()
     myObservable().subscribe((s: String) => results += s)
     results should equal((1 to 100).map(_.toString))
 
@@ -105,7 +105,7 @@ class ScalaObservableSpec extends FlatSpec with Matchers {
   it should "have a filter method" in {
     def myObservable(fail: Boolean = false): Observable[Int] = observable[Int](fail = fail).filter((i: Int) => i % 2 != 0)
 
-    var results = ArrayBuffer[Int]()
+    val results = ArrayBuffer[Int]()
     myObservable().subscribe((i: Int) => results += i)
     results should equal((1 to 100).filter(i => i % 2 != 0))
 
@@ -121,7 +121,7 @@ class ScalaObservableSpec extends FlatSpec with Matchers {
   it should "have a withFilter method" in {
     def myObservable(fail: Boolean = false): Observable[Int] = observable[Int](fail = fail).withFilter((i: Int) => i % 2 != 0)
 
-    var results = ArrayBuffer[Int]()
+    val results = ArrayBuffer[Int]()
     myObservable().subscribe((i: Int) => results += i)
     results should equal((1 to 100).filter(i => i % 2 != 0))
 
@@ -139,7 +139,7 @@ class ScalaObservableSpec extends FlatSpec with Matchers {
       observable[Int](fail = fail).collect()
     }
 
-    var results = ArrayBuffer[Int]()
+    val results = ArrayBuffer[Int]()
     myObservable().subscribe((i: Seq[Int]) => results ++= i)
     results should equal(1 to 100)
 
@@ -253,7 +253,7 @@ class ScalaObservableSpec extends FlatSpec with Matchers {
   }
 
   it should "have a zip method" in {
-    var results = ArrayBuffer[(Int, String)]()
+    val results = ArrayBuffer[(Int, String)]()
     observable[Int]().zip(observable().map(i => i.toString)).subscribe((res: (Int, String)) => results += res)
     results should equal((1 to 100).zip((1 to 100).map(_.toString)))
   }
diff --git a/driver/src/test/scala/org/mongodb/scala/model/GeoJsonSpec.scala b/driver/src/test/scala/org/mongodb/scala/model/GeoJsonSpec.scala
@@ -19,7 +19,6 @@ package org.mongodb.scala.model
 import java.lang.reflect.Modifier._
 
 import scala.collection.JavaConverters._
-import scala.reflect.runtime.{universe => u}
 
 import org.mongodb.scala.model.geojson.NamedCoordinateReferenceSystem._
 import org.mongodb.scala.model.geojson._
diff --git a/project/Publish.scala b/project/Publish.scala
@@ -41,16 +41,20 @@ object Publish {
       val props = new Properties
       val input = new FileInputStream(propFile)
       try props.load(input) finally input.close()
-      mavenSettings ++ Seq(
-        PgpSettings.pgpPassphrase := Some(props.getProperty(keyPassword).toArray),
-        PgpSettings.pgpSecretRing := file(props.getProperty(secretKeyRing)),
-        credentials += Credentials(
-          "Sonatype Nexus Repository Manager",
-          "oss.sonatype.org",
-          props.getProperty(username),
-          props.getProperty(password)),
-        publishSnapshot <<= publishSnapshotTask
-      )
+      if (props.stringPropertyNames().contains(keyPassword)) {
+        mavenSettings ++ Seq(
+          PgpSettings.pgpPassphrase := Some(props.getProperty(keyPassword).toArray),
+          PgpSettings.pgpSecretRing := file(props.getProperty(secretKeyRing)),
+          credentials += Credentials(
+            "Sonatype Nexus Repository Manager",
+            "oss.sonatype.org",
+            props.getProperty(username),
+            props.getProperty(password)),
+          publishSnapshot <<= publishSnapshotTask
+        )
+        } else {
+        Seq.empty
+      }
     }
   }
 
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.12
+sbt.version=0.13.16
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -14,3 +14,5 @@ addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.3.2")
 addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.8.5")
 
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.6.1")
+
+libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value
diff --git a/sbt b/sbt

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ class ApiAliasAndCompanionSpec extends FlatSpec with Matchers {`
`101`	`101`	`.map(_.getSimpleName).toSet -- javaExclusions`
`102`	`102`
`103`	`103`	`val scalaPackageName = "org.mongodb.scala.connection"`
`104`		`- val local = currentMirror.staticPackage("org.mongodb.scala.connection").info.decls.map(_.name.toString).toSet - "package"`
	`104`	`+ val local = currentMirror.staticPackage(scalaPackageName).info.decls.map(_.name.toString).toSet - "package"`
`105`	`105`
`106`	`106`	`diff(local, wrapped) shouldBe empty`
`107`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ class MongoClientSpec extends FlatSpec with Matchers with MockFactory {`
`72`	`72`
`73`	`73`	`it should "accept MongoDriverInformation" in {`
`74`	`74`	`val driverInformation = MongoDriverInformation.builder().driverName("test").driverVersion("1.2.0").build()`
`75`		`- val mongoClient = MongoClient("mongodb://localhost", Some(driverInformation))`
	`75`	`+ MongoClient("mongodb://localhost", Some(driverInformation))`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`it should "call the underlying getSettings" in {`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-sbt.version=0.13.12`
	`1`	`+sbt.version=0.13.16`