Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mill-build/src/millbuild/settings/ScalaSettings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ object ScalaSettings {
implicit val rw: upickle.default.ReadWriter[ScalaSettings] = upickle.default.macroRW

val defaultScala213Version = "2.13.16"
val defaultScala3xVersion = "3.3.3"
val defaultScala3xVersion = "3.3.4"
val defaultCrossScalaVersions: List[String] =
if (devMode) List(defaultScala3xVersion) else List(defaultScala3xVersion)
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,18 @@ package org.finos.morphir.datamodel
import scala.deriving.*
import org.finos.morphir.datamodel.CustomDeriver

class AliasedCustomDeriver[A](da: CustomDeriver[A], alias: String) extends CustomDeriver[A] {
override def derive(value: A): Data =
Data.Aliased(da.derive(value), this.concept)

override def concept: Concept.Alias = {
val (pname, _, _) = DeriverMacros.summonNamespaceOrFail
Concept.Alias(pname % alias, da.concept)
}
}

extension [A](da: CustomDeriver[A])
inline def aliasedAs(alias: String) =
new CustomDeriver[A] {
override def derive(value: A): Data =
Data.Aliased(da.derive(value), this.concept)
override def concept: Concept.Alias = {
val (pname, _, _) = DeriverMacros.summonNamespaceOrFail
Concept.Alias(pname % alias, da.concept)
}
}
inline def aliasedAs(alias: String) = new AliasedCustomDeriver[A](da, alias)

extension (r: Data.Record.type) {
inline def withImplicitFQN(name: String, fieldsRaw: (String, Data)*): Data.Record = {
Expand Down
2 changes: 1 addition & 1 deletion project/deps.sc
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ object ScalaVersions {
import DevMode._
val all = if (devMode) Seq(scala3x) else Seq(scala213, scala3x)
def scala213 = "2.13.16"
def scala3x = "3.3.3"
def scala3x = "3.3.4"

def scalaJSVersion = "1.16.0"
def scalaNativeVersion = "0.4.17"
Expand Down