Skip to content

Commit

Permalink
Merge branch 'master' into update/sbt-scala-native-0.4.17
Browse files Browse the repository at this point in the history
  • Loading branch information
darkfrog26 committed Apr 17, 2024
2 parents ccd28a0 + b3c69fc commit 1c93ccb
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType}

val allScalaVersions = List("2.12.13", "2.11.12", "2.13.8", "3.1.1")
val allScalaVersions = List("2.12.19", "2.11.12", "2.13.13", "3.1.1")

name := "perfolation"
ThisBuild / organization := "com.outr"
ThisBuild / version := "1.2.9"
ThisBuild / scalaVersion := "2.13.8"
ThisBuild / scalaVersion := "2.13.13"
ThisBuild / crossScalaVersions := allScalaVersions
ThisBuild / scalacOptions ++= Seq("-unchecked", "-deprecation")

Expand All @@ -28,7 +28,7 @@ ThisBuild / developers := List(
)

// Dependency versions
val scalaTestVersion: String = "3.2.11"
val scalaTestVersion: String = "3.2.18"

lazy val root = project.in(file("."))
.aggregate(
Expand Down Expand Up @@ -67,5 +67,5 @@ lazy val benchmarks = project
libraryDependencies ++= Seq(
"pl.project13.scala" % "sbt-jmh-extras" % "0.3.7"
),
crossScalaVersions := List("2.13.8")
crossScalaVersions := List("2.13.13")
)
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.8
sbt.version=1.9.9
6 changes: 5 additions & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0")

addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.9.0")

addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")

addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")

addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.12")

addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")

addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
Expand Down

0 comments on commit 1c93ccb

Please sign in to comment.