jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vladimirsitni...@apache.org
Subject [jmeter] branch master updated: Gradle 6.0 requires extension functions to be placed inside plugins block
Date Wed, 16 Oct 2019 16:25:23 GMT
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/jmeter.git


The following commit(s) were added to refs/heads/master by this push:
     new 6f27c36  Gradle 6.0 requires extension functions to be placed inside plugins block
6f27c36 is described below

commit 6f27c36362e264db0f6f073c21b3ba4644f777ca
Author: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
AuthorDate: Wed Oct 16 19:25:08 2019 +0300

    Gradle 6.0 requires extension functions to be placed inside plugins block
---
 buildSrc/settings.gradle.kts | 5 +----
 settings.gradle.kts          | 6 ++----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
index fa8ccb4..969c4e4 100644
--- a/buildSrc/settings.gradle.kts
+++ b/buildSrc/settings.gradle.kts
@@ -16,12 +16,9 @@
  *
  */
 
-val String.v: String get() = extra["$this.version"] as String
-
-fun PluginDependenciesSpec.idv(id: String) = id(id) version id.v
-
 pluginManagement {
     plugins {
+        fun PluginDependenciesSpec.idv(id: String) = id(id) version extra["$id.version"].toString()
         idv("com.diffplug.gradle.spotless")
     }
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index bc8cdf5..9012a66 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,12 +16,10 @@
  *
  */
 
-val String.v: String get() = extra["$this.version"] as String
-
-fun PluginDependenciesSpec.idv(id: String) = id(id) version id.v
-
 pluginManagement {
     plugins {
+        fun PluginDependenciesSpec.idv(id: String) = id(id) version extra["$id.version"].toString()
+
         idv("com.diffplug.gradle.spotless")
         idv("com.github.spotbugs")
         idv("com.github.vlsi.crlf")


Mime
View raw message