Fix remaining jna classpath entries in dist/bin/scaladoc*

WojciechMazur · Jan 27, 2025 · db021c6 · db021c6
1 parent 3231b5b
commit db021c6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/dist/bin/scaladoc b/dist/bin/scaladoc
@@ -95,7 +95,8 @@ classpathArgs () {
   CLASS_PATH+="$(find_lib "*compiler-interface*")$PSEP"
   CLASS_PATH+="$(find_lib "*jline-reader*")$PSEP"
   CLASS_PATH+="$(find_lib "*jline-terminal-3*")$PSEP"
-  CLASS_PATH+="$(find_lib "*jline-terminal-jna*")$PSEP"
+  CLASS_PATH+="$(find_lib "*jline-terminal-jni*")$PSEP"
+  CLASS_PATH+="$(find_lib "*jline-native*")$PSEP"
   CLASS_PATH+="$(find_lib "*flexmark-formatter*")$PSEP"
   CLASS_PATH+="$(find_lib "*autolink-0.6*")$PSEP"
   CLASS_PATH+="$(find_lib "*flexmark-jira-converter*")$PSEP"
@@ -107,7 +108,6 @@ classpathArgs () {
   CLASS_PATH+="$(find_lib "*scala-library*")$PSEP"
   CLASS_PATH+="$(find_lib "*protobuf-java*")$PSEP"
   CLASS_PATH+="$(find_lib "*util-interface*")$PSEP"
-  CLASS_PATH+="$(find_lib "*jna-5*")$PSEP"
   CLASS_PATH+="$(find_lib "*antlr4-runtime*")$PSEP"
 
   jvm_cp_args="-classpath \"$CLASS_PATH\""

diff --git a/dist/bin/scaladoc.bat b/dist/bin/scaladoc.bat
@@ -129,7 +129,8 @@ call :updateClasspath "scala-asm"
 call :updateClasspath "compiler-interface"
 call :updateClasspath "jline-reader"
 call :updateClasspath "jline-terminal-3"
-call :updateClasspath "jline-terminal-jna"
+call :updateClasspath "jline-terminal-jni"
+call :updateClasspath "jline-native"
 call :updateClasspath "flexmark-util"
 call :updateClasspath "flexmark-formatter"
 call :updateClasspath "autolink-0.6"
@@ -142,7 +143,6 @@ call :updateClasspath "snakeyaml"
 call :updateClasspath "scala-library"
 call :updateClasspath "protobuf-java"
 call :updateClasspath "util-interface"
-call :updateClasspath "jna-5"
 call :updateClasspath "flexmark-ext-tables"
 call :updateClasspath "flexmark-ext-ins"
 call :updateClasspath "flexmark-ext-superscript"