Skip to content

Commit 6b69017

Browse files
authored
Merge branch 'master' into update/scala3-library-3.0.2
2 parents cb85423 + e196482 commit 6b69017

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import com.softwaremill.Publish.ossPublishSettings
33

44
val scala211 = "2.11.12"
55
val scala212 = "2.12.12"
6-
val scala213 = "2.13.2"
6+
val scala213 = "2.13.8"
77
val scala30 = "3.0.2"
88

99
val commonSettings = commonSmlBuildSettings ++ ossPublishSettings ++ List(

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.6.2
1+
sbt.version=1.7.1

project/plugins.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.9.0")
22
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.9.0")
3-
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.3")
3+
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.7")
44

55
val sbtSoftwareMillVersion = "2.0.9"
66
addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-common" % sbtSoftwareMillVersion)
77
addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-publish" % sbtSoftwareMillVersion)
88

9-
addSbtPlugin("org.jetbrains" % "sbt-ide-settings" % "1.1.0")
9+
addSbtPlugin("org.jetbrains" % "sbt-ide-settings" % "1.1.0")

0 commit comments

Comments
 (0)