From 988f3b52b8fd93bc3cab33de0a1ce56cd37b669e Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 13 Jan 2022 13:12:32 +0100 Subject: [PATCH 1/7] Update scala-reflect to 2.13.8 in series/1.x --- .github/workflows/ci.yml | 6 +++--- build.sbt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 61865b82..e841b8c9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.7, 2.12.15, 3.0.2] + scala: [2.13.8, 2.12.15, 3.0.2] java: [temurin@8, temurin@11] runs-on: ${{ matrix.os }} steps: @@ -86,7 +86,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.7] + scala: [2.13.8] java: [temurin@8] runs-on: ${{ matrix.os }} steps: @@ -178,7 +178,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.7, 2.12.15] + scala: [2.13.8, 2.12.15] java: [temurin@11] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index defb5919..6b5819d2 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ import sbtghactions.UseRef -val Scala213 = "2.13.7" +val Scala213 = "2.13.8" val Scala212 = "2.12.15" val Scala3 = "3.0.2" From 2ab816ade05d9d6cf27e7453c7164373ee10b3f4 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 13 Jan 2022 13:13:06 +0100 Subject: [PATCH 2/7] Regenerate workflow with sbt-github-actions --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e841b8c9..7b77526d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -121,12 +121,12 @@ jobs: ~/Library/Caches/Coursier/v1 key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - - name: Download target directories (2.13.7) + - name: Download target directories (2.13.8) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-2.13.7-${{ matrix.java }} + name: target-${{ matrix.os }}-2.13.8-${{ matrix.java }} - - name: Inflate target directories (2.13.7) + - name: Inflate target directories (2.13.8) run: | tar xf targets.tar rm targets.tar From 01fadda6ddcab726e1a814ea7fe4b73e1418ed39 Mon Sep 17 00:00:00 2001 From: "Ross A. Baker" Date: Thu, 13 Jan 2022 22:26:09 -0500 Subject: [PATCH 3/7] Add header check to workflow --- .github/workflows/ci.yml | 43 ++++++++++++++++++++++++++++++++++++++++ build.sbt | 8 ++++++++ 2 files changed, 51 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7b77526d..53ebc04b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -216,6 +216,49 @@ jobs: - name: Scalafmt run: sbt ++${{ matrix.scala }} scalafmtCheckAll + headers: + name: Headers + strategy: + matrix: + os: [ubuntu-latest] + scala: [2.13.8, 2.12.15, 3.0.2] + java: [temurin@11] + runs-on: ${{ matrix.os }} + steps: + - name: Checkout current branch (full) + uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Setup Java (temurin@8) + if: matrix.java == 'temurin@8' + uses: actions/setup-java@v2 + with: + distribution: temurin + java-version: 8 + + - name: Setup Java (temurin@11) + if: matrix.java == 'temurin@11' + uses: actions/setup-java@v2 + with: + distribution: temurin + java-version: 11 + + - name: Cache sbt + uses: actions/cache@v2 + with: + path: | + ~/.sbt + ~/.ivy2/cache + ~/.coursier/cache/v1 + ~/.cache/coursier/v1 + ~/AppData/Local/Coursier/Cache/v1 + ~/Library/Caches/Coursier/v1 + key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} + + - name: Headers + run: sbt ++${{ matrix.scala }} headerCheckAll + microsite: name: Microsite strategy: diff --git a/build.sbt b/build.sbt index 6b5819d2..e0efb711 100644 --- a/build.sbt +++ b/build.sbt @@ -50,6 +50,14 @@ ThisBuild / githubWorkflowAddedJobs ++= Seq( // Awaiting release of https://github.com/scalameta/scalafmt/pull/2324/files scalas = crossScalaVersions.value.toList.filter(_.startsWith("2.")) ), + WorkflowJob( + "headers", + "Headers", + githubWorkflowJobSetup.value.toList ::: List( + WorkflowStep.Sbt(List("headerCheckAll"), name = Some("Headers")) + ), + scalas = crossScalaVersions.value.toList + ), WorkflowJob( "microsite", "Microsite", From 0afd24b41c4094fb6caf25b0a38e93d8d1ac5ffd Mon Sep 17 00:00:00 2001 From: "Ross A. Baker" Date: Thu, 13 Jan 2022 22:27:25 -0500 Subject: [PATCH 4/7] Fix header for syntax package --- .../src/main/scala/org/typelevel/log4cats/syntax/package.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/shared/src/main/scala/org/typelevel/log4cats/syntax/package.scala b/core/shared/src/main/scala/org/typelevel/log4cats/syntax/package.scala index 4b2746f6..f3b507bb 100644 --- a/core/shared/src/main/scala/org/typelevel/log4cats/syntax/package.scala +++ b/core/shared/src/main/scala/org/typelevel/log4cats/syntax/package.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Christopher Davenport + * Copyright 2018 Typelevel * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. From 3ab664b97928d4ccbcbd80f5bf78171a0c7fe241 Mon Sep 17 00:00:00 2001 From: "Ross A. Baker" Date: Thu, 13 Jan 2022 22:29:01 -0500 Subject: [PATCH 5/7] Update baseVersion --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index e0efb711..f0e7be46 100644 --- a/build.sbt +++ b/build.sbt @@ -8,7 +8,7 @@ enablePlugins(SonatypeCiReleasePlugin) ThisBuild / organization := "org.typelevel" ThisBuild / organizationName := "Typelevel" -ThisBuild / baseVersion := "1.3" +ThisBuild / baseVersion := "1.5" ThisBuild / crossScalaVersions := Seq(Scala213, Scala212, Scala3) ThisBuild / scalaVersion := Scala213 ThisBuild / publishFullName := "Christopher Davenport" From f9f9a26516a01c0b4095b68195783276c8966b60 Mon Sep 17 00:00:00 2001 From: "Ross A. Baker" Date: Thu, 13 Jan 2022 22:37:08 -0500 Subject: [PATCH 6/7] Add MiMa exclusion for cursed tag --- build.sbt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index f0e7be46..c03fceae 100644 --- a/build.sbt +++ b/build.sbt @@ -163,7 +163,10 @@ lazy val commonSettings = Seq( libraryDependencies ++= Seq( "org.typelevel" %%% "munit-cats-effect-2" % munitCatsEffectV % Test ), - testFrameworks += new TestFramework("munit.Framework") + testFrameworks += new TestFramework("munit.Framework"), + mimaPreviousArtifacts ~= { xs => + xs.filterNot(_.revision == "1.5.0") // cursed tag + } ) lazy val releaseSettings = { From c66068612ede4fd151307dfc688381bd2900bdcf Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 14 Jan 2022 08:34:44 +0100 Subject: [PATCH 7/7] Update slf4j-api to 1.7.33 in series/1.x --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 6b5819d2..de460fa4 100644 --- a/build.sbt +++ b/build.sbt @@ -74,7 +74,7 @@ ThisBuild / githubWorkflowPublish := Seq( val catsV = "2.7.0" val catsEffectV = "2.5.4" -val slf4jV = "1.7.32" +val slf4jV = "1.7.33" val munitCatsEffectV = "1.0.7" val logbackClassicV = "1.2.10"