Prefer org.apache.kafka.clients.admin.Admin over org.apache.kafka.clients.admin.AdminClient as recommended in AdminClient documentation

build.sbt

@@ -3,9 +3,9 @@ import scala.sys.process._
 
 import scala.util.Try
 
-lazy val scala212  = "2.12.15"
+lazy val scala212  = "2.12.16"
 lazy val scala213  = "2.13.8"
-lazy val scala3    = "3.1.2"
+lazy val scala3    = "3.1.3"
 lazy val mainScala = scala213
 lazy val allScala  = Seq(scala212, scala3, mainScala)
 
@@ -95,7 +95,7 @@ lazy val kafka =
         "io.conduktor.kafka"         % "kafka-clients"           % kafkaClientsVersion,
         "com.fasterxml.jackson.core" % "jackson-databind"        % "2.13.3",
         "ch.qos.logback"             % "logback-classic"         % "1.2.11"   % Test,
-        "org.scala-lang.modules"    %% "scala-collection-compat" % "2.7.0"
+        "org.scala-lang.modules"    %% "scala-collection-compat" % "2.8.1"
       ) ++ {
         if (scalaBinaryVersion.value == "3")
           Seq(

project/build.properties

@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.7.1

src/main/scala/zio/kafka/admin/AdminClient.scala

@@ -2,7 +2,7 @@ package zio.kafka.admin
 
 import org.apache.kafka.clients.admin.ListOffsetsResult.{ ListOffsetsResultInfo => JListOffsetsResultInfo }
 import org.apache.kafka.clients.admin.{
-  AdminClient => JAdminClient,
+  Admin => JAdmin,
   AlterConsumerGroupOffsetsOptions => JAlterConsumerGroupOffsetsOptions,
   Config => JConfig,
   ConsumerGroupDescription => JConsumerGroupDescription,
@@ -228,7 +228,7 @@ object AdminClient extends Accessible[AdminClient] {
    * @param adminClient
    */
   private final class LiveAdminClient(
-    private val adminClient: JAdminClient,
+    private val adminClient: JAdmin,
     private val blocking: Blocking.Service
   ) extends AdminClient {
 
@@ -1036,20 +1036,20 @@ object AdminClient extends Accessible[AdminClient] {
   def make(settings: AdminClientSettings): ZManaged[Blocking, Throwable, AdminClient] =
     fromManagedJavaClient(javaClientFromSettings(settings))
 
-  def fromJavaClient(javaClient: JAdminClient): URIO[Blocking, AdminClient] =
+  def fromJavaClient(javaClient: JAdmin): URIO[Blocking, AdminClient] =
     ZIO.service[Blocking.Service].map { blocking =>
       new LiveAdminClient(javaClient, blocking)
     }
 
   def fromManagedJavaClient[R, E](
-    managedJavaClient: ZManaged[R, E, JAdminClient]
+    managedJavaClient: ZManaged[R, E, JAdmin]
   ): ZManaged[Blocking & R, E, AdminClient] =
     managedJavaClient.flatMap { javaClient =>
       ZManaged.fromEffect(fromJavaClient(javaClient))
     }
 
-  def javaClientFromSettings(settings: AdminClientSettings): ZManaged[Any, Throwable, JAdminClient] =
-    ZManaged.makeEffect(JAdminClient.create(settings.driverSettings.asJava))(_.close(settings.closeTimeout))
+  def javaClientFromSettings(settings: AdminClientSettings): ZManaged[Any, Throwable, JAdmin] =
+    ZManaged.makeEffect(JAdmin.create(settings.driverSettings.asJava))(_.close(settings.closeTimeout))
 
   implicit class MapOps[K1, V1](val v: Map[K1, V1]) extends AnyVal {
     def bimap[K2, V2](fk: K1 => K2, fv: V1 => V2) = v.map(kv => fk(kv._1) -> fv(kv._2))