[gnu] externals/javaimp 7d734bb703c: Fixes in gradle init script

[Filipp Gunbin]

branch: externals/javaimp
commit 7d734bb703ccb47dc77286563a42d9d8a7407fe0
Author: Filipp Gunbin <fgun...@fastmail.fm>
Commit: Filipp Gunbin <fgun...@fastmail.fm>

    Fixes in gradle init script
---
 support/javaimp-init-script.gradle | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/support/javaimp-init-script.gradle 
b/support/javaimp-init-script.gradle
index 5efbbe41702..030e3c8e273 100644
--- a/support/javaimp-init-script.gradle
+++ b/support/javaimp-init-script.gradle
@@ -10,22 +10,20 @@ allprojects {
                 println("${project.parent.path};${project.parent.version}")
             }
             println("file=${project.buildFile}")
-            println("build-dir=${project.buildDir}")
+            println("build-dir=${project.layout.buildDirectory}")
 
             String finalName = ""
             String sourceDirs = ""
             String depJars = ""
             if (project.pluginManager.hasPlugin("java")) {
-                // "archives" configuration and "sourceSets" property
-                // are defined by Java plugin
-
+                // See org.gradle.api.plugins.JavaPlugin, 
org.gradle.api.plugins.WarPlugin
+                String artifactType = project.pluginManager.hasPlugin("war") ? 
"war" : "jar"
                 finalName = 
project.configurations.getByName("archives").artifacts.stream()
-                    .filter {
-                        it.type.equals("jar") || it.type.equals("war")
-                    }
+                    .filter { it.type.equals(artifactType) }
                     .map { it.file.path }
                     .findFirst()
                     .orElse("")
+                // sourceSets defined by 
org.gradle.api.plugins.JavaPluginExtension
                 sourceDirs = project.sourceSets.stream()
                     .flatMap {
                         it.allJava.srcDirs.stream()