Skip to content

Commit

Permalink
Upgrade Scala to 3.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
aeons committed May 17, 2021
1 parent 276c26d commit 55cc1f2
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 17 deletions.
18 changes: 4 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,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 @@ -119,22 +119,12 @@ jobs:
tar xf targets.tar
rm targets.tar
- name: Download target directories (3.0.0-RC2)
- name: Download target directories (3.0.0)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-3.0.0-RC2-${{ matrix.java }}
name: target-${{ matrix.os }}-3.0.0-${{ matrix.java }}

- name: Inflate target directories (3.0.0-RC2)
run: |
tar xf targets.tar
rm targets.tar
- name: Download target directories (3.0.0-RC3)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-3.0.0-RC3-${{ matrix.java }}

- name: Inflate target directories (3.0.0-RC3)
- name: Inflate target directories (3.0.0)
run: |
tar xf targets.tar
rm targets.tar
Expand Down
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import de.heikoseeberger.sbtheader.{LicenseDetection, LicenseStyle}
ThisBuild / organization := "org.http4s"
ThisBuild / organizationName := "Typelevel"

ThisBuild / crossScalaVersions := Seq("2.12.13", "2.13.5", "3.0.0-RC2", "3.0.0-RC3")
ThisBuild / crossScalaVersions := Seq("2.12.13", "2.13.5", "3.0.0")
ThisBuild / scalaVersion := crossScalaVersions.value.filter(_.startsWith("2.")).last
ThisBuild / baseVersion := "1.1"
ThisBuild / publishGithubUser := "rossabaker"
Expand All @@ -12,7 +12,7 @@ ThisBuild / githubWorkflowTargetBranches := List("*", "series/*")
ThisBuild / githubWorkflowPublishTargetBranches := Seq(RefPredicate.StartsWith(Ref.Tag("v")))

val JawnVersion = "1.1.2"
val Fs2Version = "2.5.5"
val Fs2Version = "2.5.6"
val Specs2Version = "4.11.0"

enablePlugins(SonatypeCiReleasePlugin)
Expand All @@ -22,7 +22,7 @@ libraryDependencies ++= Seq(
"co.fs2" %% "fs2-core" % Fs2Version,
"org.typelevel" %% "jawn-ast" % JawnVersion % Test,
"co.fs2" %% "fs2-io" % Fs2Version % Test,
"org.specs2" %% "specs2-core" % Specs2Version % Test withDottyCompat scalaVersion.value,
"org.specs2" %% "specs2-core" % Specs2Version % Test cross CrossVersion.for3Use2_13,
)

versionIntroduced := Map(
Expand Down
3 changes: 3 additions & 0 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
addSbtPlugin("com.codecommit" % "sbt-spiewak-sonatype" % "0.20.4")

// Temporary workaround
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.5")

0 comments on commit 55cc1f2

Please sign in to comment.