Skip to content

Commit

Permalink
Merge branch 'master' into update/scala-library-2.12.18
Browse files Browse the repository at this point in the history
  • Loading branch information
darkfrog26 authored Aug 16, 2023
2 parents d892be6 + 4acc832 commit a419590
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
6 changes: 5 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType}

// Scala versions
val scala213 = "2.13.8"
val scala213 = "2.13.11"

val scala212 = "2.12.18"

val scala211 = "2.11.12"

val scala3 = List("3.1.1")

val scala2 = List(scala213, scala212, scala211)
val allScalaVersions = scala2 ::: scala3

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.6.2
sbt.version=1.9.3
8 changes: 4 additions & 4 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.3")

addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")

addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.2.0")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")

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

addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.4")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.14")

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

Expand Down

0 comments on commit a419590

Please sign in to comment.