Skip to content

Commit 7c2efdc

Browse files
authored
Merge pull request #218 from mkurz/latest-java-fmt
Upgrade google formatter to v1.24.0 - the last version supporting Java 11
2 parents 531e616 + eb20d5b commit 7c2efdc

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
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: 8
15+
java: 11
1616
distribution: zulu
1717
jobtype: 1
1818
- os: ubuntu-latest
19-
java: 8
19+
java: 11
2020
distribution: zulu
2121
jobtype: 2
2222
runs-on: ${{ matrix.os }}

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616
- name: Setup Scala
1717
uses: olafurpg/setup-scala@v13
1818
with:
19-
java-version: "adopt@1.8"
19+
java-version: "adopt@11"
2020
- name: Setup JDK
2121
uses: actions/setup-java@v4
2222
with:
2323
distribution: temurin
24-
java-version: 8
24+
java-version: 11
2525
cache: sbt
2626
- uses: sbt/setup-sbt@v1
2727
- name: Release

.scala-steward.conf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// really slow dependency updates, please
22
pullRequests.frequency = "90 days"
33

4-
updates.ignore = [
5-
// Releases after 1.7 require JDK 11
6-
// https://github.com/google/google-java-format/releases/tag/google-java-format-1.8
7-
{ groupId = "com.google.googlejavaformat", artifactId = "google-java-format" }
4+
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." }
88
]
99
commits.message = "bump: ${artifactName} ${nextVersion} (was ${currentVersion})"

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
lazy val scala212 = "2.12.15"
1+
lazy val scala212 = "2.12.18"
22
lazy val scala3 = "3.6.4"
33
ThisBuild / scalaVersion := scala212
44
ThisBuild / crossScalaVersions := Seq(scala212, scala3)
@@ -16,13 +16,13 @@ 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.7"),
19+
libraryDependencies ++= Seq("com.google.googlejavaformat" % "google-java-format" % "1.24.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")),
2323
(pluginCrossBuild / sbtVersion) := {
2424
scalaBinaryVersion.value match {
25-
case "2.12" => "1.5.8"
25+
case "2.12" => "1.9.0"
2626
case _ => "2.0.0-M4"
2727
}
2828
},

0 commit comments

Comments
 (0)