Skip to content

Commit

Permalink
Merge pull request #188 from ekrich/topic/native050
Browse files Browse the repository at this point in the history
Updates for Scala Native 0.5.1
  • Loading branch information
tgodzik authored Jun 18, 2024
2 parents b18038f + e89ed59 commit 7c78b86
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 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 @@ -3,8 +3,8 @@ import sbtcrossproject.CrossPlugin.autoImport.crossProject
import com.typesafe.tools.mima.core._

lazy val V = new {
def munit = "1.0.0-M10"
def scalacheck = "1.17.0"
def munit = "1.0.0"
def scalacheck = "1.18.0"
}
val scala212 = "2.12.19"

Expand Down Expand Up @@ -104,7 +104,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 @@ -122,8 +122,8 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
mimaSettings,
moduleName := "metaconfig-core",
libraryDependencies ++= List(
"org.typelevel" %%% "paiges-core" % "0.4.3",
"org.scala-lang.modules" %%% "scala-collection-compat" % "2.11.0"
"org.typelevel" %%% "paiges-core" % "0.4.4",
"org.scala-lang.modules" %%% "scala-collection-compat" % "2.12.0"
)
)
.settings(
Expand Down Expand Up @@ -163,12 +163,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/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ 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.17")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.3")

0 comments on commit 7c78b86

Please sign in to comment.