Skip to content

Commit 0fe6259

Browse files
authored
Merge branch 'master' into update/sbt-converter-1.0.0-beta44
2 parents 22992a8 + 6717cdf commit 0fe6259

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

.github/workflows/scala-project-template.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ name: Update Scala project template
1111
jobs:
1212
update-scala-project-template:
1313
permissions:
14-
# for aws-actions/configure-aws-credentials to assume an AWS role
15-
id-token: write
1614
# for peter-evans/create-pull-request to create branch
1715
contents: write
1816
# for peter-evans/create-pull-request to create a PR
@@ -23,6 +21,7 @@ jobs:
2321
- run: git fetch https://github.com/Atry/scala-project-template.git template
2422
- run: git reset --hard FETCH_HEAD
2523
- uses: peter-evans/create-pull-request@v5
24+
continue-on-error: true
2625
with:
2726
delete-branch: true
2827
base: ${{github.ref_name}}

.github/workflows/scala.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ jobs:
2121
with:
2222
java-version: "11"
2323
distribution: temurin
24+
- uses: sbt/setup-sbt@v1
2425
- id: nodenv
2526
uses: nodenv/actions/node-version@v2
2627
- uses: actions/setup-node@v1

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
runner.dialect = scala212source3
2-
version = "3.7.17"
2+
version = "3.8.3"
33
maxColumn = 80
44
xmlLiterals.assumeFormatted = true

project/build.properties

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

project/plugins.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
addSbtPlugin("com.vmunier" % "sbt-web-scalajs" % "1.2.0")
1+
addSbtPlugin("com.vmunier" % "sbt-web-scalajs" % "1.3.0")
22

3-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2")
3+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")
44

55
libraryDependencies += "org.scala-js" %% "scalajs-env-nodejs" % "1.4.0"
66

@@ -14,6 +14,6 @@ addSbtPlugin("io.spray" % "sbt-revolver" % "0.10.0")
1414

1515
addSbtPlugin("com.thoughtworks.sbt-scala-js-map" % "sbt-scala-js-map" % "4.1.1")
1616

17-
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
17+
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1")
1818

1919
ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-java8-compat" % VersionScheme.Always

project/sbt-best-practice.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
addSbtPlugin(
2-
"com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "8.3.0"
2+
"com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "8.3.1"
33
)

0 commit comments

Comments
 (0)