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-avatica.git
The following commit(s) were added to refs/heads/master by this push: new ed05329 Bump release plugin 1.44.0 -> 1.45.0: do not require GPG key for publishDist ed05329 is described below commit ed05329a1f54518256e1179b909170a00fa0b0b8 Author: Vladimir Sitnikov <sitnikov.vladi...@gmail.com> AuthorDate: Thu Nov 14 17:44:04 2019 +0300 Bump release plugin 1.44.0 -> 1.45.0: do not require GPG key for publishDist see https://github.com/vlsi/vlsi-release-plugins/issues/26 --- gradle.properties | 12 ++++++++---- settings.gradle.kts | 19 ++++++++----------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/gradle.properties b/gradle.properties index 362d895..ea5176a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,13 +21,17 @@ kotlin.parallel.tasks.in.project=true # Release version can be generated by using -Prelease or -Prc=<int> arguments calcite.avatica.version=1.16.0 +# The options below configures the use of local clone (e.g. testing development versions) +# You can pass un-comment it, or pass option -PlocalReleasePlugins, or -PlocalReleasePlugins=<path> +# localReleasePlugins=../vlsi-release-plugins + # Plugins com.github.johnrengelman.shadow.version=5.1.0 com.github.spotbugs.version=2.0.0 -com.github.vlsi.crlf.version=1.44.0 -com.github.vlsi.ide.version=1.44.0 -com.github.vlsi.license-gather.version=1.44.0 -com.github.vlsi.stage-vote-release.version=1.44.0 +com.github.vlsi.crlf.version=1.45.0 +com.github.vlsi.ide.version=1.45.0 +com.github.vlsi.license-gather.version=1.45.0 +com.github.vlsi.stage-vote-release.version=1.45.0 com.google.protobuf.version=0.8.10 de.thetaphi.forbiddenapis.version=2.7 org.jetbrains.gradle.plugin.idea-ext.version=0.5 diff --git a/settings.gradle.kts b/settings.gradle.kts index 17fd3ed..e67e548 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -62,17 +62,14 @@ project(":shaded:avatica").projectDir = file("shaded/core") org.apache.tools.ant.DirectoryScanner.removeDefaultExclude("**/.gitattributes") org.apache.tools.ant.DirectoryScanner.removeDefaultExclude("**/.gitignore") -fun String?.toBool(nullAs: Boolean, blankAs: Boolean, default: Boolean) = - when { - this == null -> nullAs - isBlank() -> blankAs - default -> !equals("false", ignoreCase = true) - else -> equals("true", ignoreCase = true) +fun property(name: String) = + when (extra.has(name)) { + true -> extra.get(name) as? String + else -> null } -if (startParameter.projectProperties["localReleasePlugins"] - .toBool(nullAs = false, blankAs = true, default = false) -) { - // This enables to use local clone of vlsi-release-plugins for debugging purposes - includeBuild("../vlsi-release-plugins") +// This enables to use local clone of vlsi-release-plugins for debugging purposes +property("localReleasePlugins")?.ifBlank { "../vlsi-release-plugins" }?.let { + println("Importing project '$it'") + includeBuild(it) }