Skip to content

Commit

Permalink
Merge branch 'main' into update/scala3-library-3.3.4
Browse files Browse the repository at this point in the history
  • Loading branch information
mpilquist authored Oct 3, 2024
2 parents acf9e44 + 6fa3a77 commit b595b4d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ ThisBuild / developers ++= List(

ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("8"))

ThisBuild / crossScalaVersions := List("2.12.20", "2.13.14", "3.3.4")
ThisBuild / crossScalaVersions := List("2.12.20", "2.13.15", "3.3.4")

ThisBuild / tlVersionIntroduced := Map("3" -> "3.0.3")

Expand Down Expand Up @@ -55,7 +55,7 @@ lazy val testKit = crossProject(JVMPlatform, JSPlatform, NativePlatform)
)
)
.jvmSettings(
libraryDependencies += "com.google.guava" % "guava" % "33.3.0-jre" % "test"
libraryDependencies += "com.google.guava" % "guava" % "33.3.1-jre" % "test"
)
.dependsOn(core % "compile->compile")

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.10.1
sbt.version=1.10.2
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.3")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.21.1")
addSbtPlugin("com.github.tkawachi" % "sbt-doctest" % "0.10.0")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.4")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.6.1")

libraryDependencySchemes += "com.lihaoyi" %% "geny" % VersionScheme.Always

0 comments on commit b595b4d

Please sign in to comment.