Skip to content

Commit 2031857

Browse files
Fix remaining JNA classpath entries in dist/bin/scaladoc* scripts (#22471)
2 parents 3231b5b + db021c6 commit 2031857

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

dist/bin/scaladoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@ classpathArgs () {
9595
CLASS_PATH+="$(find_lib "*compiler-interface*")$PSEP"
9696
CLASS_PATH+="$(find_lib "*jline-reader*")$PSEP"
9797
CLASS_PATH+="$(find_lib "*jline-terminal-3*")$PSEP"
98-
CLASS_PATH+="$(find_lib "*jline-terminal-jna*")$PSEP"
98+
CLASS_PATH+="$(find_lib "*jline-terminal-jni*")$PSEP"
99+
CLASS_PATH+="$(find_lib "*jline-native*")$PSEP"
99100
CLASS_PATH+="$(find_lib "*flexmark-formatter*")$PSEP"
100101
CLASS_PATH+="$(find_lib "*autolink-0.6*")$PSEP"
101102
CLASS_PATH+="$(find_lib "*flexmark-jira-converter*")$PSEP"
@@ -107,7 +108,6 @@ classpathArgs () {
107108
CLASS_PATH+="$(find_lib "*scala-library*")$PSEP"
108109
CLASS_PATH+="$(find_lib "*protobuf-java*")$PSEP"
109110
CLASS_PATH+="$(find_lib "*util-interface*")$PSEP"
110-
CLASS_PATH+="$(find_lib "*jna-5*")$PSEP"
111111
CLASS_PATH+="$(find_lib "*antlr4-runtime*")$PSEP"
112112

113113
jvm_cp_args="-classpath \"$CLASS_PATH\""

dist/bin/scaladoc.bat

+2-2
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,8 @@ call :updateClasspath "scala-asm"
129129
call :updateClasspath "compiler-interface"
130130
call :updateClasspath "jline-reader"
131131
call :updateClasspath "jline-terminal-3"
132-
call :updateClasspath "jline-terminal-jna"
132+
call :updateClasspath "jline-terminal-jni"
133+
call :updateClasspath "jline-native"
133134
call :updateClasspath "flexmark-util"
134135
call :updateClasspath "flexmark-formatter"
135136
call :updateClasspath "autolink-0.6"
@@ -142,7 +143,6 @@ call :updateClasspath "snakeyaml"
142143
call :updateClasspath "scala-library"
143144
call :updateClasspath "protobuf-java"
144145
call :updateClasspath "util-interface"
145-
call :updateClasspath "jna-5"
146146
call :updateClasspath "flexmark-ext-tables"
147147
call :updateClasspath "flexmark-ext-ins"
148148
call :updateClasspath "flexmark-ext-superscript"

0 commit comments

Comments
 (0)