Skip to content

Commit

Permalink
Updates to include Scala Native 0.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ekrich committed Apr 16, 2024
1 parent f2f1621 commit 7facbc2
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 12 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ project/plugins/project/

.idea

# vscode
/.vscode/

# ENSIME specific
.ensime_cache/
.ensime
Expand Down
14 changes: 7 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ lazy val V = new {
def munit = "1.0.0-M10"
def scalacheck = "1.17.0"
}
val scala212 = "2.12.15"
val scala213 = "2.13.8"
val scala3 = "3.3.1"
val scala212 = "2.12.19"
val scala213 = "2.13.13"
val scala3 = "3.3.3"
val ScalaVersions = List(scala213, scala212, scala3)
inThisBuild(
List(
Expand Down Expand Up @@ -101,7 +101,7 @@ lazy val pprint = crossProject(JVMPlatform, JSPlatform, NativePlatform)
sharedSettings,
mimaSettings,
moduleName := "metaconfig-pprint",
libraryDependencies += "com.lihaoyi" %%% "fansi" % "0.4.0",
libraryDependencies += "com.lihaoyi" %%% "fansi" % "0.5.0",
libraryDependencies ++= {
if (scalaVersion.value.startsWith("2."))
List(
Expand All @@ -120,7 +120,7 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
moduleName := "metaconfig-core",
libraryDependencies ++= List(
"org.typelevel" %%% "paiges-core" % "0.4.3",
"org.scala-lang.modules" %%% "scala-collection-compat" % "2.11.0"
"org.scala-lang.modules" %%% "scala-collection-compat" % "2.12.0"
)
)
.settings(
Expand Down Expand Up @@ -160,12 +160,12 @@ lazy val sconfig = crossProject(JVMPlatform, JSPlatform, NativePlatform)
moduleName := "metaconfig-sconfig",
description := "Integration for HOCON using ekrich/sconfig.",
libraryDependencies ++= List(
"org.ekrich" %%% "sconfig" % "1.5.1"
"org.ekrich" %%% "sconfig" % "1.7.0"
)
)
.platformsSettings(JSPlatform, NativePlatform)(
libraryDependencies ++= List(
"org.ekrich" %%% "sjavatime" % "1.1.9"
"org.ekrich" %%% "sjavatime" % "1.3.0"
)
)
.dependsOn(core)
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.6
sbt.version=1.9.9
8 changes: 4 additions & 4 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.1")
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.0")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.30")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.15")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.0")

0 comments on commit 7facbc2

Please sign in to comment.