Skip to content

Commit 96b5304

Browse files
committed
Upgrade google formatter to v1.26.0 - Requires Java 17
1 parent 866b724 commit 96b5304

File tree

4 files changed

+4
-7
lines changed

4 files changed

+4
-7
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ jobs:
1212
matrix:
1313
include:
1414
- os: ubuntu-latest
15-
java: 11
15+
java: 17
1616
distribution: zulu
1717
jobtype: 1
1818
- os: ubuntu-latest
19-
java: 11
19+
java: 17
2020
distribution: zulu
2121
jobtype: 2
2222
runs-on: ${{ matrix.os }}

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
uses: actions/setup-java@v4
1818
with:
1919
distribution: temurin
20-
java-version: 11
20+
java-version: 17
2121
cache: sbt
2222
- uses: sbt/setup-sbt@v1
2323
- name: Release

.scala-steward.conf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,5 @@
22
pullRequests.frequency = "90 days"
33

44
updates.pin = [
5-
// Releases after 1.24.x require JDK 17
6-
// https://github.com/google/google-java-format/releases/tag/v1.25.0
7-
{ groupId = "com.google.googlejavaformat", artifactId = "google-java-format", version = "1.24." }
85
]
96
commits.message = "bump: ${artifactName} ${nextVersion} (was ${currentVersion})"

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ lazy val plugin = project
1616
ScmInfo(url("https://github.com/sbt/sbt-java-formatter"), "scm:git:[email protected]:sbt/sbt-java-formatter.git")),
1717
developers := List(
1818
Developer("ktoso", "Konrad 'ktoso' Malawski", "<[email protected]>", url("https://github.com/ktoso"))),
19-
libraryDependencies ++= Seq("com.google.googlejavaformat" % "google-java-format" % "1.24.0"),
19+
libraryDependencies ++= Seq("com.google.googlejavaformat" % "google-java-format" % "1.26.0"),
2020
startYear := Some(2015),
2121
description := "Formats Java code in your project.",
2222
licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0.html")),

0 commit comments

Comments
 (0)