[calcite] branch master updated: Support skipAutosyle property in buildSrc

[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 eeca3e0  Support skipAutosyle property in buildSrc
eeca3e0 is described below

commit eeca3e06fec23db3abb8e4023593a6a57c44a371
Author: Vladimir Sitnikov <sitnikov.vladi...@gmail.com>
AuthorDate: Wed Jan 29 11:16:50 2020 +0300

    Support skipAutosyle property in buildSrc
---
 buildSrc/build.gradle.kts    | 30 ++++++++++++++++++------------
 buildSrc/gradle.properties   |  2 +-
 buildSrc/settings.gradle.kts |  4 +++-
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index acd43e3..d89dc34 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -15,12 +15,14 @@
  * limitations under the License.
  */
 
+import com.github.vlsi.gradle.properties.dsl.props
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     java
     `kotlin-dsl` apply false
     id("com.github.autostyle")
+    id("com.github.vlsi.gradle-extensions")
 }
 
 repositories {
@@ -28,7 +30,9 @@ repositories {
     gradlePluginPortal()
 }
 
-subprojects {
+val skipAutostyle by props()
+
+allprojects {
     repositories {
         jcenter()
         gradlePluginPortal()
@@ -52,17 +56,19 @@ fun Project.applyKotlinProjectConventions() {
             jvmTarget = "1.8"
         }
     }
-    apply(plugin = "com.github.autostyle")
-    autostyle {
-        kotlin {
-            ktlint()
-            trimTrailingWhitespace()
-            endWithNewline()
-        }
-        kotlinGradle {
-            ktlint()
-            trimTrailingWhitespace()
-            endWithNewline()
+    if (!skipAutostyle) {
+        apply(plugin = "com.github.autostyle")
+        autostyle {
+            kotlin {
+                ktlint()
+                trimTrailingWhitespace()
+                endWithNewline()
+            }
+            kotlinGradle {
+                ktlint()
+                trimTrailingWhitespace()
+                endWithNewline()
+            }
         }
     }
 }
diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties
index 1b419ae..c297078 100644
--- a/buildSrc/gradle.properties
+++ b/buildSrc/gradle.properties
@@ -20,4 +20,4 @@ kotlin.parallel.tasks.in.project=true
 
 # Plugins
 com.github.autostyle.version=3.0
-
+com.github.vlsi.vlsi-release-plugins.version=1.52
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
index 1ee00ec..1149c90 100644
--- a/buildSrc/settings.gradle.kts
+++ b/buildSrc/settings.gradle.kts
@@ -17,8 +17,10 @@
 
 pluginManagement {
     plugins {
-        fun PluginDependenciesSpec.idv(id: String) = id(id) version 
extra["$id.version"].toString()
+        fun String.v() = extra["$this.version"].toString()
+        fun PluginDependenciesSpec.idv(id: String, key: String = id) = id(id) 
version key.v()
         idv("com.github.autostyle")
+        idv("com.github.vlsi.gradle-extensions", 
"com.github.vlsi.vlsi-release-plugins")
     }
 }