Skip to content

Commit ea1705e

Browse files
Merge pull request #520 from alejandrohdezma/update/all
Dependency Updates
2 parents bc24dfa + c1febea commit ea1705e

File tree

32 files changed

+4923
-4181
lines changed

32 files changed

+4923
-4181
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,13 @@ jobs:
5959
- 17
6060
steps:
6161
- name: Checkout project
62-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
62+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
6363
with:
6464
ref: ${{ github.head_ref }}
65+
repository: ${{ github.event.pull_request.head.repo.full_name }}
6566
fetch-depth: 0
6667

67-
- uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
68+
- uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
6869
with:
6970
distribution: "liberica"
7071
java-version: ${{ matrix.jdk }}

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ jobs:
2929
runs-on: ubuntu-latest
3030
steps:
3131
- name: Checkout project
32-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
32+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
3333
with:
3434
fetch-depth: 0
3535

3636
- name: Check latest tag follows semantic versioning
3737
if: github.event_name == 'push'
3838
uses: alejandrohdezma/actions/check-semver-tag@v1
3939

40-
- uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
40+
- uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
4141
with:
4242
distribution: "liberica"
4343
java-version: "11"
@@ -59,13 +59,13 @@ jobs:
5959
runs-on: ubuntu-latest
6060
steps:
6161
- name: Checkout project
62-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
62+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
6363
with:
6464
fetch-depth: 0
6565
ref: main
6666
token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
6767

68-
- uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
68+
- uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
6969
with:
7070
distribution: "liberica"
7171
java-version: "17"

build.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ThisBuild / scalaVersion := _root_.scalafix.sbt.BuildInfo.scala
22
ThisBuild / organization := "com.alejandrohdezma"
33
ThisBuild / pluginCrossBuild / sbtVersion := "1.2.8"
44
ThisBuild / Test / parallelExecution := false
5-
ThisBuild / versionPolicyIntention := Compatibility.BinaryAndSourceCompatible
5+
ThisBuild / versionPolicyIntention := Compatibility.BinaryCompatible
66

77
addCommandAlias("ci-test", "fix --check; versionPolicyCheck; mdoc; test; publishLocal; scripted")
88
addCommandAlias("ci-docs", "github; mdoc; headerCreateAll; docusaurusPublishGhpages")
@@ -24,9 +24,9 @@ lazy val website = project
2424
lazy val `sbt-github` = module
2525
.enablePlugins(SbtPlugin)
2626
.settings(scriptedLaunchOpts += s"-Dplugin.version=${version.value}")
27-
.settings(libraryDependencies += "org.typelevel" %% "jawn-parser" % "1.5.1")
28-
.settings(libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test)
29-
.settings(libraryDependencies += "org.http4s" %% "http4s-dsl" % "0.23.26" % Test)
27+
.settings(libraryDependencies += "org.typelevel" %% "jawn-parser" % "1.6.0")
28+
.settings(libraryDependencies += "org.scalameta" %% "munit" % "1.0.0" % Test)
29+
.settings(libraryDependencies += "org.http4s" %% "http4s-dsl" % "0.23.27" % Test)
3030
.settings(libraryDependencies += "org.http4s" %% "http4s-blaze-server" % "0.23.16" % Test)
3131

3232
lazy val `sbt-github-mdoc` = module
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.9.9
1+
sbt.version=1.10.1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.9.9
1+
sbt.version=1.10.1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.9.9
1+
sbt.version=1.10.1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.9.9
1+
sbt.version=1.10.1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.9.9
1+
sbt.version=1.10.1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.9.9
1+
sbt.version=1.10.1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.9.9
1+
sbt.version=1.10.1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.2")
1+
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.4")
22
addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc" % sys.props("plugin.version"))
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.9.9
1+
sbt.version=1.10.1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.2")
1+
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.4")
22
addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc" % sys.props("plugin.version"))

modules/sbt-github-mdoc/src/sbt-test/sbt-github-mdoc/simple/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ThisBuild / scmInfo := Some(
22
ScmInfo(url("http://example.com"), "scm:git:https://github.com/alejandrohdezma/sbt-github.git")
33
)
4-
ThisBuild / crossScalaVersions := Seq("2.12.19", "2.13.12", "3.3.0")
4+
ThisBuild / crossScalaVersions := Seq("2.12.19", "2.13.12", "3.3.0") // scala-steward:off
55
ThisBuild / organization := "my.org"
66
ThisBuild / githubEnabled := true
77
ThisBuild / githubAuthToken := Some(AuthToken("1234"))
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.9.9
1+
sbt.version=1.10.1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.2")
1+
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.4")
22
addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc" % sys.props("plugin.version"))

