Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies for Scala Native 0.5.x #545

Merged
merged 1 commit into from
Jun 7, 2024
Merged
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
25 changes: 17 additions & 8 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,15 @@ val versions = new {
// Which version should be used in IntelliJ
val ideScala = scala3
val idePlatform = VirtualAxis.jvm

// Dependencies
val cats = "2.12.0"
val kindProjector = "0.13.3"
val munit = "1.0.0"
val scalaCollectionCompat = "2.12.0"
val scalaJavaCompat = "1.0.2"
val scalaJavaTime = "2.6.0"
val scalapbRuntime = scalapb.compiler.Version.scalapbVersion
}

// Common settings:
Expand Down Expand Up @@ -204,15 +213,15 @@ val settings = Seq(

val dependencies = Seq(
libraryDependencies ++= Seq(
"org.scala-lang.modules" %%% "scala-collection-compat" % "2.11.0",
"org.scalameta" %%% "munit" % "1.0.0" % Test
"org.scala-lang.modules" %%% "scala-collection-compat" % versions.scalaCollectionCompat,
"org.scalameta" %%% "munit" % versions.munit % Test
),
libraryDependencies ++= {
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, _)) =>
Seq(
"org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided,
compilerPlugin("org.typelevel" % "kind-projector" % "0.13.3" cross CrossVersion.full)
compilerPlugin("org.typelevel" % "kind-projector" % versions.kindProjector cross CrossVersion.full)
)
case _ => Seq.empty
}
Expand Down Expand Up @@ -438,8 +447,8 @@ lazy val chimneyCats = projectMatrix
.settings(dependencies *)
.settings(
Compile / console / initialCommands := "import io.scalaland.chimney.*, io.scalaland.chimney.dsl.*, io.scalaland.chimney.cats.*",
libraryDependencies += "org.typelevel" %%% "cats-core" % "2.10.0",
libraryDependencies += "org.typelevel" %%% "cats-laws" % "2.10.0" % Test
libraryDependencies += "org.typelevel" %%% "cats-core" % versions.cats,
libraryDependencies += "org.typelevel" %%% "cats-laws" % versions.cats % Test
)
.dependsOn(chimney % s"$Test->$Test;$Compile->$Compile")

Expand All @@ -459,7 +468,7 @@ lazy val chimneyJavaCollections = projectMatrix
.settings(
Compile / console / initialCommands := "import io.scalaland.chimney.*, io.scalaland.chimney.dsl.*, io.scalaland.chimney.javacollections.*",
// Scala 2.12 doesn't have scala.jdk.StreamConverters and we use it in test of java.util.stream type class instances
libraryDependencies += "org.scala-lang.modules" %%% "scala-java8-compat" % "1.0.2" % Test
libraryDependencies += "org.scala-lang.modules" %%% "scala-java8-compat" % versions.scalaJavaCompat % Test
)
.dependsOn(chimney % s"$Test->$Test;$Compile->$Compile")

Expand All @@ -471,7 +480,7 @@ lazy val chimneyProtobufs = projectMatrix
.Settings(
// Scala.js and Scala Native decided to not implement java.time and let an external library do it,
// meanwhile we want to provide some type class instances for types in java.time.
libraryDependencies += "io.github.cquiroz" %%% "scala-java-time" % "2.5.0"
libraryDependencies += "io.github.cquiroz" %%% "scala-java-time" % versions.scalaJavaTime
)) *
)
.enablePlugins(GitVersioning, GitBranchPrompt)
Expand Down Expand Up @@ -501,7 +510,7 @@ lazy val chimneyProtobufs = projectMatrix
Compile / PB.targets := Seq(scalapb.gen() -> (Compile / sourceManaged).value / "scalapb"),
Test / PB.protoSources += PB.externalSourcePath.value,
Test / PB.targets := Seq(scalapb.gen() -> (Test / sourceManaged).value / "scalapb"),
libraryDependencies += "com.thesamet.scalapb" %%% "scalapb-runtime" % scalapb.compiler.Version.scalapbVersion % ProtobufConfig
libraryDependencies += "com.thesamet.scalapb" %% "scalapb-runtime" % versions.scalapbRuntime % ProtobufConfig
)
.dependsOn(chimney % s"$Test->$Test;$Compile->$Compile")

Expand Down
1 change: 1 addition & 0 deletions docs/docs/quickstart.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ The newest stable versions on each platform are:
[![Chimney JVM versions](https://index.scala-lang.org/scalalandio/chimney/chimney/latest-by-scala-version.svg?platform=jvm)](https://search.maven.org/artifact/io.scalaland/chimney_2.13) <br>
[![Chimney Scala.js 1.x versions](https://index.scala-lang.org/scalalandio/chimney/chimney/latest-by-scala-version.svg?platform=sjs1)](https://search.maven.org/artifact/io.scalaland/chimney_sjs1_2.13) <br>
[![Chimney Scala.js 0.6 versions](https://index.scala-lang.org/scalalandio/chimney/chimney/latest-by-scala-version.svg?platform=sjs0.6)](https://search.maven.org/artifact/io.scalaland/chimney_sjs0.6_2.13) <br>
[![Chimney Scala Native 0.5 versions](https://index.scala-lang.org/scalalandio/chimney/chimney/latest-by-scala-version.svg?platform=native0.5)](https://search.maven.org/artifact/io.scalaland/chimney_native0.5_2.13) <br>
[![Chimney Scala Native 0.4 versions](https://index.scala-lang.org/scalalandio/chimney/chimney/latest-by-scala-version.svg?platform=native0.4)](https://search.maven.org/artifact/io.scalaland/chimney_native0.4_2.13) <br>
[![Chimney Scala Native 0.3 versions](https://index.scala-lang.org/scalalandio/chimney/chimney/latest-by-scala-version.svg?platform=native0.3)](https://search.maven.org/artifact/io.scalaland/chimney_native0.3_2.11) <br>

Expand Down
6 changes: 3 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.12")
addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.10.0")
addSbtPlugin("com.indoorvivants" % "sbt-commandmatrix" % "0.0.5")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.3")
// publishing
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.10.0")
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
Expand All @@ -19,8 +19,8 @@ addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
addSbtPlugin("org.jetbrains" % "sbt-ide-settings" % "1.1.0")
// testing protobufs
addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.7")
libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.11.15"
//
libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.11.17"
// documentation
addSbtPlugin("com.github.reibitto" % "sbt-welcome" % "0.4.0")

ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
Loading