From 056dbc907d7aa65879e848c64e16a15eb9fe4e4a Mon Sep 17 00:00:00 2001
From: Jacob Wang <jatcwang@gmail.com>
Date: Tue, 19 Dec 2023 10:40:53 +0000
Subject: [PATCH] Cleanup some imports

---
 build.sbt                                              | 10 ++++++++--
 .../main/scala/doobie/free/kleisliinterpreter.scala    |  4 ----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/build.sbt b/build.sbt
index d4b37b6eb..8abb795e3 100644
--- a/build.sbt
+++ b/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]
+    )
   )
 
 
diff --git a/modules/free/src/main/scala/doobie/free/kleisliinterpreter.scala b/modules/free/src/main/scala/doobie/free/kleisliinterpreter.scala
index 1b27fa968..890f037a9 100644
--- a/modules/free/src/main/scala/doobie/free/kleisliinterpreter.scala
+++ b/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