Skip to content

Commit 77d868d

Browse files
Update jjwt-api, jjwt-impl, jjwt-jackson to 0.12.3 (#3186)
* Update jjwt-api, jjwt-impl, jjwt-jackson to 0.12.3 * Replace deprecated API calls --------- Co-authored-by: Frank S. Thomas <[email protected]>
1 parent 46307ca commit 77d868d

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

build.sbt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,12 +429,15 @@ lazy val runSteward = taskKey[Unit]("")
429429
runSteward := Def.taskDyn {
430430
val home = System.getenv("HOME")
431431
val projectDir = (LocalRootProject / baseDirectory).value
432+
// val ghAppDir = projectDir.getParentFile / "gh-app"
432433
val args = Seq(
433434
Seq("--workspace", s"$projectDir/workspace"),
434435
Seq("--repos-file", s"$projectDir/repos.md"),
435436
Seq("--git-author-email", s"me@$projectName.org"),
436437
Seq("--forge-login", projectName),
437438
Seq("--git-ask-pass", s"$home/.github/askpass/$projectName.sh"),
439+
// Seq("--github-app-id", IO.read(ghAppDir / "scala-steward.app-id.txt").trim),
440+
// Seq("--github-app-key-file", s"$ghAppDir/scala-steward.private-key.pem"),
438441
Seq("--whitelist", s"$home/.cache/coursier"),
439442
Seq("--whitelist", s"$home/.cache/JNA"),
440443
Seq("--whitelist", s"$home/.cache/mill"),

modules/core/src/main/scala/org/scalasteward/core/forge/github/GitHubAuthAlg.scala

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,13 @@ package org.scalasteward.core.forge.github
1919
import better.files.File
2020
import cats.effect.Sync
2121
import cats.implicits._
22-
import io.jsonwebtoken.{Jwts, SignatureAlgorithm}
23-
import org.bouncycastle.jce.provider.BouncyCastleProvider
24-
import org.bouncycastle.util.io.pem.PemReader
25-
22+
import io.jsonwebtoken.Jwts
2623
import java.io.FileReader
2724
import java.security.spec.PKCS8EncodedKeySpec
2825
import java.security.{KeyFactory, PrivateKey, Security}
2926
import java.util.Date
27+
import org.bouncycastle.jce.provider.BouncyCastleProvider
28+
import org.bouncycastle.util.io.pem.PemReader
3029
import scala.concurrent.duration.FiniteDuration
3130
import scala.util.Using
3231

@@ -72,13 +71,13 @@ object GitHubAuthAlg {
7271
val signingKey = readPrivateKey(app.keyFile)
7372
val builder = Jwts
7473
.builder()
75-
.setIssuedAt(now)
76-
.setIssuer(app.id.toString)
77-
.signWith(signingKey, SignatureAlgorithm.RS256)
74+
.issuedAt(now)
75+
.issuer(app.id.toString)
76+
.signWith(signingKey, Jwts.SIG.RS256)
7877
if (ttlMillis > 0) {
7978
val expMillis = nowMillis + ttlMillis
8079
val exp = new Date(expMillis)
81-
builder.setExpiration(exp)
80+
builder.expiration(exp)
8281
}
8382
builder.compact()
8483
}

project/Dependencies.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ object Dependencies {
3030
val http4sJdkhttpClient = "org.http4s" %% "http4s-jdk-http-client" % "1.0.0-M9"
3131
val log4catsSlf4j = "org.typelevel" %% "log4cats-slf4j" % "2.6.0"
3232
val logbackClassic = "ch.qos.logback" % "logback-classic" % "1.4.14"
33-
val jjwtApi = "io.jsonwebtoken" % "jjwt-api" % "0.11.5"
33+
val jjwtApi = "io.jsonwebtoken" % "jjwt-api" % "0.12.3"
3434
val jjwtImpl = "io.jsonwebtoken" % "jjwt-impl" % jjwtApi.revision
3535
val jjwtJackson = "io.jsonwebtoken" % "jjwt-jackson" % jjwtApi.revision
3636
val millScriptVersion = "0.11.0-M10"

0 commit comments

Comments
 (0)