update for 2.13 compat

Author: bbstilson

datastore-cli/src/main/scala/org/allenai/datastore/cli/DownloadApp.scala

@@ -13,11 +13,11 @@ object DownloadApp extends App {
   )
 
   val parser = new scopt.OptionParser[Options]("scopt") {
-    opt[Boolean]("assumeFile") action { (f, c) =>
+    opt[Boolean]("assumeFile").action { (f, c) =>
       c.copy(assumeFile = f)
     } text ("Assumes that the object in the datastore is a file.")
 
-    opt[Boolean]("assumeDirectory") action { (d, c) =>
+    opt[Boolean]("assumeDirectory").action { (d, c) =>
       c.copy(assumeDirectory = d)
     } text ("Assumes that the object in the datastore is a directory.")
 
@@ -34,19 +34,19 @@ object DownloadApp extends App {
         "whether the object in the datastore is a file or a directory."
     )
 
-    opt[String]('g', "group") required () action { (g, c) =>
+    opt[String]('g', "group").required().action { (g, c) =>
       c.copy(group = g)
     } text ("Group name of the object in the datastore")
 
-    opt[String]('n', "name") required () action { (n, c) =>
+    opt[String]('n', "name").required().action { (n, c) =>
       c.copy(name = n)
     } text ("Name of the object in the datastore")
 
-    opt[Int]('v', "version") required () action { (v, c) =>
+    opt[Int]('v', "version").required().action { (v, c) =>
       c.copy(version = v)
     } text ("Version number of the object in the datastore")
 
-    opt[String]('d', "datastore") action { (d, c) =>
+    opt[String]('d', "datastore").action { (d, c) =>
       c.copy(datastore = Some(Datastore(d)))
     } text (s"Datastore to use. Default is ${Datastore.defaultName}")
 

datastore-cli/src/main/scala/org/allenai/datastore/cli/UploadApp.scala

@@ -15,35 +15,35 @@ object UploadApp extends App {
   )
 
   val parser = new scopt.OptionParser[Options]("scopt") {
-    opt[File]('p', "path") required () action { (p, c) =>
+    opt[File]('p', "path").required().action { (p, c) =>
       c.copy(path = p)
     } text ("Path to the file or directory you want uploaded")
 
-    opt[String]('g', "group") required () action { (g, c) =>
+    opt[String]('g', "group").required().action { (g, c) =>
       c.copy(group = g)
     } text ("Group name to store the file or directory under")
 
-    opt[String]('n', "name") required () action { (n, c) =>
+    opt[String]('n', "name").required().action { (n, c) =>
       c.copy(name = n)
     } text ("Name to store the file or directory under")
 
-    opt[Int]('v', "version") required () action { (v, c) =>
+    opt[Int]('v', "version").required().action { (v, c) =>
       c.copy(version = v)
     } text ("Version number to store the file or directory under")
 
-    opt[String]('d', "datastore") action { (d, c) =>
+    opt[String]('d', "datastore").action { (d, c) =>
       c.copy(datastore = Some(Datastore(d)))
     } text (s"Datastore to use. Default is ${Datastore.defaultName}")
 
-    opt[Boolean]("overwrite") action { (_, c) =>
+    opt[Boolean]("overwrite").action { (_, c) =>
       c.copy(overwrite = true)
     } text ("Overwrite if the group, version, and name already exists")
 
     help("help")
   }
 
   Common.handleDatastoreExceptions {
-    parser.parse(args, Options()) foreach { config =>
+    parser.parse(args, Options()).foreach { config =>
       val datastore = config.datastore.getOrElse {
         Common.printDefaultDatastoreWarning()
         Datastore

datastore-cli/src/main/scala/org/allenai/datastore/cli/UrlApp.scala

@@ -13,11 +13,11 @@ object UrlApp extends App {
   )
 
   val parser = new scopt.OptionParser[Options]("scopt") {
-    opt[Boolean]("assumeFile") action { (f, c) =>
+    opt[Boolean]("assumeFile").action { (f, c) =>
       c.copy(assumeFile = f)
     } text ("Assumes that the object in the datastore is a file.")
 
-    opt[Boolean]("assumeDirectory") action { (d, c) =>
+    opt[Boolean]("assumeDirectory").action { (d, c) =>
       c.copy(assumeDirectory = d)
     } text ("Assumes that the object in the datastore is a directory.")
 
@@ -34,27 +34,27 @@ object UrlApp extends App {
         "whether the object in the datastore is a file or a directory."
     )
 
-    opt[String]('g', "group") required () action { (g, c) =>
+    opt[String]('g', "group").required().action { (g, c) =>
       c.copy(group = g)
     } text ("Group name of the object in the datastore")
 
-    opt[String]('n', "name") required () action { (n, c) =>
+    opt[String]('n', "name").required().action { (n, c) =>
       c.copy(name = n)
     } text ("Name of the object in the datastore")
 
-    opt[Int]('v', "version") required () action { (v, c) =>
+    opt[Int]('v', "version").required().action { (v, c) =>
       c.copy(version = v)
     } text ("Version number of the object in the datastore")
 
-    opt[String]('d', "datastore") action { (d, c) =>
+    opt[String]('d', "datastore").action { (d, c) =>
       c.copy(datastore = Some(Datastore(d)))
     } text (s"Datastore to use. Default is ${Datastore.defaultName}")
 
     help("help")
   }
 
   Common.handleDatastoreExceptions {
-    parser.parse(args, Options()) foreach { config =>
+    parser.parse(args, Options()).foreach { config =>
       val datastore = config.datastore.getOrElse {
         Common.printDefaultDatastoreWarning()
         Datastore

datastore/src/main/scala/org/allenai/datastore/Datastore.scala

@@ -19,6 +19,7 @@ import org.apache.commons.io.FileUtils
 import org.slf4j.LoggerFactory
 import ch.qos.logback.classic.Level
 
+import scala.collection.compat._
 import scala.collection.JavaConverters._
 import scala.util.control.NonFatal
 import scala.util.Random
@@ -684,7 +685,7 @@ class Datastore(val name: String, val s3: AmazonS3Client) extends Logging {
     getAllListings(listObjectsRequest)
       .flatMap(_.getCommonPrefixes.asScala)
       .map(_.stripSuffix("/"))
-      .to[collection.SortedSet]
+      .to(collection.SortedSet)
   }
 
   /** Lists all items in a group
@@ -706,7 +707,7 @@ class Datastore(val name: String, val s3: AmazonS3Client) extends Logging {
         .map { os =>
           Locator.fromKey(os.getKey)
         }
-        .to[collection.SortedSet]
+        .to(collection.SortedSet)
     }
 
   //

project/Dependencies.scala

@@ -1,6 +1,8 @@
 import sbt._
 
 object Dependencies {
+  val scalaCollectionCompat = "org.scala-lang.modules" %% "scala-collection-compat" % "2.4.3"
+
   val commonVersion = "2.3.1"
   val allenAiCommon = "org.allenai.common" %% "common-core" % commonVersion
   val allenAiTestkit = "org.allenai.common" %% "common-testkit" % commonVersion

project/GlobalPlugin.scala

@@ -17,6 +17,7 @@ object GlobalPlugin extends AutoPlugin {
       scalaVersion := ScalaVersions.SCALA_213,
       CodeArtifactKeys.codeArtifactUrl := "https://org-allenai-s2-896129387501.d.codeartifact.us-west-2.amazonaws.com/maven/private",
       fork in Test := true,
+      libraryDependencies += scalaCollectionCompat,
       dependencyOverrides ++= Logging.loggingDependencyOverrides
     )
 }