Skip to content

Commit

Permalink
util-security: support scala 3 build for util-security
Browse files Browse the repository at this point in the history
Problem/Solution
Upgrade util-security to scala 3

Signed-off-by: Jing Yan <jyan@twitter.com>

JIRA Issues: CSL-12128

Differential Revision: https://phabricator.twitter.biz/D935481
  • Loading branch information
pjfanning authored and jenkins committed Jul 26, 2022
1 parent 8d06d68 commit 47b7acd
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
5 changes: 2 additions & 3 deletions build.sbt
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
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ package com.twitter.util.security
import com.twitter.util.Try

import java.io.ByteArrayInputStream
import java.security.cert.{CertificateFactory, X509Certificate}
import java.security.cert.CertificateFactory
import java.security.cert.X509Certificate

/**
* A helper object to deserialize PEM-encoded X.509 Certificates.
Expand All @@ -15,7 +16,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

0 comments on commit 47b7acd

Please sign in to comment.