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

support scala 3 build for util-security #302

Closed
wants to merge 2 commits into from
Closed

support scala 3 build for util-security #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e0e10f
support scala 3 build for util-security
pjfanning Jun 22, 2022
5fbbe9e
Merge branch 'twitter:develop' into util-security-scala3
pjfanning Jul 15, 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
5 changes: 2 additions & 3 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,14 +603,13 @@ lazy val utilSecurity = Project(
id = "util-security",
base = file("util-security")
).settings(
sharedSettings
sharedScala3EnabledSettings
).settings(
name := "util-security",
libraryDependencies ++= Seq(
scalacheckLib,
"org.scalatestplus" %% "scalacheck-1-14" % "3.1.2.0" % "test",
snakeyaml
)
) ++ scalatestScalacheckVersionedDep(scalaVersion.value)
).dependsOn(utilCore, utilLogging, utilSecurityTestCerts % "test")

lazy val utilSecurityTestCerts = Project(
Expand Down
2 changes: 1 addition & 1 deletion util-security/src/main/scala/com/twitter/util/security/X509CertificateDeserializer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import java.security.cert.{CertificateFactory, X509Certificate}
*/
object X509CertificateDeserializer {
private[this] val MessageType: String = "CERTIFICATE"
private[this] val deserializeX509: Array[Byte] => X509Certificate = { certBytes: Array[Byte] =>
private[this] val deserializeX509: Array[Byte] => X509Certificate = { (certBytes: Array[Byte]) =>
val certFactory = CertificateFactory.getInstance("X.509")
val certificate = certFactory
.generateCertificate(new ByteArrayInputStream(certBytes))
Expand Down