Skip to content

Commit

Permalink
Merge pull request #418 from lorandszakacs/prepare_release_1.2.2
Browse files Browse the repository at this point in the history
Prepare release 1.2.2
  • Loading branch information
lorandszakacs authored Apr 2, 2021
2 parents d0622f7 + 18d1639 commit 94a85ed
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 11 deletions.
14 changes: 7 additions & 7 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-RC1]
scala: [2.13.5, 2.12.13, 3.0.0-RC1, 3.0.0-RC2]
java: [[email protected], [email protected]]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -123,22 +123,22 @@ jobs:
tar xf targets.tar
rm targets.tar
- name: Download target directories (3.0.0-RC2)
- name: Download target directories (3.0.0-RC1)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-3.0.0-RC2-${{ matrix.java }}
name: target-${{ matrix.os }}-3.0.0-RC1-${{ matrix.java }}

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

- name: Inflate target directories (3.0.0-RC1)
- name: Inflate target directories (3.0.0-RC2)
run: |
tar xf targets.tar
rm targets.tar
Expand Down
23 changes: 21 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,27 @@
This file summarizes **notable** changes for each release, but does not describe internal changes unless they are particularly exciting.

----

# <a name="1.2.0-RC2"></a>New and Noteworthy for Version 1.2.0-RC1
# <a name="1.2.2"></a>New and Noteworthy for Version 1.2.2
- cats-effect-2.4.1
- cats 2.5.0
- add Scala 3.0.0-RC2 build
- drop Scala 3.0.0-M3 build

# <a name="1.2.1"></a>New and Noteworthy for Version 1.2.1
- cats-effect-2.4.0

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

- add LogLevel.fromString method #343 thanks to @Daenyth
- add NoOpLogger.apply constructor #344 thanks to @bplommer
- add StructuredLogger.withModifiedContextmethod #361 thanks to @ivan-klass
- add Scala 3.0.0-RC1 build
- drop Scala 3.0.0-M2 build
- cats-2.4.2
- cats-effect-2.3.3
- scalajs-1.5.0

# <a name="1.2.0-RC1"></a>New and Noteworthy for Version 1.2.0-RC1

- Now published under `org.typelevel`
- Root package changed to `org.typelevel.log4cats`
Expand Down
3 changes: 2 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ enablePlugins(SonatypeCiReleasePlugin)

ThisBuild / organization := "org.typelevel"
ThisBuild / baseVersion := "1.2"
ThisBuild / crossScalaVersions := Seq(Scala213, Scala212, "3.0.0-RC2", "3.0.0-RC1")
ThisBuild / crossScalaVersions := Seq(Scala213, Scala212, "3.0.0-RC1", "3.0.0-RC2")
ThisBuild / scalaVersion := Scala213
ThisBuild / publishFullName := "Christopher Davenport"
ThisBuild / publishGithubUser := "christopherdavenport"
Expand All @@ -22,6 +22,7 @@ ThisBuild / versionIntroduced := Map(
"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"
)

val MicrositesCond = s"matrix.scala == '$Scala212'"
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.0")
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.5.1")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.19")
addSbtPlugin("com.codecommit" % "sbt-spiewak-sonatype" % "0.20.3")
addSbtPlugin("com.codecommit" % "sbt-spiewak-sonatype" % "0.20.4")

0 comments on commit 94a85ed

Please sign in to comment.