Merge pull request #16 from nebula-contrib/update-deps

bump to scala 3.3.1 and fix classes access
nebula-contrib · Sep 16, 2023 · 15af198 · 15af198
2 parents 2c7e8b9 + be1a95b
commit 15af198
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,10 +1,11 @@
 val zioVersion          = "2.0.13"
-val scala3_Version      = "3.2.2"
+val scala3_Version      = "3.3.1"
 val scala2_13Version    = "2.13.12"
 val scala2_12Version    = "2.12.18"
-val zioConfigVersion    = "4.0.0-RC16" // 3.3.0+ not support
+val zioConfigVersion    = "4.0.0-RC16"
 val nebulaClientVersion = "3.6.0"
 val logbackVersion      = "1.4.5"
+val silencerVersion     = "1.4.2"
 
 val supportCrossVersionList = Seq(scala3_Version, scala2_13Version, scala2_12Version)
 
@@ -41,11 +42,13 @@ lazy val core = project
     name                     := "zio-nebula",
     crossScalaVersions       := supportCrossVersionList,
     libraryDependencies ++= Seq(
-      "com.vesoft"     % "client"              % nebulaClientVersion,
-      "dev.zio"       %% "zio-config-typesafe" % zioConfigVersion,
-      "dev.zio"       %% "zio-config-magnolia" % zioConfigVersion,
-      "dev.zio"       %% "zio"                 % zioVersion,
-      "ch.qos.logback" % "logback-classic"     % logbackVersion % Test
+      "com.vesoft"       % "client"              % nebulaClientVersion,
+      "dev.zio"         %% "zio-config-typesafe" % zioConfigVersion,
+      "dev.zio"         %% "zio-config-magnolia" % zioConfigVersion,
+      "dev.zio"         %% "zio"                 % zioVersion,
+      // see https://github.com/zio/zio-config/issues/1245
+      "com.github.ghik" %% "silencer-lib"        % silencerVersion % Provided cross CrossVersion.for3Use2_13,
+      "ch.qos.logback"   % "logback-classic"     % logbackVersion  % Test
     ) ++ _zioTests.map(_ % Test),
     Test / parallelExecution := false,
     testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework")

diff --git a/core/src/main/scala/zio/nebula/NebulaAuth.scala b/core/src/main/scala/zio/nebula/NebulaAuth.scala
@@ -1,3 +1,3 @@
 package zio.nebula
 
-private[nebula] final case class NebulaAuth(username: String, password: String)
+final case class NebulaAuth(username: String, password: String)
diff --git a/core/src/main/scala/zio/nebula/NebulaConfig.scala b/core/src/main/scala/zio/nebula/NebulaConfig.scala
@@ -9,7 +9,7 @@ import zio.nebula.meta.SSLParam
 import com.typesafe.config.{ Config => TConfig, ConfigFactory }
 import com.vesoft.nebula.client.graph.{ NebulaPoolConfig => PoolConfig }
 
-private[nebula] final case class NebulaConfig(
+final case class NebulaConfig(
   address: List[NebulaHostAddress],
   timeoutMills: Int,
   executionRetry: Int,
@@ -19,15 +19,15 @@ private[nebula] final case class NebulaConfig(
   selfSigned: Option[SSLParam] = None
 )
 
-private[nebula] final case class NebulaMetaConfig(
+final case class NebulaMetaConfig(
   underlying: NebulaConfig
 )
 
-private[nebula] final case class NebulaStorageConfig(
+final case class NebulaStorageConfig(
   underlying: NebulaConfig
 )
 
-private[nebula] final case class NebulaPoolConfig(
+final case class NebulaPoolConfig(
   minConnsSize: Int = 0,
   maxConnsSize: Int = 10,
   timeoutMills: Int = 0,
@@ -54,7 +54,7 @@ private[nebula] final case class NebulaPoolConfig(
   }
 }
 
-private[nebula] final case class NebulaSessionPoolConfig(
+final case class NebulaSessionPoolConfig(
   address: List[NebulaHostAddress],
   auth: NebulaAuth,
   spaceName: String,

diff --git a/core/src/main/scala/zio/nebula/NebulaHostAddress.scala b/core/src/main/scala/zio/nebula/NebulaHostAddress.scala
@@ -1,3 +1,3 @@
 package zio.nebula
 
-private[nebula] final case class NebulaHostAddress(host: String, port: Int)
+final case class NebulaHostAddress(host: String, port: Int)