Skip to content

Commit

Permalink
Merge pull request #2930 from typelevel/update/scala3-library-3.1.3
Browse files Browse the repository at this point in the history
Update scala3-library, ... to 3.1.3
  • Loading branch information
mpilquist authored Jul 1, 2022
2 parents 7c33874 + 7772a0d commit 122e952
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [3.1.1, 2.12.16, 2.13.8]
scala: [3.1.3, 2.12.16, 2.13.8]
java: [temurin@17]
project: [rootJS, rootJVM]
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -153,22 +153,22 @@ jobs:
~/Library/Caches/Coursier/v1
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}

- name: Download target directories (3.1.1, rootJS)
- name: Download target directories (3.1.3, rootJS)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.1-rootJS
name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.3-rootJS

- name: Inflate target directories (3.1.1, rootJS)
- name: Inflate target directories (3.1.3, rootJS)
run: |
tar xf targets.tar
rm targets.tar
- name: Download target directories (3.1.1, rootJVM)
- name: Download target directories (3.1.3, rootJVM)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.1-rootJVM
name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.3-rootJVM

- name: Inflate target directories (3.1.1, rootJVM)
- name: Inflate target directories (3.1.3, rootJVM)
run: |
tar xf targets.tar
rm targets.tar
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ThisBuild / startYear := Some(2013)

val NewScala = "2.13.8"

ThisBuild / crossScalaVersions := Seq("3.1.1", "2.12.16", NewScala)
ThisBuild / crossScalaVersions := Seq("3.1.3", "2.12.16", NewScala)
ThisBuild / tlVersionIntroduced := Map("3" -> "3.0.3")

ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17"))
Expand Down
2 changes: 1 addition & 1 deletion io/js/src/main/scala/fs2/io/net/NetException.scala
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ private class JavaScriptUnknownHostException(host: String, cause: js.JavaScriptE
extends UnknownHostException(s"$host: ${UnknownHostException.message}", cause)
with NoStackTrace
object UnknownHostException {
private[io] def unapply(cause: js.JavaScriptException): Option[UnknownHostException] =
private[io] def unapply(cause: js.JavaScriptException): Option[ip4s.UnknownHostException] =
cause.exception match {
case error: js.Error =>
pattern.findFirstMatchIn(error.message).collect { case Regex.Groups(addr) =>
Expand Down

0 comments on commit 122e952

Please sign in to comment.