Skip to content

Commit

Permalink
Merge branch 'main' into update/fs2-core-3.9.4
Browse files Browse the repository at this point in the history
  • Loading branch information
ChristopherDavenport authored Apr 9, 2024
2 parents e9728cb + 1d81d94 commit e132d45
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 22 deletions.
30 changes: 15 additions & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- 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: temurin
java-version: 8
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:

- name: Upload target directories
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-${{ matrix.project }}
path: targets.tar
Expand All @@ -111,7 +111,7 @@ jobs:
- 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: temurin
java-version: 8
Expand All @@ -122,7 +122,7 @@ jobs:
run: sbt +update

- name: Download target directories (2.12, rediculousJS)
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rediculousJS

Expand All @@ -132,7 +132,7 @@ jobs:
rm targets.tar
- name: Download target directories (2.12, rediculousJVM)
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rediculousJVM

Expand All @@ -142,7 +142,7 @@ jobs:
rm targets.tar
- name: Download target directories (2.12, rediculousNative)
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rediculousNative

Expand All @@ -152,7 +152,7 @@ jobs:
rm targets.tar
- name: Download target directories (2.13, rediculousJS)
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rediculousJS

Expand All @@ -162,7 +162,7 @@ jobs:
rm targets.tar
- name: Download target directories (2.13, rediculousJVM)
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rediculousJVM

Expand All @@ -172,7 +172,7 @@ jobs:
rm targets.tar
- name: Download target directories (2.13, rediculousNative)
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rediculousNative

Expand All @@ -182,7 +182,7 @@ jobs:
rm targets.tar
- name: Download target directories (3, rediculousJS)
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-3-rediculousJS

Expand All @@ -192,7 +192,7 @@ jobs:
rm targets.tar
- name: Download target directories (3, rediculousJVM)
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-3-rediculousJVM

Expand All @@ -202,7 +202,7 @@ jobs:
rm targets.tar
- name: Download target directories (3, rediculousNative)
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-3-rediculousNative

Expand Down Expand Up @@ -252,7 +252,7 @@ jobs:
- 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: temurin
java-version: 8
Expand Down Expand Up @@ -284,7 +284,7 @@ jobs:
- 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: temurin
java-version: 8
Expand All @@ -297,7 +297,7 @@ jobs:
- name: Setup Java (temurin@11)
id: setup-java-temurin-11
if: matrix.java == 'temurin@11'
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 11
Expand Down
5 changes: 3 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ ThisBuild / githubWorkflowBuildPreamble ++= nativeBrewInstallWorkflowSteps.value


val catsV = "2.10.0"
val catsEffectV = "3.5.2"
val catsEffectV = "3.5.3"
val fs2V = "3.9.4"


val munitCatsEffectV = "2.0.0-M4"

ThisBuild / crossScalaVersions := Seq("2.12.18","2.13.12", "3.3.1")
Expand All @@ -48,7 +49,7 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
"co.fs2" %%% "fs2-io" % fs2V,
"co.fs2" %%% "fs2-scodec" % fs2V,

"org.typelevel" %%% "keypool" % "0.4.8",
"org.typelevel" %%% "keypool" % "0.4.9",


"io.chrisdavenport" %%% "cats-scalacheck" % "0.3.2" % Test,
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.7
sbt.version=1.9.8
8 changes: 4 additions & 4 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.6.2")
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.6.2")
addSbtPlugin("org.typelevel" % "sbt-typelevel-settings" % "0.6.2")
addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.6.5")
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.6.5")
addSbtPlugin("org.typelevel" % "sbt-typelevel-settings" % "0.6.5")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.14.0")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.16")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")

addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.2.0-RC1")

0 comments on commit e132d45

Please sign in to comment.