modules/sbt-github/src/main/scala/com/alejandrohdezma/sbt/github/SbtGithubPlugin.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ object SbtGithubPlugin extends AutoPlugin {
186186
private def onGithub[A](default: A)(f: Def.Initialize[A]) =
187187
Def.settingDyn(if (githubEnabled.value) f else Def.setting(default))
188188

189-
@SuppressWarnings(Array("scalafix:Disable.Option.get"))
190189
private def onRepo[A](default: A)(f: Def.Initialize[Repository => A]) =
191190
Def.settingDyn {
192191
if (githubEnabled.value) Def.setting(f.value(repository.value.get)) else Def.setting(default)

modules/sbt-github/src/main/scala/com/alejandrohdezma/sbt/github/github/Collaborators.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ final case class Collaborators(list: List[Collaborator]) {
2828
.groupBy(_.login)
2929
.values
3030
.toList
31-
.map(_.head) /* scalafix:ok */
31+
.map(_.head)
3232
.sortBy(collaborator => collaborator.name -> collaborator.login)
3333
}
3434

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.9.9
1+
sbt.version=1.10.1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.9.9
1+
sbt.version=1.10.1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.9.9
1+
sbt.version=1.10.1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.9.9
1+
sbt.version=1.10.1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.9.9
1+
sbt.version=1.10.1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.9.9
1+
sbt.version=1.10.1

modules/sbt-github/src/test/scala/com/alejandrohdezma/sbt/github/http/ClientSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class ClientSuite extends munit.FunSuite {
7272
val result = client.get[String](url)
7373

7474
interceptMessage[IOException](s"Server returned HTTP response code: 403 for URL: $url") {
75-
result.get // scalafix:ok Disable.Try.get
75+
result.get
7676
}
7777
}
7878
}

modules/sbt-github/src/test/scala/com/alejandrohdezma/sbt/github/package.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ package object github {
3737
implicit def CreatorToCollaborator(creator: Collaborator.Creator): Collaborator =
3838
creator(AuthToken("123"))(GithubEntryPoint(url"http://example.com"))(
3939
Logger.Null
40-
).get // scalafix:ok Disable.Try.get
40+
).get
4141

4242
implicit class URLInterpolator(private val sc: StringContext) extends AnyVal {
4343

@@ -48,7 +48,7 @@ package object github {
4848
implicit class RequestLinkOps(req: Request[IO]) {
4949

5050
def urlTo(path: String): String = {
51-
val host = req.headers.get[Host].get // scalafix:ok Disable.Option.get
51+
val host = req.headers.get[Host].get
5252

5353
s"http://${host.host}:${host.port.getOrElse(8080)}/$path"
5454
}

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.9.9
1+
sbt.version=1.10.1

project/dependencies.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ Compile / unmanagedSourceDirectories ++= Seq(
55
(ThisBuild / baseDirectory).value.getParentFile / "modules" / "sbt-github" / "src" / "main" / "scala"
66
)
77

8-
libraryDependencies += "org.typelevel" %% "jawn-parser" % "1.5.1"
8+
libraryDependencies += "org.typelevel" %% "jawn-parser" % "1.6.0"

project/plugins.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.0")
1+
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1")
22
addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "3.2.1")
3-
addSbtPlugin("com.alejandrohdezma" % "sbt-ci" % "2.15.0")
3+
addSbtPlugin("com.alejandrohdezma" % "sbt-ci" % "2.15.1")
44
addSbtPlugin("com.alejandrohdezma" % "sbt-fix" % "0.7.1")
55
addSbtPlugin("com.alejandrohdezma" % "sbt-modules" % "0.3.1")
66
addSbtPlugin("com.alejandrohdezma" % "sbt-scalafix-defaults" % "0.13.0")
77
addSbtPlugin("com.alejandrohdezma" % "sbt-scalafmt-defaults" % "0.9.0")
88
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
99
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
10-
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.2")
10+
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.4")
1111
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
1212
addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.1")

website/docusaurus.config.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import {themes as prismThemes} from 'prism-react-renderer';
2+
13
/** @type {import('@docusaurus/types').Config} */
24
const config = {
35
title: 'sbt-github',
@@ -70,8 +72,8 @@ const config = {
7072
],
7173
},
7274
prism: {
73-
theme: require('prism-react-renderer/themes/github'),
74-
darkTheme: require('prism-react-renderer/themes/dracula'),
75+
theme: prismThemes.github,
76+
darkTheme: prismThemes.dracula,
7577
additionalLanguages: ['java', 'scala'],
7678
},
7779
}),

website/package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@
1111
"write-heading-ids": "docusaurus write-heading-ids"
1212
},
1313
"dependencies": {
14-
"@docusaurus/core": "2.3.1",
15-
"@docusaurus/preset-classic": "2.3.1",
16-
"@mdx-js/react": "^1.6.22",
17-
"clsx": "^1.2.1",
18-
"prism-react-renderer": "^1.3.5",
19-
"react": "^17.0.2",
20-
"react-dom": "^17.0.2"
14+
"@docusaurus/core": "3.4.0",
15+
"@docusaurus/preset-classic": "3.4.0",
16+
"@mdx-js/react": "^3.0.0",
17+
"prism-react-renderer": "^2.1.0",
18+
"react": "^18.2.0",
19+
"react-dom": "^18.2.0"
2120
},
2221
"devDependencies": {
23-
"@docusaurus/module-type-aliases": "2.3.1"
22+
"@docusaurus/module-type-aliases": "3.0.0",
23+
"@docusaurus/types": "3.0.0"
2424
},
2525
"engines": {
26-
"node": ">=16.14"
26+
"node": ">=18.0"
2727
}
28-
}
28+
}

0 commit comments

Comments
 (0)