Skip to content

Commit

Permalink
Merge pull request #245 from vasilmkd/newscala
Browse files Browse the repository at this point in the history
Scala 3.1.0 and `discipline-core` 1.3.0
  • Loading branch information
vasilmkd authored Oct 22, 2021
2 parents 697628e + 90fd3b7 commit ebe4fe6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [3.0.2, 2.12.15, 2.13.6]
scala: [3.1.0, 2.12.15, 2.13.6]
java: [adoptium@8]
runs-on: ${{ matrix.os }}
steps:
Expand Down
13 changes: 3 additions & 10 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ThisBuild / developers := List(

val Scala213 = "2.13.6"

ThisBuild / crossScalaVersions := Seq("3.0.2", "2.12.15", Scala213)
ThisBuild / crossScalaVersions := Seq("3.1.0", "2.12.15", Scala213)

ThisBuild / githubWorkflowJavaVersions := Seq("adoptium@8")
ThisBuild / githubWorkflowEnv += ("JABBA_INDEX" -> "https://github.com/typelevel/jdk-index/raw/main/index.json")
Expand Down Expand Up @@ -59,7 +59,7 @@ ThisBuild / githubWorkflowBuild := Seq(
WorkflowStep.Sbt(List("docs/makeMicrosite"), cond = Some(MicrositesCond))
)

val disciplineV = "1.2.0"
val disciplineV = "1.3.0"
val specs2V = "4.13.0"
val macrotaskExecutorV = "1.0.0"

Expand All @@ -71,14 +71,7 @@ lazy val core = crossProject(JSPlatform, JVMPlatform)
.in(file("core"))
.settings(
name := "discipline-specs2",
libraryDependencies += "org.typelevel" %%% "discipline-core" % disciplineV,
Compile / doc / sources := {
val old = (Compile / doc / sources).value
if (isDotty.value)
Seq()
else
old
}
libraryDependencies += "org.typelevel" %%% "discipline-core" % disciplineV
)
.jvmSettings(
libraryDependencies += {
Expand Down

0 comments on commit ebe4fe6

Please sign in to comment.