Skip to content

Commit 225d992

Browse files
Fix Freshmark compatibility with JDK 15+ (fixes #803)
1 parent 688e01a commit 225d992

File tree

2 files changed

+16
-6
lines changed

2 files changed

+16
-6
lines changed

lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java

+15-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
import java.io.Serializable;
2121
import java.lang.reflect.Method;
22+
import java.util.ArrayList;
23+
import java.util.List;
2224
import java.util.Map;
2325
import java.util.NavigableMap;
2426
import java.util.Objects;
@@ -31,6 +33,7 @@
3133
import com.diffplug.spotless.FormatterFunc;
3234
import com.diffplug.spotless.FormatterStep;
3335
import com.diffplug.spotless.JarState;
36+
import com.diffplug.spotless.Jvm;
3437
import com.diffplug.spotless.Provisioner;
3538
import com.diffplug.spotless.ThrowingEx.Supplier;
3639

@@ -42,6 +45,10 @@ private FreshMarkStep() {}
4245
private static final String DEFAULT_VERSION = "1.3.1";
4346
private static final String NAME = "freshmark";
4447
private static final String MAVEN_COORDINATE = "com.diffplug.freshmark:freshmark:";
48+
49+
private static final String NASHORN_MAVEN_COORDINATE = "org.openjdk.nashorn:nashorn-core:";
50+
51+
private static final String NASHORN_VERSION = "15.4";
4552
private static final String FORMATTER_CLASS = "com.diffplug.freshmark.FreshMark";
4653
private static final String FORMATTER_METHOD = "compile";
4754

@@ -55,8 +62,15 @@ public static FormatterStep create(String version, Supplier<Map<String, ?>> prop
5562
Objects.requireNonNull(version, "version");
5663
Objects.requireNonNull(properties, "properties");
5764
Objects.requireNonNull(provisioner, "provisioner");
65+
66+
List<String> mavenCoordinates = new ArrayList<>();
67+
mavenCoordinates.add(MAVEN_COORDINATE + version);
68+
if (Jvm.version() >= 15) {
69+
mavenCoordinates.add(NASHORN_MAVEN_COORDINATE + NASHORN_VERSION);
70+
}
71+
5872
return FormatterStep.createLazy(NAME,
59-
() -> new State(JarState.from(MAVEN_COORDINATE + version, provisioner), properties.get()),
73+
() -> new State(JarState.from(mavenCoordinates, provisioner), properties.get()),
6074
State::createFormat);
6175
}
6276

testlib/src/test/java/com/diffplug/spotless/markdown/FreshMarkStepTest.java

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2021 DiffPlug
2+
* Copyright 2016-2022 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -15,20 +15,16 @@
1515
*/
1616
package com.diffplug.spotless.markdown;
1717

18-
import static org.junit.jupiter.api.condition.JRE.JAVA_14;
19-
2018
import java.util.HashMap;
2119
import java.util.Map;
2220

2321
import org.junit.jupiter.api.Test;
24-
import org.junit.jupiter.api.condition.EnabledForJreRange;
2522

2623
import com.diffplug.spotless.FormatterStep;
2724
import com.diffplug.spotless.SerializableEqualityTester;
2825
import com.diffplug.spotless.StepHarness;
2926
import com.diffplug.spotless.TestProvisioner;
3027

31-
@EnabledForJreRange(max = JAVA_14)
3228
class FreshMarkStepTest {
3329
@Test
3430
void behavior() throws Exception {

0 commit comments

Comments
 (0)