Merge pull request #1966 from tpolecat/cleanup_import

Cleanup some imports

build.sbt

@@ -1,7 +1,7 @@
-import FreeGen2.*
+import FreeGen2._
 import sbt.dsl.LinterLevel.Ignore
 import scala.annotation.nowarn
-import scala.sys.process.*
+import scala.sys.process._
 
 // Library versions all in one place, for convenience and sanity.
 lazy val catsVersion          = "2.10.0"
@@ -206,6 +206,12 @@ lazy val free = project
         classOf[java.sql.ResultSet]
       )
     },
+    freeGen2KleisliInterpreterImportExcludes := Set[Class[_]](
+      classOf[java.util.Map[_, _]],
+      classOf[java.sql.DriverPropertyInfo],
+      classOf[java.io.Writer],
+      classOf[java.io.OutputStream]
+    )
   )
 
 

modules/free/src/main/scala/doobie/free/kleisliinterpreter.scala

@@ -16,9 +16,7 @@ import scala.concurrent.duration.FiniteDuration
 
 // Types referenced in the JDBC API
 import java.io.InputStream
-import java.io.OutputStream
 import java.io.Reader
-import java.io.Writer
 import java.lang.Class
 import java.lang.String
 import java.math.BigDecimal
@@ -30,7 +28,6 @@ import java.sql.Connection
 import java.sql.DatabaseMetaData
 import java.sql.Date
 import java.sql.Driver
-import java.sql.DriverPropertyInfo
 import java.sql.NClob
 import java.sql.ParameterMetaData
 import java.sql.PreparedStatement
@@ -53,7 +50,6 @@ import java.sql.Time
 import java.sql.Timestamp
 import java.sql.{ Array => SqlArray }
 import java.util.Calendar
-import java.util.Map
 import java.util.Properties
 import java.util.concurrent.Executor
 import java.util.logging.Logger