[elpa] scratch/javaimp-gradle 63d6d13 2/2: Gradle fixes

[Filipp Gunbin]

branch: scratch/javaimp-gradle
commit 63d6d13fd30d5830f6c9e1324d2a9f0f010c0604
Author: Filipp Gunbin <address@hidden>
Commit: Filipp Gunbin <address@hidden>

    Gradle fixes
---
 packages/javaimp/gradleTaskBody.inc.kts | 8 ++++++--
 packages/javaimp/javaimp-gradle.el      | 3 ++-
 packages/javaimp/javaimp-util.el        | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/javaimp/gradleTaskBody.inc.kts 
b/packages/javaimp/gradleTaskBody.inc.kts
index 6629cd7..7c5770f 100644
--- a/packages/javaimp/gradleTaskBody.inc.kts
+++ b/packages/javaimp/gradleTaskBody.inc.kts
@@ -6,14 +6,18 @@ doLast {
      }
      println("file=${project.buildFile}")
      if (project.hasProperty("archivesBaseName")) { // defined by java plugin
-         println("final-name=${project.archivesBaseName}")
+         println("final-name=" + 
project.configurations.getByName("archives").artifacts.stream()
+           .filter { it.type.equals("war") }
+           .map { it.file.path }
+           .findFirst()
+           .orElse(""))
      } else {
          println("final-name=")
      }
      println("build-dir=${project.buildDir}")
      if (project.hasProperty("sourceSets")) { // defined by java plugin
        println("source-dirs=" + project.sourceSets.stream()
-         .flatMap { it.java.srcDirs.stream().map { it.path } }
+         .flatMap { it.allJava.srcDirs.stream().map { it.path } }
          .collect(Collectors.joining(File.pathSeparator)))
        println("dep-jars=" + project.sourceSets.stream()
          .flatMap { it.compileClasspath.files.stream().filter { 
it.name.endsWith("jar") }.map { it.path } }
diff --git a/packages/javaimp/javaimp-gradle.el 
b/packages/javaimp/javaimp-gradle.el
index 2596465..0f91f6d 100644
--- a/packages/javaimp/javaimp-gradle.el
+++ b/packages/javaimp/javaimp-gradle.el
@@ -75,7 +75,8 @@ information."
    :parent-id (javaimp--gradle-id-from-colon-separated (cdr (assq 'parent-id 
alist)))
    :file (cdr (assq 'file alist))
    :file-orig file-orig
-   :final-name (cdr (assq 'final-name alist))
+   :final-name (javaimp-cygpath-convert-maybe
+                (cdr (assq 'final-name alist)))
    :source-dirs (mapcar #'file-name-as-directory
                         (javaimp--split-native-path
                          (cdr (assq 'source-dirs alist))))
diff --git a/packages/javaimp/javaimp-util.el b/packages/javaimp/javaimp-util.el
index c60e9e3..d5050ec 100644
--- a/packages/javaimp/javaimp-util.el
+++ b/packages/javaimp/javaimp-util.el
@@ -100,7 +100,7 @@ IS-REALLY-PATH.  If MODE is `unix' (the default), adds -u 
switch.
 If MODE is `windows', adds -m switch.  If `is-really-path' is
 non-nil, adds `-p' switch.  On other systems, PATH is returned
 unchanged."
-  (if (eq system-type 'cygwin)
+  (if (and path (eq system-type 'cygwin))
       (progn
        (unless mode (setq mode 'unix))
        (let (args)