emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/javaimp ddf1df5: Fixes


From: Filipp Gunbin
Subject: [elpa] externals/javaimp ddf1df5: Fixes
Date: Thu, 4 Nov 2021 14:20:02 -0400 (EDT)

branch: externals/javaimp
commit ddf1df599456e78d7ad8d2e1709f041377df2e37
Author: Filipp Gunbin <fgunbin@fastmail.fm>
Commit: Filipp Gunbin <fgunbin@fastmail.fm>

    Fixes
---
 javaimp-gradle.el |  4 ++++
 javaimp.el        | 16 +++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/javaimp-gradle.el b/javaimp-gradle.el
index 2777b72..e3b801a 100644
--- a/javaimp-gradle.el
+++ b/javaimp-gradle.el
@@ -136,6 +136,10 @@ descriptor."
      program
      handler
      "-q"
+     ;; It's easier for us to track jars instead of classes for
+     ;; java-library projects.  See
+     ;; 
https://docs.gradle.org/current/userguide/java_library_plugin.html#sec:java_library_classes_usage
+     "-Dorg.gradle.java.compile-classpath-packaging=true"
      "-I" (javaimp-cygpath-convert-maybe
            (expand-file-name "javaimp-init-script.gradle"
                              (concat javaimp--basedir
diff --git a/javaimp.el b/javaimp.el
index 75fef2c..7c0d050 100644
--- a/javaimp.el
+++ b/javaimp.el
@@ -417,13 +417,15 @@ current `symbol-at-point'."
              ;; module dependencies because jars may change
               (let (jar-errors)
                 (prog1
-                    (seq-mapcat (lambda (jar)
-                                  (condition-case err
-                                      (javaimp--get-jar-classes jar)
-                                    (t
-                                     (push (error-message-string err) 
jar-errors)
-                                     nil)))
-                                (javaimp-module-dep-jars module))
+                    (seq-mapcat
+                     (lambda (jar)
+                       (condition-case err
+                           (javaimp--get-jar-classes jar)
+                         (t
+                          (push (concat jar ": " (error-message-string err))
+                                jar-errors)
+                          nil)))
+                     (javaimp-module-dep-jars module))
                   (when jar-errors
                     (with-output-to-temp-buffer "*Javaimp Jar errors*"
                       (princ javaimp--jar-error-header)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]