Skip to content

Update palantir-java-format for Java 21 #12

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.

Sign up for GitHub

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

Closed
Goooler wants to merge 4 commits into from
Closed

Update palantir-java-format for Java 21 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9c3ef9d
Bump palantir-java-format to 2.38.0
slachiewicz Sep 29, 2023
437d7f1
Add Java 21 to CI
slachiewicz Sep 29, 2023
073a762
Declare TARGET_JVM_ENVIRONMENT_ATTRIBUTE attr for resolving Guava
Goooler Nov 27, 2023
e50c795
Special case for Java 21
Goooler Nov 28, 2023
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
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ jobs:
- kind: maven
jre: 11
os: windows-latest
- kind: maven
jre: 21
os: ubuntu-latest
- kind: gradle
jre: 17
os: windows-latest
Expand Down
4 changes: 4 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ This document is intended for Spotless developers.
We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).

## [Unreleased]
###
* Bump palantir-java-format to 2.38.0 ([#1822](https://github.com/diffplug/spotless/pull/1822))
### Added
* Add Java 21 to CI ([#1822](https://github.com/diffplug/spotless/pull/1822))

## [2.43.0] - 2023-11-27
### Added
Expand Down
2 changes: 1 addition & 1 deletion lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ private PalantirJavaFormatStep() {}
private static final String DEFAULT_STYLE = "PALANTIR";
private static final String NAME = "palantir-java-format";
private static final String MAVEN_COORDINATE = "com.palantir.javaformat:palantir-java-format:";
private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "1.1.0").add(11, "2.28.0");
private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "1.1.0").add(11, "2.28.0").add(21, "2.38.0");

/** Creates a step which formats everything - code, import order, and unused imports. */
public static FormatterStep create(Provisioner provisioner) {
Expand Down
6 changes: 6 additions & 0 deletions plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@
import org.gradle.api.artifacts.dsl.DependencyHandler;
import org.gradle.api.attributes.Bundling;
import org.gradle.api.attributes.Category;
import org.gradle.api.attributes.java.TargetJvmEnvironment;
import org.gradle.api.initialization.dsl.ScriptHandler;
import org.gradle.util.GradleVersion;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -124,6 +126,10 @@ private static Provisioner forConfigurationContainer(Project project, Configurat
config.attributes(attr -> {
attr.attribute(Category.CATEGORY_ATTRIBUTE, project.getObjects().named(Category.class, Category.LIBRARY));
attr.attribute(Bundling.BUNDLING_ATTRIBUTE, project.getObjects().named(Bundling.class, Bundling.EXTERNAL));
// TARGET_JVM_ENVIRONMENT_ATTRIBUTE has been added in Gradle 7.0
if (GradleVersion.current().compareTo(GradleVersion.version(SpotlessPlugin.VER_GRADLE_7)) >= 0) {
attr.attribute(TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE, project.getObjects().named(TargetJvmEnvironment.class, TargetJvmEnvironment.STANDARD_JVM));
}
});
return config.resolve();
} catch (Exception e) {
Expand Down
1 change: 1 addition & 0 deletions plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
public class SpotlessPlugin implements Plugin<Project> {
static final String SPOTLESS_MODERN = "spotlessModern";
static final String VER_GRADLE_min = "6.1.1";
static final String VER_GRADLE_7 = "7.0";
static final String VER_GRADLE_javaPluginExtension = "7.1";
private static final int MINIMUM_JRE = 11;

Expand Down
6 changes: 6 additions & 0 deletions testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@
import org.gradle.api.artifacts.dsl.RepositoryHandler;
import org.gradle.api.attributes.Bundling;
import org.gradle.api.attributes.Category;
import org.gradle.api.attributes.java.TargetJvmEnvironment;
import org.gradle.testfixtures.ProjectBuilder;
import org.gradle.util.GradleVersion;

import com.diffplug.common.base.Errors;
import com.diffplug.common.base.StandardSystemProperty;
Expand Down Expand Up @@ -73,6 +75,10 @@ private static Provisioner createWithRepositories(Consumer<RepositoryHandler> re
config.attributes(attr -> {
attr.attribute(Category.CATEGORY_ATTRIBUTE, project.getObjects().named(Category.class, Category.LIBRARY));
attr.attribute(Bundling.BUNDLING_ATTRIBUTE, project.getObjects().named(Bundling.class, Bundling.EXTERNAL));
// TARGET_JVM_ENVIRONMENT_ATTRIBUTE has been added in Gradle 7.0
if (GradleVersion.current().compareTo(GradleVersion.version("7.0")) >= 0) {
attr.attribute(TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE, project.getObjects().named(TargetJvmEnvironment.class, TargetJvmEnvironment.STANDARD_JVM));
}
});
try {
return config.resolve();
Expand Down