Skip to content

Upgrade google formatter to v1.26.0 - Requires Java 17 #223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ jobs:
matrix:
include:
- os: ubuntu-latest
java: 11
java: 17
distribution: zulu

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about using temurin or liberica? 😄

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just it's strange to use different distributions for build and release workflows 🤔

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, not sure why zulu was used by Eugene. I remember there was a problem with temurin 8 not being available for the newer ubuntu image or something, or was it for the arm image. Whatever, we can use temurin.

jobtype: 1
- os: ubuntu-latest
java: 11
java: 17
distribution: zulu
jobtype: 2
runs-on: ${{ matrix.os }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 11
java-version: 17
cache: sbt
- uses: sbt/setup-sbt@v1
- name: Release
Expand Down
3 changes: 0 additions & 3 deletions .scala-steward.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,5 @@
pullRequests.frequency = "90 days"

updates.pin = [
// Releases after 1.24.x require JDK 17
// https://github.com/google/google-java-format/releases/tag/v1.25.0
{ groupId = "com.google.googlejavaformat", artifactId = "google-java-format", version = "1.24." }
]
commits.message = "bump: ${artifactName} ${nextVersion} (was ${currentVersion})"
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
lazy val scala212 = "2.12.18"
lazy val scala212 = "2.12.20"
lazy val scala3 = "3.6.4"
ThisBuild / scalaVersion := scala212
ThisBuild / crossScalaVersions := Seq(scala212, scala3)
Expand All @@ -16,13 +16,13 @@ lazy val plugin = project
ScmInfo(url("https://github.com/sbt/sbt-java-formatter"), "scm:git:[email protected]:sbt/sbt-java-formatter.git")),
developers := List(
Developer("ktoso", "Konrad 'ktoso' Malawski", "<[email protected]>", url("https://github.com/ktoso"))),
libraryDependencies ++= Seq("com.google.googlejavaformat" % "google-java-format" % "1.24.0"),
libraryDependencies ++= Seq("com.google.googlejavaformat" % "google-java-format" % "1.26.0"),
startYear := Some(2015),
description := "Formats Java code in your project.",
licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0.html")),
(pluginCrossBuild / sbtVersion) := {
scalaBinaryVersion.value match {
case "2.12" => "1.9.0"
case "2.12" => "1.10.11"
case _ => "2.0.0-M4"
}
},
Expand Down
Loading