finagle-mysql: -> 2.13

Problem

No 2.13 build

Solution

Add 2.13 to the build matrix. Wrap up some import conflicts for cross-compat

Result

finagle-mysql available for 2.13

Signed-off-by: Yufan Gong <yufang@twitter.com>

Differential Revision: https://phabricator.twitter.biz/D377721

CHANGELOG.rst

@@ -10,6 +10,8 @@ Unreleased
 New Features
 ~~~~~~~~~~~~
 
+* finagle-mysql: Enables cross-build for 2.13.0. ``PHAB_ID=D377721``
+
 * finagle-{mux,thrift,thrift-mux}: Enables cross-build for 2.13.0. ``PHAB_ID=D373165``
 
 * finagle-tunable: Enables cross-build for 2.13.0. ``PHAB_ID=D373170``

build.sbt

@@ -710,7 +710,8 @@ lazy val finagleMySQL = Project(
   id = "finagle-mysql",
   base = file("finagle-mysql")
 ).settings(
-  sharedSettings
+  sharedSettings,
+  withTwoThirteen
 ).settings(
   name := "finagle-mysql",
   libraryDependencies ++= Seq(util("logging"), util("cache"), caffeineLib, jsr305Lib),

finagle-mysql/src/main/scala/com/twitter/finagle/Mysql.scala

@@ -6,7 +6,7 @@ import com.twitter.finagle.mysql.param._
 import com.twitter.finagle.mysql.transport.Packet
 import com.twitter.finagle.param.{
   ExceptionStatsHandler => _,
-  Monitor => _,
+  Monitor => ParamMonitor,
   ResponseClassifier => _,
   Tracer => _,
   _
@@ -110,7 +110,7 @@ object Mysql extends com.twitter.finagle.Client[Request, Result] with MysqlRichC
         idleTime = Duration.Top,
         maxWaiters = Int.MaxValue
       ) +
-      param.Monitor(ServerErrorMonitor(Seq()))
+      ParamMonitor(ServerErrorMonitor(Seq()))
 
     private val stack: Stack[ServiceFactory[Request, Result]] = StackClient.newStack
       .replace(ClientTracingFilter.role, MySqlClientTracingFilter.Stackable)

finagle-mysql/src/test/java/com/twitter/finagle/mysql/RowCompilationTest.java

@@ -9,8 +9,8 @@
 
 import scala.Array;
 import scala.Option;
-import scala.collection.IndexedSeq;
-import scala.collection.JavaConversions;
+import scala.collection.JavaConverters;
+import scala.collection.immutable.IndexedSeq;
 import scala.math.BigDecimal;
 import scala.math.BigDecimal$;
 import scala.math.BigInt;
@@ -30,11 +30,11 @@ private static class RowImpl extends AbstractRow {
     }
 
     public IndexedSeq<Field> fields() {
-      return JavaConversions.asScalaBuffer(fields).toIndexedSeq();
+      return JavaConverters.asScalaBufferConverter(fields).asScala().toIndexedSeq();
     }
 
     public IndexedSeq<Value> values() {
-      return JavaConversions.asScalaBuffer(values).toIndexedSeq();
+      return JavaConverters.asScalaBufferConverter(values).asScala().toIndexedSeq();
     }
 
     public Option<Object> indexOf(String columnName) {