Skip to content

Commit b23a668

Browse files
authored
Merge pull request #712 from Comcast/topic/drop-punycode
Use idna4s for both JS and JVM
2 parents 7007128 + bf8d9b3 commit b23a668

File tree

8 files changed

+6520
-124
lines changed

8 files changed

+6520
-124
lines changed

build.sbt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,12 @@ ThisBuild / mimaBinaryIssueFilters ++= Seq(
3434
ProblemFilters.exclude[MissingTypesProblem]("com.comcast.ip4s.SourceSpecificMulticast$"),
3535
ProblemFilters.exclude[ReversedMissingMethodProblem]("com.comcast.ip4s.IpAddress.isPrivate"), // #562
3636
ProblemFilters.exclude[ReversedMissingMethodProblem]("com.comcast.ip4s.IpAddress.isLoopback"),
37-
ProblemFilters.exclude[ReversedMissingMethodProblem]("com.comcast.ip4s.IpAddress.isLinkLocal")
37+
ProblemFilters.exclude[ReversedMissingMethodProblem]("com.comcast.ip4s.IpAddress.isLinkLocal"),
38+
// Removed JS-specifc Punycode bindings
39+
ProblemFilters.exclude[MissingClassProblem]("com.comcast.ip4s.Punycode"),
40+
ProblemFilters.exclude[MissingClassProblem]("com.comcast.ip4s.Punycode$"),
41+
ProblemFilters.exclude[MissingTypesProblem]("com.comcast.ip4s.IDN$"),
42+
ProblemFilters.exclude[MissingClassProblem]("com.comcast.ip4s.IDNCompanionPlatform")
3843
)
3944

4045
lazy val root = tlCrossRootProject.aggregate(core, testKit)
@@ -84,14 +89,10 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
8489
"org.typelevel" %%% "literally" % "1.2.0",
8590
"org.typelevel" %%% "cats-core" % "2.13.0",
8691
"org.typelevel" %%% "cats-effect" % "3.7.0-RC1",
92+
"org.typelevel" %%% "idna4s-core" % "0.1.0",
8793
"org.scalacheck" %%% "scalacheck" % "1.19.0" % Test
8894
)
8995
)
90-
.nativeSettings(
91-
libraryDependencies ++= Seq(
92-
"org.typelevel" %%% "idna4s-core" % "0.1.0"
93-
)
94-
)
9596

9697
lazy val coreJVM = core.jvm.settings(
9798
doctestIgnoreRegex := Some(".*Literals.scala")
@@ -101,7 +102,6 @@ lazy val coreJS = core.js
101102
.disablePlugins(DoctestPlugin)
102103
.enablePlugins(ScalaJSBundlerPlugin)
103104
.settings(
104-
Compile / npmDependencies += "punycode" -> "2.1.1",
105105
scalaJSLinkerConfig ~= (_.withModuleKind(ModuleKind.CommonJSModule))
106106
)
107107

0 commit comments

Comments
 (0)