Skip to content

Commit 8855291

Browse files
committed
fix: downgrade flexmark to 0.62.2
0.64.0 requires Java 11, so we can't move that high
1 parent 1ed02dd commit 8855291

File tree

2 files changed

+16
-7
lines changed

2 files changed

+16
-7
lines changed

dist/bin/scaladoc

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,20 @@ classpathArgs () {
6161
CLASS_PATH+="$(find_lib "*tasty-core*")$PSEP"
6262
CLASS_PATH+="$(find_lib "*scala3-tasty-inspector*")$PSEP"
6363
CLASS_PATH+="$(find_lib "*flexmark-0*")$PSEP"
64-
CLASS_PATH+="$(find_lib "*flexmark-html-parser*")$PSEP"
6564
CLASS_PATH+="$(find_lib "*flexmark-ext-anchorlink*")$PSEP"
6665
CLASS_PATH+="$(find_lib "*flexmark-ext-autolink*")$PSEP"
6766
CLASS_PATH+="$(find_lib "*flexmark-ext-emoji*")$PSEP"
6867
CLASS_PATH+="$(find_lib "*flexmark-ext-gfm-strikethrough*")$PSEP"
69-
CLASS_PATH+="$(find_lib "*flexmark-ext-gfm-tables*")$PSEP"
7068
CLASS_PATH+="$(find_lib "*flexmark-ext-gfm-tasklist*")$PSEP"
7169
CLASS_PATH+="$(find_lib "*flexmark-ext-wikilink*")$PSEP"
7270
CLASS_PATH+="$(find_lib "*flexmark-ext-yaml-front-matter*")$PSEP"
71+
CLASS_PATH+="$(find_lib "*flexmark-ext-tables*")$PSEP"
72+
CLASS_PATH+="$(find_lib "*flexmark-ext-ins*")$PSEP"
73+
CLASS_PATH+="$(find_lib "*flexmark-ext-superscript*")$PSEP"
74+
CLASS_PATH+="$(find_lib "*flexmark-util-ast*")$PSEP"
75+
CLASS_PATH+="$(find_lib "*flexmark-util-data*")$PSEP"
76+
CLASS_PATH+="$(find_lib "*flexmark-util-dependency*")$PSEP"
77+
CLASS_PATH+="$(find_lib "*flexmark-util-misc*")$PSEP"
7378
CLASS_PATH+="$(find_lib "*liqp*")$PSEP"
7479
CLASS_PATH+="$(find_lib "*jsoup*")$PSEP"
7580
CLASS_PATH+="$(find_lib "*jackson-dataformat-yaml*")$PSEP"
@@ -80,7 +85,6 @@ classpathArgs () {
8085
CLASS_PATH+="$(find_lib "*jline-reader*")$PSEP"
8186
CLASS_PATH+="$(find_lib "*jline-terminal-3*")$PSEP"
8287
CLASS_PATH+="$(find_lib "*jline-terminal-jna*")$PSEP"
83-
CLASS_PATH+="$(find_lib "*flexmark-util*")$PSEP"
8488
CLASS_PATH+="$(find_lib "*flexmark-formatter*")$PSEP"
8589
CLASS_PATH+="$(find_lib "*autolink-0.6*")$PSEP"
8690
CLASS_PATH+="$(find_lib "*flexmark-jira-converter*")$PSEP"
@@ -93,9 +97,6 @@ classpathArgs () {
9397
CLASS_PATH+="$(find_lib "*protobuf-java*")$PSEP"
9498
CLASS_PATH+="$(find_lib "*util-interface*")$PSEP"
9599
CLASS_PATH+="$(find_lib "*jna-5*")$PSEP"
96-
CLASS_PATH+="$(find_lib "*flexmark-ext-tables*")$PSEP"
97-
CLASS_PATH+="$(find_lib "*flexmark-ext-ins*")$PSEP"
98-
CLASS_PATH+="$(find_lib "*flexmark-ext-superscript*")$PSEP"
99100
CLASS_PATH+="$(find_lib "*antlr4-runtime*")$PSEP"
100101

101102
jvm_cp_args="-classpath \"$CLASS_PATH\""
@@ -124,6 +125,10 @@ done
124125

125126
classpathArgs
126127

128+
echo "----------"
129+
echo $jvm_cp_args | grep tables
130+
echo "----------"
131+
127132
eval "\"$JAVACMD\"" \
128133
${JAVA_OPTS:-$default_java_opts} \
129134
"${java_args[@]}" \

project/Dependencies.scala

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,21 @@ object Dependencies {
1010
val `jackson-dataformat-yaml` =
1111
"com.fasterxml.jackson.dataformat" % "jackson-dataformat-yaml" % jacksonVersion
1212

13-
private val flexmarkVersion = "0.64.0"
13+
// Freeze on 0.62.x as 0.64.0 requires Java 11
14+
private val flexmarkVersion = "0.62.2"
1415

1516
val flexmarkDeps = Seq(
1617
"com.vladsch.flexmark" % "flexmark" % flexmarkVersion,
18+
"com.vladsch.flexmark" % "flexmark-util-ast" % flexmarkVersion,
19+
"com.vladsch.flexmark" % "flexmark-util-data" % flexmarkVersion,
1720
"com.vladsch.flexmark" % "flexmark-util-html" % flexmarkVersion,
1821
"com.vladsch.flexmark" % "flexmark-ext-anchorlink" % flexmarkVersion,
1922
"com.vladsch.flexmark" % "flexmark-ext-autolink" % flexmarkVersion,
2023
"com.vladsch.flexmark" % "flexmark-ext-emoji" % flexmarkVersion,
2124
"com.vladsch.flexmark" % "flexmark-ext-gfm-strikethrough" % flexmarkVersion,
2225
"com.vladsch.flexmark" % "flexmark-ext-gfm-tasklist" % flexmarkVersion,
2326
"com.vladsch.flexmark" % "flexmark-ext-wikilink" % flexmarkVersion,
27+
"com.vladsch.flexmark" % "flexmark-ext-tables" % flexmarkVersion,
2428
"com.vladsch.flexmark" % "flexmark-ext-yaml-front-matter" % flexmarkVersion,
2529
)
2630

0 commit comments

Comments
 (0)