Skip to content

Commit

Permalink
Merge pull request #211 from aeons/scala-3-series-0.3
Browse files Browse the repository at this point in the history
Upgrade Scala to 3.0.0 on series/0.3
  • Loading branch information
rossabaker authored May 17, 2021
2 parents 8ac8089 + d4723f8 commit 84b488d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .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: [2.12.13, 2.13.5, 3.0.0-RC2, 3.0.0-RC3]
scala: [2.12.13, 2.13.5, 3.0.0]
java: [[email protected]]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [3.0.0-RC3]
scala: [3.0.0]
java: [[email protected]]
runs-on: ${{ matrix.os }}
steps:
Expand Down
16 changes: 8 additions & 8 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType}

val Scala213 = "2.13.5"

ThisBuild / crossScalaVersions := Seq("2.12.13", Scala213, "3.0.0-RC2", "3.0.0-RC3")
ThisBuild / crossScalaVersions := Seq("2.12.13", Scala213, "3.0.0")
ThisBuild / scalaVersion := crossScalaVersions.value.last

ThisBuild / githubWorkflowArtifactUpload := false
Expand Down Expand Up @@ -81,10 +81,10 @@ lazy val contributors = Seq(
"ChristopherDavenport" -> "Christopher Davenport"
)

val catsV = "2.6.0"
val catsEffectV = "2.5.0"
val catsV = "2.6.1"
val catsEffectV = "2.5.1"

val munitCatsEffectV = "1.0.2"
val munitCatsEffectV = "1.0.3"

val kindProjectorV = "0.11.3"
val betterMonadicForV = "0.3.1"
Expand All @@ -95,9 +95,9 @@ lazy val commonSettings = Seq(

testFrameworks += new TestFramework("munit.Framework"),

scalacOptions in (Compile, doc) ++= Seq(
Compile / doc / scalacOptions ++= Seq(
"-groups",
"-sourcepath", (baseDirectory in LocalRootProject).value.getAbsolutePath,
"-sourcepath", (LocalRootProject / baseDirectory).value.getAbsolutePath,
"-doc-source-url", "https://github.com/typelevel/keypool/blob/v" + version.value + "€{FILE_PATH}.scala"
),
libraryDependencies ++= {
Expand Down Expand Up @@ -128,7 +128,7 @@ lazy val commonSettings = Seq(

lazy val releaseSettings = {
Seq(
publishArtifact in Test := false,
Test / publishArtifact := false,
scmInfo := Some(
ScmInfo(
url("https://github.com/typelevel/keypool"),
Expand Down Expand Up @@ -249,7 +249,7 @@ lazy val micrositeSettings = {
}

lazy val skipOnPublishSettings = Seq(
skip in publish := true,
publish / skip := true,
publish := (()),
publishLocal := (()),
publishArtifact := false,
Expand Down

0 comments on commit 84b488d

Please sign in to comment.