Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update scala-library, scala-reflect to 2.13.10 #433

Merged
merged 8 commits into from
Nov 11, 2022
Merged

Update scala-library, scala-reflect to 2.13.10 #433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f933942
Update scala-library, scala-reflect to 2.13.10
scala-steward Oct 25, 2022
0abadac
Regenerate GitHub Actions workflow
scala-steward Oct 25, 2022
eb995e1
Revert commit(s) 0abadac, f933942
scala-steward Nov 4, 2022
23d8270
Merge branch 'main' into update/scala-library-2.13.10
scala-steward Nov 4, 2022
32487de
Update scala-library, scala-reflect to 2.13.10
scala-steward Nov 4, 2022
a4e38d2
Regenerate GitHub Actions workflow
scala-steward Nov 4, 2022
835f036
Merge branch 'main' into update/scala-library-2.13.10
mpilquist Nov 11, 2022
5e4ad7a
Remove some unnecessary nowarn annotations
mpilquist Nov 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.12.17, 2.13.8, 3.2.1]
scala: [2.12.17, 2.13.10, 3.2.1]
java: [temurin@8]
project: [rootJS, rootJVM, rootNative]
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -181,32 +181,32 @@ jobs:
tar xf targets.tar
rm targets.tar

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

- name: Inflate target directories (2.13.8, rootJS)
- name: Inflate target directories (2.13.10, rootJS)
run: |
tar xf targets.tar
rm targets.tar

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

- name: Inflate target directories (2.13.8, rootJVM)
- name: Inflate target directories (2.13.10, rootJVM)
run: |
tar xf targets.tar
rm targets.tar

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

- name: Inflate target directories (2.13.8, rootNative)
- name: Inflate target directories (2.13.10, rootNative)
run: |
tar xf targets.tar
rm targets.tar
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ThisBuild / developers ++= List(

ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("8"))

ThisBuild / crossScalaVersions := List("2.12.17", "2.13.8", "3.2.1")
ThisBuild / crossScalaVersions := List("2.12.17", "2.13.10", "3.2.1")

ThisBuild / tlVersionIntroduced := Map("3" -> "3.0.3")

Expand Down
3 changes: 0 additions & 3 deletions js/src/main/scala/com/comcast/ip4s/DnsPlatform.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ package com.comcast.ip4s
import cats.effect.kernel.Async
import cats.syntax.all._

import scala.annotation.nowarn
import scala.scalajs.js
import scala.scalajs.js.|
import scala.scalajs.js.annotation.JSImport
Expand Down Expand Up @@ -88,10 +87,8 @@ private[ip4s] trait DnsCompanionPlatform {
@JSImport("dns", "promises")
private[ip4s] object dnsPromises extends js.Any {

@nowarn
def lookup(hostname: String, options: LookupOptions): js.Promise[LookupResult | js.Array[LookupResult]] = js.native

@nowarn
def reverse(ip: String): js.Promise[js.Array[String]] = js.native
}

Expand Down
3 changes: 0 additions & 3 deletions js/src/main/scala/com/comcast/ip4s/IDNCompanionPlatform.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package com.comcast.ip4s

import scala.annotation.nowarn
import scalajs._
import scala.scalajs.js.annotation._
import scala.util.Try
Expand All @@ -32,9 +31,7 @@ private[ip4s] trait IDNCompanionPlatform {
@js.native
@JSImport("punycode", JSImport.Default)
private[ip4s] object Punycode extends js.Any {
@nowarn
def toASCII(value: String): String = js.native

@nowarn
def toUnicode(value: String): String = js.native
}