[calcite] branch master updated: Simplify buildSqllineClasspath build tasks

[vladimirsitnikov]

This is an automated email from the ASF dual-hosted git repository.

vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/calcite.git


The following commit(s) were added to refs/heads/master by this push:
     new b4ad630  Simplify buildSqllineClasspath build tasks
b4ad630 is described below

commit b4ad630d1d5674ae3dfc9c85615ffe991797c563
Author: Vladimir Sitnikov <sitnikov.vladi...@gmail.com>
AuthorDate: Thu Apr 2 12:11:16 2020 +0300

    Simplify buildSqllineClasspath build tasks
---
 build.gradle.kts             | 10 ++++------
 example/csv/build.gradle.kts | 10 ++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 5fab812..73b07e1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -189,12 +189,10 @@ val buildSqllineClasspath by 
tasks.registering(Jar::class) {
     
inputs.files(sqllineClasspath).withNormalizer(ClasspathNormalizer::class.java)
     archiveFileName.set("sqllineClasspath.jar")
     manifest {
-        manifest {
-            attributes(
-                "Main-Class" to "sqlline.SqlLine",
-                "Class-Path" to provider { sqllineClasspath.map { 
it.absolutePath }.joinToString(" ") }
-            )
-        }
+        attributes(
+            "Main-Class" to "sqlline.SqlLine",
+            "Class-Path" to provider { sqllineClasspath.joinToString(" ") { 
it.absolutePath } }
+        )
     }
 }
 
diff --git a/example/csv/build.gradle.kts b/example/csv/build.gradle.kts
index 5767284..c2ac70f 100644
--- a/example/csv/build.gradle.kts
+++ b/example/csv/build.gradle.kts
@@ -41,11 +41,9 @@ val buildSqllineClasspath by tasks.registering(Jar::class) {
     
inputs.files(sqllineClasspath).withNormalizer(ClasspathNormalizer::class.java)
     archiveFileName.set("sqllineClasspath.jar")
     manifest {
-        manifest {
-            attributes(
-                "Main-Class" to "sqlline.SqlLine",
-                "Class-Path" to provider { sqllineClasspath.map { 
it.absolutePath }.joinToString(" ") }
-            )
-        }
+        attributes(
+            "Main-Class" to "sqlline.SqlLine",
+            "Class-Path" to provider { sqllineClasspath.joinToString(" ") { 
it.absolutePath } }
+        )
     }
 }