Skip to content

Commit

Permalink
build: Upgrade modules to SN 0.5 when possible (#289)
Browse files Browse the repository at this point in the history
Closes #272
  • Loading branch information
Iltotore authored Feb 13, 2025
1 parent b710131 commit 8410042
Showing 1 changed file with 22 additions and 8 deletions.
30 changes: 22 additions & 8 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import scalalib._, scalalib.scalafmt._, scalalib.publish._, scalajslib._, scalan
object versions {
val scala = "3.4.3"
val scalaJS = "1.16.0"
val scalaNative = "0.4.17"
val scalaNative = "0.5.6"
}

trait BaseModule extends ScalaModule with ScalafmtModule with CiReleaseModule { outer =>
Expand Down Expand Up @@ -69,6 +69,13 @@ trait BaseModule extends ScalaModule with ScalafmtModule with CiReleaseModule {

def scalaNativeVersion = versions.scalaNative
}

trait NativeCrossModule04 extends CrossModule with ScalaNativeModule {

def segment = "native"

def scalaNativeVersion = "0.4.17"
}
}

object docs extends BaseModule {
Expand Down Expand Up @@ -179,6 +186,7 @@ object main extends BaseModule {

object js extends JSCrossModule
object native extends NativeCrossModule
object native04 extends NativeCrossModule04
}

object examples extends Module {
Expand Down Expand Up @@ -274,6 +282,12 @@ trait SubModule extends BaseModule {
def moduleDeps = Seq(main.native)
}

trait NativeCrossModule04 extends super.NativeCrossModule04 {

def transitiveIvyDeps = T { super.transitiveIvyDeps().filter(d => !(d.dep.module.name.value == "scala3-library")) }

def moduleDeps = Seq(main.native04)
}
}

object sandbox extends SubModule {
Expand All @@ -286,8 +300,8 @@ object cats extends SubModule {
def artifactName = "iron-cats"

def ivyDeps = Agg(
ivy"org.typelevel::cats-core::2.8.0",
ivy"org.typelevel::algebra::2.8.0"
ivy"org.typelevel::cats-core::2.13.0",
ivy"org.typelevel::algebra::2.13.0"
)

object test extends Tests {
Expand Down Expand Up @@ -323,7 +337,7 @@ object circe extends SubModule {
def artifactName = "iron-circe"

def ivyDeps = Agg(
ivy"io.circe::circe-core::0.14.3"
ivy"io.circe::circe-core::0.14.10"
)

object js extends JSCrossModule
Expand All @@ -348,7 +362,7 @@ object ciris extends SubModule {

object js extends JSCrossModule

object native extends NativeCrossModule
object native extends NativeCrossModule04

}

Expand Down Expand Up @@ -386,7 +400,7 @@ object jsoniter extends SubModule {

def artifactName = "iron-jsoniter"

val jsoniterVersion = "2.19.1"
val jsoniterVersion = "2.33.2"

private val jsoniterMacros = ivy"com.github.plokhotnyuk.jsoniter-scala::jsoniter-scala-macros:$jsoniterVersion"

Expand Down Expand Up @@ -439,7 +453,7 @@ object skunk extends SubModule {

object js extends JSCrossModule

object native extends NativeCrossModule
object native extends NativeCrossModule04

}

Expand Down Expand Up @@ -472,7 +486,7 @@ object decline extends SubModule {
def artifactName = "iron-decline"

def ivyDeps = Agg(
ivy"com.monovore::decline::2.4.1"
ivy"com.monovore::decline::2.5.0"
)

object test extends Tests
Expand Down

0 comments on commit 8410042

Please sign in to comment.