Skip to content

Commit

Permalink
Merge pull request #331 from vasilmkd/scala3-rc3
Browse files Browse the repository at this point in the history
Update to Scala 3.0.0-RC3
  • Loading branch information
rossabaker authored Apr 24, 2021
2 parents a05200d + f88ceae commit 11c1c8b
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/scala.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:

strategy:
matrix:
scala: [2.12.13, 2.13.5, 3.0.0-RC1, 3.0.0-RC2]
scala: [2.12.13, 2.13.5, 3.0.0-RC2, 3.0.0-RC3]

steps:
- uses: actions/checkout@v2
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ TAGS
.ensime_cache
.idea
_site
.bsp
4 changes: 2 additions & 2 deletions benchmark/build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name := "jawn-benchmarks"

javaOptions in run += "-Xmx6G"
run / javaOptions += "-Xmx6G"

libraryDependencies ++= Seq(
"io.argonaut" %% "argonaut" % "6.2.3",
Expand All @@ -18,4 +18,4 @@ libraryDependencies ++= Seq(
)

// enable forking in run
fork in run := true
run / fork := true
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ lazy val previousJawnVersion = "1.0.1"

lazy val scala212 = "2.12.13"
lazy val scala213 = "2.13.5"
lazy val dottyPrev = "3.0.0-RC1"
lazy val dottyNext = "3.0.0-RC2"
lazy val dottyPrev = "3.0.0-RC2"
lazy val dottyNext = "3.0.0-RC3"
ThisBuild / scalaVersion := scala212
ThisBuild / organization := "org.typelevel"
ThisBuild / licenses += ("MIT", url("http://opensource.org/licenses/MIT"))
Expand Down Expand Up @@ -38,7 +38,7 @@ lazy val jawnSettings = Seq(
},
resolvers += Resolver.sonatypeRepo("releases"),
Test / fork := true,
testOptions in Test += Tests.Argument(TestFrameworks.ScalaCheck, "-verbosity", "1"),
Test / testOptions += Tests.Argument(TestFrameworks.ScalaCheck, "-verbosity", "1"),
libraryDependencies += "org.scalacheck" %% "scalacheck" % "1.15.3" % Test,
libraryDependencies ++= (
if (isDotty.value) Nil
Expand All @@ -56,7 +56,7 @@ lazy val jawnSettings = Seq(
releaseCrossBuild := true,
releaseVcsSign := true,
publishMavenStyle := true,
publishArtifact in Test := false,
Test / publishArtifact := false,
Compile / doc / sources := {
val old = (Compile / doc / sources).value
if (isDotty.value)
Expand Down

0 comments on commit 11c1c8b

Please sign in to comment.