Fix Freshmark compatibility with JDK 15+ (#1304 fixes #803)

diffplug · Feb 5, 2023 · 523a601 · 523a601
2 parents 1774837 + e9d72aa
commit 523a601
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 9 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -12,7 +12,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changes
 * **POTENTIALLY BREAKING** Bump bytecode from Java 8 to 11 ([#1530](https://github.com/diffplug/spotless/pull/1530) part 2 of [#1337](https://github.com/diffplug/spotless/issues/1337))
+### Fixed
 * **POTENTIALLY BREAKING** `sortByKeys` for JSON formatting now takes into account objects inside arrays ([#1546](https://github.com/diffplug/spotless/pull/1546))
+* `freshmark` fixed on java 15+ ([#1304](https://github.com/diffplug/spotless/pull/1304) fixes [#803](https://github.com/diffplug/spotless/issues/803))
 
 ## [2.34.0] - 2023-01-26
 ### Added

diff --git a/lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java b/lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,8 @@
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.NavigableMap;
 import java.util.Objects;
@@ -31,6 +33,7 @@
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
+import com.diffplug.spotless.Jvm;
 import com.diffplug.spotless.Provisioner;
 import com.diffplug.spotless.ThrowingEx.Supplier;
 
@@ -42,6 +45,10 @@ private FreshMarkStep() {}
 	private static final String DEFAULT_VERSION = "1.3.1";
 	private static final String NAME = "freshmark";
 	private static final String MAVEN_COORDINATE = "com.diffplug.freshmark:freshmark:";
+
+	private static final String NASHORN_MAVEN_COORDINATE = "org.openjdk.nashorn:nashorn-core:";
+
+	private static final String NASHORN_VERSION = "15.4";
 	private static final String FORMATTER_CLASS = "com.diffplug.freshmark.FreshMark";
 	private static final String FORMATTER_METHOD = "compile";
 
@@ -55,8 +62,16 @@ public static FormatterStep create(String version, Supplier<Map<String, ?>> prop
 		Objects.requireNonNull(version, "version");
 		Objects.requireNonNull(properties, "properties");
 		Objects.requireNonNull(provisioner, "provisioner");
+
+		List<String> mavenCoordinates = new ArrayList<>();
+		mavenCoordinates.add(MAVEN_COORDINATE + version);
+		if (Jvm.version() >= 15) {
+			mavenCoordinates.add("com.diffplug.jscriptbox:jscriptbox:3.0.1");
+			mavenCoordinates.add(NASHORN_MAVEN_COORDINATE + NASHORN_VERSION);
+		}
+
 		return FormatterStep.createLazy(NAME,
-				() -> new State(JarState.from(MAVEN_COORDINATE + version, provisioner), properties.get()),
+				() -> new State(JarState.from(mavenCoordinates, provisioner), properties.get()),
 				State::createFormat);
 	}
 

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
@@ -3,7 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
-### Changes
+### Fixed
+* `freshmark` fixed on java 15+ ([#1304](https://github.com/diffplug/spotless/pull/1304) fixes [#803](https://github.com/diffplug/spotless/issues/803))
 * **POTENTIALLY BREAKING** `sortByKeys` for JSON formatting now takes into account objects inside arrays ([#1546](https://github.com/diffplug/spotless/pull/1546))
 
 ## [6.14.0] - 2023-01-26

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
@@ -7,7 +7,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * A synthesis log with the number of considered files is added after each formatter execution ([#1507](https://github.com/diffplug/spotless/pull/1507))
 ### Fixed
 * Respect `sourceDirectory` and `testSourceDirectory` POM configurations for Java formatters ([#1553](https://github.com/diffplug/spotless/pull/1553))
-### Changes
 * **POTENTIALLY BREAKING** `sortByKeys` for JSON formatting now takes into account objects inside arrays ([#1546](https://github.com/diffplug/spotless/pull/1546))
 * Any commit of the Spotless maven plugin now available via JitPack ([#1547](https://github.com/diffplug/spotless/pull/1547))
 

diff --git a/testlib/src/test/java/com/diffplug/spotless/markdown/FreshMarkStepTest.java b/testlib/src/test/java/com/diffplug/spotless/markdown/FreshMarkStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,20 +15,16 @@
  */
 package com.diffplug.spotless.markdown;
 
-import static org.junit.jupiter.api.condition.JRE.JAVA_14;
-
 import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledForJreRange;
 
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.SerializableEqualityTester;
 import com.diffplug.spotless.StepHarness;
 import com.diffplug.spotless.TestProvisioner;
 
-@EnabledForJreRange(max = JAVA_14)
 class FreshMarkStepTest {
 	@Test
 	void behavior() throws Exception {