Skip to content

Commit 38e8a37

Browse files
authored
Merge pull request #69 from Philippus/add-jdk-17
Make project compatible with java 14 and up
2 parents 1ee61be + 112752a commit 38e8a37

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

.github/workflows/scala.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
matrix:
1616
scala-version: [2.13.8]
17-
java-version: [8, 11]
17+
java-version: [8, 11, 17]
1818
steps:
1919
- uses: actions/checkout@v2
2020
- uses: actions/setup-java@v2

src/main/scala/nl/gn0s1s/pureconfig/module/javanet/package.scala

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ package object javanet {
4343
}
4444

4545
implicit val inetSocketAddressConfigConvert: ConfigConvert[InetSocketAddress] =
46-
ConfigConvert.viaNonEmptyString(s => parseHostAndPort(s), _.toString)
46+
ConfigConvert.viaNonEmptyString(s => parseHostAndPort(s), address => s"${address.getHostString}:${address.getPort}")
4747

4848
implicit val inetSocketAddressListConfigConvert: ConfigConvert[Seq[InetSocketAddress]] =
4949
ConfigConvert.viaNonEmptyString(
@@ -55,6 +55,8 @@ package object javanet {
5555
case _ =>
5656
Left(CannotConvert(s, "Seq[InetSocketAddress]", "Cannot parse string into hosts and ports"))
5757
},
58-
_.mkString(",")
58+
_.map { address =>
59+
s"${address.getHostString}:${address.getPort}"
60+
}.mkString(",")
5961
)
6062
}

0 commit comments

Comments
 (0)