diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 87720d5..a614dae 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,11 +12,11 @@ jobs: matrix: include: - os: ubuntu-latest - java: 11 + java: 17 distribution: zulu jobtype: 1 - os: ubuntu-latest - java: 11 + java: 17 distribution: zulu jobtype: 2 runs-on: ${{ matrix.os }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 365bab0..42bef01 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 diff --git a/.scala-steward.conf b/.scala-steward.conf index 847e1bf..c649e1f 100644 --- a/.scala-steward.conf +++ b/.scala-steward.conf @@ -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})" diff --git a/build.sbt b/build.sbt index ba8d7a1..c4f0c5e 100644 --- a/build.sbt +++ b/build.sbt @@ -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) @@ -16,13 +16,13 @@ lazy val plugin = project ScmInfo(url("https://github.com/sbt/sbt-java-formatter"), "scm:git:git@github.com:sbt/sbt-java-formatter.git")), developers := List( Developer("ktoso", "Konrad 'ktoso' Malawski", "", 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" } },