Skip to content

Commit

Permalink
Merge pull request #447 from lorandszakacs/series-2.x-scala-3
Browse files Browse the repository at this point in the history
Scala 3.0.0 support for series 2.x
  • Loading branch information
lorandszakacs authored May 17, 2021
2 parents 2b1aa23 + c5dcab3 commit a32ab58
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 24 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.13.5, 2.12.13, 3.0.0-RC2, 3.0.0-RC3]
scala: [2.13.5, 2.12.13, 3.0.0]
java: [adopt@1.8, adopt@1.11]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -123,22 +123,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
17 changes: 15 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,17 @@ This file summarizes **notable** changes for each release, but does not describe
----
# <a name="unreleased"></a>New and Noteworthy Unreleased changes

# <a name="2.1.1"></a>New and Noteworthy for Version 2.1.1

- cats 2.6.1
- cats-effect 3.1.1
- add Scala 3.0.0 build
- drop Scala 3.0.0-RC2, 3.0.0-RC3 builds

# <a name="2.1.0"></a>New and Noteworthy for Version 2.1.0

- cats 2.6.0
- cats-effect 2.5.0
- cats-effect 3.1.0
- add Scala 3.0.0-RC3 build
- drop Scala 3.0.0-RC1 build
- Add fluent combinators for adding context to structured loggers #425 (thanks to @nigredo-tori)
Expand Down Expand Up @@ -46,7 +53,13 @@ Forward ports from `1.2.0`:
# <a name="2.0.0-M1"></a>New and Noteworthy for Version 2.0.0-M1

- Depends on cats-effect-3.0.0-M5
# <a name="unreleased"></a>New and Noteworthy Unreleased changes

# <a name="1.3.1"></a>New and Noteworthy for Version 1.3.1

- cats 2.6.1
- cats-effect 2.5.1
- add Scala 3.0.0 build
- drop Scala 3.0.0-RC3, 3.0.0-RC2 builds

# <a name="1.3.0"></a>New and Noteworthy for Version 1.3.0

Expand Down
14 changes: 6 additions & 8 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ import sbtghactions.UseRef

val Scala213 = "2.13.5"
val Scala212 = "2.12.13"
val Scala3 = "3.0.0"

enablePlugins(SonatypeCiReleasePlugin)

ThisBuild / organization := "org.typelevel"
ThisBuild / baseVersion := "2.1"
ThisBuild / crossScalaVersions := Seq(Scala213, Scala212, "3.0.0-RC2", "3.0.0-RC3")
ThisBuild / crossScalaVersions := Seq(Scala213, Scala212, Scala3)
ThisBuild / scalaVersion := Scala213
ThisBuild / publishFullName := "Christopher Davenport"
ThisBuild / publishGithubUser := "christopherdavenport"
Expand All @@ -17,10 +18,7 @@ ThisBuild / githubWorkflowJavaVersions := Seq("adopt@1.8", "adopt@1.11")
ThisBuild / versionIntroduced := Map(
"2.12" -> "1.2.0",
"2.13" -> "1.2.0",
"3.0.0-M3" -> "1.2.0",
"3.0.0-RC1" -> "1.2.0",
"3.0.0-RC2" -> "1.2.2",
"3.0.0-RC3" -> "1.3.0"
"3.0.0" -> "1.3.1",
)

val MicrositesCond = s"matrix.scala == '$Scala212'"
Expand Down Expand Up @@ -73,10 +71,10 @@ ThisBuild / githubWorkflowPublish := Seq(
cond = Some(MicrositesCond)
)

val catsV = "2.6.0"
val catsEffectV = "3.1.0"
val catsV = "2.6.1"
val catsEffectV = "3.1.1"
val slf4jV = "1.7.30"
val munitCatsEffectV = "1.0.2"
val munitCatsEffectV = "1.0.3"
val logbackClassicV = "1.2.3"

Global / onChangedBuildSource := ReloadOnSourceChanges
Expand Down
2 changes: 2 additions & 0 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.2")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.21")
addSbtPlugin("com.codecommit" % "sbt-spiewak-sonatype" % "0.20.4")
// temporary until sbt-spiewak-sonatype upgrades. This unlocks Scala 3.0.0 release at the cost of some deprecation warnings in sbt!
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.5")

0 comments on commit a32ab58

Please sign in to comment.