Skip to content
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

full support for JDK21 via scalameta 4.8.13 #1810

Merged
merged 1 commit into from
Nov 10, 2023
Merged
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
fail-fast: false
matrix:
os: ["ubuntu"]
jvm: ["8", "11", "17", "20"]
jvm: ["8", "11", "17", "21"]
include:
- os: windows
jvm: 17
Expand Down
12 changes: 4 additions & 8 deletions docs/users/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,13 @@ id: installation
title: Installation
---

## Requirements
## Support

**macOS, Linux or Windows**: Scalafix runs on macOS, Linux and Windows. Every
pull request is tested on both Linux and Windows.
**macOS, Linux or Windows**

**Java 8 or Java 11.**
**Java LTS (8, 11, 17 or 21)**

**Scala 2.12 and 2.13**

**Scala 3.x**: Scala 3 support is experimental and many built-in rules are not
supported.
**Scala 2.12, 2.13 or 3.x** (all rules are not available for Scala 3.x)

## sbt

Expand Down
14 changes: 11 additions & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,19 @@ object Dependencies {
val scala3 = sys.props.getOrElse("scala3.nightly", "3.3.1")

val buildScalaVersions = Seq(scala212, scala213, scala3)
val buildWithTargetVersions: Seq[(String, String)] =
buildScalaVersions.map(sv => (sv, sv)) ++
val buildWithTargetVersions: Seq[(String, String)] = {
val all = buildScalaVersions.map(sv => (sv, sv)) ++
Seq(scala213, scala212).flatMap(sv => previousVersions(sv).map(prev => (sv, prev))) ++
Seq(scala213, scala212).map(sv => (sv, scala3))

all.filter {
case (_, v) if System.getProperty("java.version") == "21" =>
!Seq("2.12.16", "2.12.17", "2.13.10").contains(v)
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

support for JDK21 was introduced in 2.12.18 and 2.13.11

case _ =>
true
}
}

val bijectionCoreV = "0.9.7"
val collectionCompatV = "2.11.0"
val coursierV = "2.1.7"
Expand All @@ -28,7 +36,7 @@ object Dependencies {
val metaconfigV = "0.12.0"
val nailgunV = "0.9.1"
val scalaXmlV = "2.2.0"
val scalametaV = "4.8.12"
val scalametaV = "4.8.13"
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

val scalatestV = "3.2.17"
val munitV = "0.7.29"

Expand Down