branch: scratch/javaimp-gradle
commit 426658b016a067791ab1150fb816e2548ecfdba8
Author: Filipp Gunbin <fgun...@fastmail.fm>
Commit: Filipp Gunbin <fgun...@fastmail.fm>
Gradle fixes
---
packages/javaimp/javaimp-gradle.el | 10 ++++++----
packages/javaimp/javaimp-util.el | 2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/packages/javaimp/javaimp-gradle.el
b/packages/javaimp/javaimp-gradle.el
index d2b8374..908067a 100644
--- a/packages/javaimp/javaimp-gradle.el
+++ b/packages/javaimp/javaimp-gradle.el
@@ -21,6 +21,8 @@
(require 'javaimp-util)
+;; TODO support Groovy build files (build.gradle)
+
(defcustom javaimp-gradle-program "gradle"
"Path to the `gradle' program. Customize it if the program is
not on `exec-path'."
@@ -52,7 +54,7 @@ information."
(goto-char (point-min))
(let (modules alist parts sym val)
(while (not (eobp))
- (setq parts (split-string (thing-at-point 'line) "[=\n]+"))
+ (setq parts (split-string (thing-at-point 'line) "[=\n]+" t))
(setq sym (intern (or (nth 0 parts)
(error "Invalid line in gradle output: %s"
(thing-at-point 'line))))
@@ -64,7 +66,7 @@ information."
(forward-line 1))
(when alist ;last module
(push (javaimp--gradle-module-from-alist alist) modules))
- modules))
+ (nreverse modules)))
(defun javaimp--gradle-module-from-alist (alist)
(make-javaimp-module
@@ -88,7 +90,7 @@ information."
(defun javaimp--gradle-id-from-colon-separated (str)
(when str
- (let ((parts (split-string str ":")))
+ (let ((parts (split-string str ":" t)))
(unless (= (length parts) 3)
(error "Invalid maven id: %s" str))
(make-javaimp-id :group (nth 0 parts) :artifact (nth 1 parts) :version
(nth 2 parts)))))
@@ -102,7 +104,7 @@ information."
;; expect just a single line
(thing-at-point 'line))
"-q"
- "-p" (javaimp-cygpath-convert-maybe file)
+ "-b" (javaimp-cygpath-convert-maybe file)
"-I" (javaimp-cygpath-convert-maybe init-file)
"javaimpTask")))
diff --git a/packages/javaimp/javaimp-util.el b/packages/javaimp/javaimp-util.el
index dae6907..cd5d58e 100644
--- a/packages/javaimp/javaimp-util.el
+++ b/packages/javaimp/javaimp-util.el
@@ -109,7 +109,7 @@ buffer and returns its result"
(when path
(let ((converted (javaimp-cygpath-convert-maybe path 'unix t))
(sep-regex (concat "[" path-separator "\n" "]+")))
- (split-string converted sep-regex))))
+ (split-string converted sep-regex t))))
(defun javaimp--build-tree (this parent-node all)
(message "Building tree for module: %s" (javaimp-module-id this))
