diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e16c0ff..67b67fd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,9 +9,9 @@ name: Continuous Integration on: pull_request: - branches: ['**'] + branches: ['**', '!update/**', '!pr/**'] push: - branches: ['**'] + branches: ['**', '!update/**', '!pr/**'] tags: [v*] env: @@ -28,7 +28,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [3.1.0, 2.12.15, 2.13.8] + scala: [3.1.3, 2.12.16, 2.13.8] java: [temurin@8] project: [rootJS, rootJVM] runs-on: ${{ matrix.os }} @@ -147,42 +147,42 @@ jobs: ~/Library/Caches/Coursier/v1 key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - - name: Download target directories (3.1.0, rootJS) + - name: Download target directories (3.1.3, rootJS) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.0-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.3-rootJS - - name: Inflate target directories (3.1.0, rootJS) + - name: Inflate target directories (3.1.3, rootJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.1.0, rootJVM) + - name: Download target directories (3.1.3, rootJVM) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.0-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.3-rootJVM - - name: Inflate target directories (3.1.0, rootJVM) + - name: Inflate target directories (3.1.3, rootJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.12.15, rootJS) + - name: Download target directories (2.12.16, rootJS) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.15-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.16-rootJS - - name: Inflate target directories (2.12.15, rootJS) + - name: Inflate target directories (2.12.16, rootJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.12.15, rootJVM) + - name: Download target directories (2.12.16, rootJVM) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.15-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.16-rootJVM - - name: Inflate target directories (2.12.15, rootJVM) + - name: Inflate target directories (2.12.16, rootJVM) run: | tar xf targets.tar rm targets.tar diff --git a/build.sbt b/build.sbt index 86de344..bf89676 100644 --- a/build.sbt +++ b/build.sbt @@ -3,7 +3,7 @@ ThisBuild / tlBaseVersion := "2.0" ThisBuild / developers += tlGitHubDev("mpilquist", "Michael Pilquist") ThisBuild / startYear := Some(2021) -ThisBuild / crossScalaVersions := List("3.1.0", "2.12.15", "2.13.8") +ThisBuild / crossScalaVersions := List("3.1.3", "2.12.16", "2.13.8") ThisBuild / tlVersionIntroduced := Map("3" -> "1.0.2") lazy val root = tlCrossRootProject.aggregate(core, munit) @@ -16,7 +16,7 @@ lazy val core = crossProject(JSPlatform, JVMPlatform) .settings( libraryDependencies ++= List( "org.scalacheck" %%% "scalacheck" % "1.16.0", - "org.typelevel" %%% "cats-core" % "2.7.0" + "org.typelevel" %%% "cats-core" % "2.8.0" ) ) @@ -29,6 +29,6 @@ lazy val munit = crossProject(JSPlatform, JVMPlatform) .settings( libraryDependencies ++= List( "org.scalameta" %%% "munit-scalacheck" % "1.0.0-M6", - "org.typelevel" %%% "cats-effect" % "3.3.11" % Test + "org.typelevel" %%% "cats-effect" % "3.3.14" % Test ) ) diff --git a/project/build.properties b/project/build.properties index e64c208..22af262 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.8 +sbt.version=1.7.1 diff --git a/project/plugins.sbt b/project/plugins.sbt index 34b4bf8..79fddf6 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,2 +1,2 @@ -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.0") -addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.9") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.1") +addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.13")