Resolve compilation issues (#182)

lambdaworks · Apr 24, 2023 · 5b0a54c · 5b0a54c
1 parent 1146c3e
commit 5b0a54c
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 9 deletions.
diff --git a/build.sbt b/build.sbt
@@ -67,8 +67,8 @@ lazy val example =
     .settings(stdSettings("example"))
     .settings(scalacOptions += "-language:higherKinds")
     .settings(
-      crossScalaVersions -= Scala3,
-      publish / skip := true,
+      crossScalaVersions := List(Scala213),
+      publish / skip     := true,
       libraryDependencies ++= List(
         "dev.zio" %% "zio"                 % "2.0.13",
         "dev.zio" %% "zio-config"          % "3.0.7",

diff --git a/modules/library/src/main/scala-2/zio/elasticsearch/IndexNameNewtype.scala b/modules/library/src/main/scala-2/zio/elasticsearch/IndexNameNewtype.scala
@@ -42,4 +42,5 @@ trait IndexNameNewtype {
       }
     }
   }
+  type IndexName = IndexName.Type
 }
diff --git a/modules/library/src/main/scala-2/zio/elasticsearch/RoutingNewtype.scala b/modules/library/src/main/scala-2/zio/elasticsearch/RoutingNewtype.scala
@@ -23,4 +23,5 @@ trait RoutingNewtype {
   object Routing extends Newtype[String] {
     override def assertion = assert(!isEmptyString) // scalafix:ok
   }
+  type Routing = Routing.Type
 }
diff --git a/modules/library/src/main/scala-3/zio/elasticsearch/IndexNameNewtype.scala b/modules/library/src/main/scala-3/zio/elasticsearch/IndexNameNewtype.scala
@@ -26,4 +26,5 @@ trait IndexNameNewtype {
     protected inline def validateInline(inline name: String) =
       ${ IndexNameValidator.validateInlineImpl('name) }
   }
+  type IndexName = IndexName.Type
 }
diff --git a/modules/library/src/main/scala-3/zio/elasticsearch/RoutingNewtype.scala b/modules/library/src/main/scala-3/zio/elasticsearch/RoutingNewtype.scala
@@ -23,4 +23,5 @@ trait RoutingNewtype {
   object Routing extends Newtype[String] {
     override inline def assertion = !isEmptyString // scalafix:ok
   }
+  type Routing = Routing.Type
 }
diff --git a/modules/library/src/main/scala/zio/elasticsearch/package.scala b/modules/library/src/main/scala/zio/elasticsearch/package.scala
@@ -22,10 +22,6 @@ import zio.prelude.Newtype
 import zio.schema.Schema
 
 package object elasticsearch extends IndexNameNewtype with RoutingNewtype {
-  type IndexName = IndexName.Type
-
-  type Routing = Routing.Type
-
   object DocumentId extends Newtype[String]
   type DocumentId = DocumentId.Type
 

diff --git a/modules/library/src/test/scala-3/zio/elasticsearch/utils/UnsafeWrapUtil.scala b/modules/library/src/test/scala-3/zio/elasticsearch/utils/UnsafeWrapUtil.scala
@@ -3,7 +3,5 @@ package zio.elasticsearch.utils
 import zio.prelude.{Newtype, NewtypeCustom}
 
 abstract class UnsafeWrapUtil {
-  def unsafeWrap[A, T <: Newtype[A]](value: A)(newtype: T): newtype.Type = newtype.wrap(value)
-
-  def unsafeWrap[A, T <: NewtypeCustom[A]](value: A)(newtype: T): newtype.Type = newtype.wrap(value)
+  def unsafeWrap[A, T <: Newtype[A] | NewtypeCustom[A]](value: A)(newtype: T): newtype.Type = newtype.wrap(value)
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,4 +42,5 @@ trait IndexNameNewtype { @@
           }
         }
       }
+      type IndexName = IndexName.Type
     }