From e92a8c34be042146d01b8e9fe7fe802b143317ee Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Tue, 3 Dec 2024 20:29:55 +0000 Subject: [PATCH 1/3] Refresh build --- .github/workflows/ci.yml | 209 ++++++++++++++++++++++----------------- build.sbt | 3 +- project/build.properties | 2 +- project/plugins.sbt | 2 +- 4 files changed, 119 insertions(+), 97 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 62a7c5c..176be3e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,56 +15,45 @@ on: tags: [v*] env: - PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} - SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} - SONATYPE_CREDENTIAL_HOST: ${{ secrets.SONATYPE_CREDENTIAL_HOST }} - SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} - PGP_SECRET: ${{ secrets.PGP_SECRET }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + +concurrency: + group: ${{ github.workflow }} @ ${{ github.ref }} + cancel-in-progress: true + jobs: build: name: Build and Test strategy: matrix: os: [ubuntu-latest] - scala: [3.3.4, 2.12.19, 2.13.12] + scala: [3, 2.12, 2.13] java: [temurin@8] project: [rootJS, rootJVM, rootNative] runs-on: ${{ matrix.os }} + timeout-minutes: 60 steps: + - name: Install sbt + uses: sbt/setup-sbt@v1 + - name: Checkout current branch (full) - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Download Java (temurin@8) - id: download-java-temurin-8 - if: matrix.java == 'temurin@8' - uses: typelevel/download-java@v2 - with: - distribution: temurin - java-version: 8 - - name: Setup Java (temurin@8) + id: setup-java-temurin-8 if: matrix.java == 'temurin@8' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - distribution: jdkfile + distribution: temurin java-version: 8 - jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }} + cache: sbt - - name: Cache sbt - uses: actions/cache@v3 - 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: sbt update + if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' + run: sbt +update - name: Check that workflows are up to date run: sbt githubWorkflowCheck @@ -94,15 +83,15 @@ jobs: - name: Make target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/series/1.x') - run: mkdir -p specs2/js/target target .js/target minitest/jvm/target minitest/js/target utest/native/target core/native/target utest/js/target core/js/target core/jvm/target specs2/jvm/target .jvm/target .native/target scalatest/native/target utest/jvm/target scalatest/js/target scalatest/jvm/target specs2/native/target project/target + run: mkdir -p specs2/js/target minitest/jvm/target minitest/js/target utest/native/target core/native/target utest/js/target core/js/target core/jvm/target specs2/jvm/target scalatest/native/target utest/jvm/target scalatest/js/target scalatest/jvm/target specs2/native/target project/target - name: Compress target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/series/1.x') - run: tar cf targets.tar specs2/js/target target .js/target minitest/jvm/target minitest/js/target utest/native/target core/native/target utest/js/target core/js/target core/jvm/target specs2/jvm/target .jvm/target .native/target scalatest/native/target utest/jvm/target scalatest/js/target scalatest/jvm/target specs2/native/target project/target + run: tar cf targets.tar specs2/js/target minitest/jvm/target minitest/js/target utest/native/target core/native/target utest/js/target core/js/target core/jvm/target specs2/jvm/target scalatest/native/target utest/jvm/target scalatest/js/target scalatest/jvm/target specs2/native/target project/target - name: Upload target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/series/1.x') - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-${{ matrix.project }} path: targets.tar @@ -117,139 +106,173 @@ jobs: java: [temurin@8] runs-on: ${{ matrix.os }} steps: + - name: Install sbt + uses: sbt/setup-sbt@v1 + - name: Checkout current branch (full) - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Download Java (temurin@8) - id: download-java-temurin-8 - if: matrix.java == 'temurin@8' - uses: typelevel/download-java@v2 - with: - distribution: temurin - java-version: 8 - - name: Setup Java (temurin@8) + id: setup-java-temurin-8 if: matrix.java == 'temurin@8' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - distribution: jdkfile + distribution: temurin java-version: 8 - jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }} + cache: sbt - - name: Cache sbt - uses: actions/cache@v3 - 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: sbt update + if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' + run: sbt +update - - name: Download target directories (3.3.4, rootJS) - uses: actions/download-artifact@v3 + - name: Download target directories (3, rootJS) + uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.4-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJS - - name: Inflate target directories (3.3.4, rootJS) + - name: Inflate target directories (3, rootJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.3.4, rootJVM) - uses: actions/download-artifact@v3 + - name: Download target directories (3, rootJVM) + uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.4-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJVM - - name: Inflate target directories (3.3.4, rootJVM) + - name: Inflate target directories (3, rootJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.3.4, rootNative) - uses: actions/download-artifact@v3 + - name: Download target directories (3, rootNative) + uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.4-rootNative + name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootNative - - name: Inflate target directories (3.3.4, rootNative) + - name: Inflate target directories (3, rootNative) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.12.19, rootJS) - uses: actions/download-artifact@v3 + - name: Download target directories (2.12, rootJS) + uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.19-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJS - - name: Inflate target directories (2.12.19, rootJS) + - name: Inflate target directories (2.12, rootJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.12.19, rootJVM) - uses: actions/download-artifact@v3 + - name: Download target directories (2.12, rootJVM) + uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.19-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJVM - - name: Inflate target directories (2.12.19, rootJVM) + - name: Inflate target directories (2.12, rootJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.12.19, rootNative) - uses: actions/download-artifact@v3 + - name: Download target directories (2.12, rootNative) + uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.19-rootNative + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootNative - - name: Inflate target directories (2.12.19, rootNative) + - name: Inflate target directories (2.12, rootNative) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13.12, rootJS) - uses: actions/download-artifact@v3 + - name: Download target directories (2.13, rootJS) + uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.12-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJS - - name: Inflate target directories (2.13.12, rootJS) + - name: Inflate target directories (2.13, rootJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13.12, rootJVM) - uses: actions/download-artifact@v3 + - name: Download target directories (2.13, rootJVM) + uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.12-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJVM - - name: Inflate target directories (2.13.12, rootJVM) + - name: Inflate target directories (2.13, rootJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13.12, rootNative) - uses: actions/download-artifact@v3 + - name: Download target directories (2.13, rootNative) + uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.12-rootNative + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootNative - - name: Inflate target directories (2.13.12, rootNative) + - name: Inflate target directories (2.13, rootNative) run: | tar xf targets.tar rm targets.tar - name: Import signing key if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == '' - run: echo $PGP_SECRET | base64 -di | gpg --import + env: + PGP_SECRET: ${{ secrets.PGP_SECRET }} + PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} + run: echo $PGP_SECRET | base64 -d -i - | gpg --import - name: Import signing key and strip passphrase if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE != '' + env: + PGP_SECRET: ${{ secrets.PGP_SECRET }} + PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} run: | - echo "$PGP_SECRET" | base64 -di > /tmp/signing-key.gpg + echo "$PGP_SECRET" | base64 -d -i - > /tmp/signing-key.gpg echo "$PGP_PASSPHRASE" | gpg --pinentry-mode loopback --passphrase-fd 0 --import /tmp/signing-key.gpg (echo "$PGP_PASSPHRASE"; echo; echo) | gpg --command-fd 0 --pinentry-mode loopback --change-passphrase $(gpg --list-secret-keys --with-colons 2> /dev/null | grep '^sec:' | cut --delimiter ':' --fields 5 | tail -n 1) - name: Publish + env: + SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} + SONATYPE_CREDENTIAL_HOST: ${{ secrets.SONATYPE_CREDENTIAL_HOST }} run: sbt tlCiRelease + + dependency-submission: + name: Submit Dependencies + if: github.event.repository.fork == false && github.event_name != 'pull_request' + strategy: + matrix: + os: [ubuntu-latest] + java: [temurin@8] + runs-on: ${{ matrix.os }} + steps: + - name: Install sbt + uses: sbt/setup-sbt@v1 + + - name: Checkout current branch (full) + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Setup Java (temurin@8) + id: setup-java-temurin-8 + if: matrix.java == 'temurin@8' + uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: 8 + cache: sbt + + - name: sbt update + if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' + run: sbt +update + + - name: Submit Dependencies + uses: scalacenter/sbt-dependency-submission@v2 + with: + modules-ignore: rootjs_3 rootjs_2.12 rootjs_2.13 rootjvm_3 rootjvm_2.12 rootjvm_2.13 rootnative_3 rootnative_2.12 rootnative_2.13 + configs-ignore: test scala-tool scala-doc-tool test-internal diff --git a/build.sbt b/build.sbt index 5943ee2..cf8d16f 100644 --- a/build.sbt +++ b/build.sbt @@ -20,12 +20,11 @@ ThisBuild / tlBaseVersion := "1.6" ThisBuild / startYear := Some(2020) ThisBuild / developers += tlGitHubDev("djspiewak", "Daniel Spiewak") -ThisBuild / crossScalaVersions := Seq("3.3.4", "2.12.19", "2.13.12") +ThisBuild / crossScalaVersions := Seq("3.3.4", "2.12.20", "2.13.15") ThisBuild / tlVersionIntroduced := Map("3" -> "1.1.1") ThisBuild / tlCiReleaseBranches := Seq("series/1.x") -ThisBuild / tlSonatypeUseLegacyHost := false val CatsEffectVersion = "3.5.7" val ScalaTestVersion = "3.2.18" diff --git a/project/build.properties b/project/build.properties index 04267b1..e88a0d8 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.9 +sbt.version=1.10.6 diff --git a/project/plugins.sbt b/project/plugins.sbt index 0e4c587..9efa005 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.22") +addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.4") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") From dc50ba96515e5dbcb2b057438c5c8b19dd150d05 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Tue, 3 Dec 2024 20:40:55 +0000 Subject: [PATCH 2/3] Fix imports --- README.md | 4 ++-- .../scala/cats/effect/testing/minitest/TestDetSuite.scala | 2 +- .../scala/cats/effect/testing/minitest/TestNondetSuite.scala | 2 +- .../scala/cats/effect/testing/scalatest/AssertingSyntax.scala | 2 +- .../scala/cats/effect/testing/specs2/CatsEffectSpecs.scala | 2 +- .../test/scala/cats/effect/testing/utest/TestDetSuite.scala | 2 +- .../scala/cats/effect/testing/utest/TestNondetSuite.scala | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index b7c131c..980634f 100644 --- a/README.md +++ b/README.md @@ -105,7 +105,7 @@ Early versions (`0.x.y`) were published under the `com.codecommit` groupId. ```scala import scala.concurrent.duration._ import utest._ -import cats.implicits._ +import cats.syntax.all._ import cats.effect.IO import cats.effect.testing.utest.IOTestSuite @@ -138,7 +138,7 @@ non-IO tests ```scala import scala.concurrent.duration._ -import cats.implicits._ +import cats.syntax.all._ import cats.effect.IO import cats.effect.testing.minitest.IOTestSuite diff --git a/minitest/shared/src/test/scala/cats/effect/testing/minitest/TestDetSuite.scala b/minitest/shared/src/test/scala/cats/effect/testing/minitest/TestDetSuite.scala index ff862c8..d6d448a 100644 --- a/minitest/shared/src/test/scala/cats/effect/testing/minitest/TestDetSuite.scala +++ b/minitest/shared/src/test/scala/cats/effect/testing/minitest/TestDetSuite.scala @@ -18,7 +18,7 @@ package cats.effect.testing.minitest import cats.effect.IO import scala.concurrent.duration._ -import cats.implicits._ +import cats.syntax.all._ @deprecated("use TestControl instead", since = "1.5.0") object TestDetSuite extends DeterministicIOTestSuite { diff --git a/minitest/shared/src/test/scala/cats/effect/testing/minitest/TestNondetSuite.scala b/minitest/shared/src/test/scala/cats/effect/testing/minitest/TestNondetSuite.scala index eeb15e9..a8659eb 100644 --- a/minitest/shared/src/test/scala/cats/effect/testing/minitest/TestNondetSuite.scala +++ b/minitest/shared/src/test/scala/cats/effect/testing/minitest/TestNondetSuite.scala @@ -18,7 +18,7 @@ package cats.effect.testing.minitest import cats.effect.IO import scala.concurrent.duration._ -import cats.implicits._ +import cats.syntax.all._ object TestNondetSuite extends IOTestSuite { diff --git a/scalatest/shared/src/main/scala/cats/effect/testing/scalatest/AssertingSyntax.scala b/scalatest/shared/src/main/scala/cats/effect/testing/scalatest/AssertingSyntax.scala index a119864..11f3330 100644 --- a/scalatest/shared/src/main/scala/cats/effect/testing/scalatest/AssertingSyntax.scala +++ b/scalatest/shared/src/main/scala/cats/effect/testing/scalatest/AssertingSyntax.scala @@ -19,7 +19,7 @@ package cats.effect.testing.scalatest import cats.Functor import cats.effect.Sync import org.scalatest.{Assertion, Assertions, Succeeded} -import cats.implicits._ +import cats.syntax.all._ /** * Copied from FS2 diff --git a/specs2/shared/src/test/scala/cats/effect/testing/specs2/CatsEffectSpecs.scala b/specs2/shared/src/test/scala/cats/effect/testing/specs2/CatsEffectSpecs.scala index eca95b6..9218cdb 100644 --- a/specs2/shared/src/test/scala/cats/effect/testing/specs2/CatsEffectSpecs.scala +++ b/specs2/shared/src/test/scala/cats/effect/testing/specs2/CatsEffectSpecs.scala @@ -17,7 +17,7 @@ package cats.effect.testing.specs2 import cats.effect.{IO, Ref, Resource} -import cats.implicits._ +import cats.syntax.all._ import org.specs2.mutable.Specification class CatsEffectSpecs extends Specification with CatsEffect with CatsEffectSpecsPlatform { diff --git a/utest/shared/src/test/scala/cats/effect/testing/utest/TestDetSuite.scala b/utest/shared/src/test/scala/cats/effect/testing/utest/TestDetSuite.scala index 7bf2519..f9ebb14 100644 --- a/utest/shared/src/test/scala/cats/effect/testing/utest/TestDetSuite.scala +++ b/utest/shared/src/test/scala/cats/effect/testing/utest/TestDetSuite.scala @@ -16,7 +16,7 @@ package cats.effect.testing.utest -import cats.implicits._ +import cats.syntax.all._ import cats.effect.IO import scala.concurrent.duration._ import utest._ diff --git a/utest/shared/src/test/scala/cats/effect/testing/utest/TestNondetSuite.scala b/utest/shared/src/test/scala/cats/effect/testing/utest/TestNondetSuite.scala index 9d00028..a01f03e 100644 --- a/utest/shared/src/test/scala/cats/effect/testing/utest/TestNondetSuite.scala +++ b/utest/shared/src/test/scala/cats/effect/testing/utest/TestNondetSuite.scala @@ -16,7 +16,7 @@ package cats.effect.testing.utest -import cats.implicits._ +import cats.syntax.all._ import cats.effect.IO import utest.{Tests, assert, test} import scala.concurrent.duration._ From 591514deb58cdeb517f72e04dc5ed8fbf3cca816 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Tue, 3 Dec 2024 20:52:54 +0000 Subject: [PATCH 3/3] Fix unused imports --- .../test/scala/cats/effect/testing/minitest/TestDetSuite.scala | 1 - .../scala/cats/effect/testing/minitest/TestNondetSuite.scala | 1 - .../src/test/scala/cats/effect/testing/utest/TestDetSuite.scala | 1 - .../test/scala/cats/effect/testing/utest/TestNondetSuite.scala | 1 - 4 files changed, 4 deletions(-) diff --git a/minitest/shared/src/test/scala/cats/effect/testing/minitest/TestDetSuite.scala b/minitest/shared/src/test/scala/cats/effect/testing/minitest/TestDetSuite.scala index d6d448a..9d292b8 100644 --- a/minitest/shared/src/test/scala/cats/effect/testing/minitest/TestDetSuite.scala +++ b/minitest/shared/src/test/scala/cats/effect/testing/minitest/TestDetSuite.scala @@ -18,7 +18,6 @@ package cats.effect.testing.minitest import cats.effect.IO import scala.concurrent.duration._ -import cats.syntax.all._ @deprecated("use TestControl instead", since = "1.5.0") object TestDetSuite extends DeterministicIOTestSuite { diff --git a/minitest/shared/src/test/scala/cats/effect/testing/minitest/TestNondetSuite.scala b/minitest/shared/src/test/scala/cats/effect/testing/minitest/TestNondetSuite.scala index a8659eb..294ccba 100644 --- a/minitest/shared/src/test/scala/cats/effect/testing/minitest/TestNondetSuite.scala +++ b/minitest/shared/src/test/scala/cats/effect/testing/minitest/TestNondetSuite.scala @@ -18,7 +18,6 @@ package cats.effect.testing.minitest import cats.effect.IO import scala.concurrent.duration._ -import cats.syntax.all._ object TestNondetSuite extends IOTestSuite { diff --git a/utest/shared/src/test/scala/cats/effect/testing/utest/TestDetSuite.scala b/utest/shared/src/test/scala/cats/effect/testing/utest/TestDetSuite.scala index f9ebb14..f503586 100644 --- a/utest/shared/src/test/scala/cats/effect/testing/utest/TestDetSuite.scala +++ b/utest/shared/src/test/scala/cats/effect/testing/utest/TestDetSuite.scala @@ -16,7 +16,6 @@ package cats.effect.testing.utest -import cats.syntax.all._ import cats.effect.IO import scala.concurrent.duration._ import utest._ diff --git a/utest/shared/src/test/scala/cats/effect/testing/utest/TestNondetSuite.scala b/utest/shared/src/test/scala/cats/effect/testing/utest/TestNondetSuite.scala index a01f03e..5252dc5 100644 --- a/utest/shared/src/test/scala/cats/effect/testing/utest/TestNondetSuite.scala +++ b/utest/shared/src/test/scala/cats/effect/testing/utest/TestNondetSuite.scala @@ -16,7 +16,6 @@ package cats.effect.testing.utest -import cats.syntax.all._ import cats.effect.IO import utest.{Tests, assert, test} import scala.concurrent.duration._