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 3f049ee Update Gradle: 6.3 -> 6.5
3f049ee is described below
commit 3f049eed72cebb916883912affed19154a2bbcfa
Author: Vladimir Sitnikov <sitnikov.vladi...@gmail.com>
AuthorDate: Fri Jun 12 21:41:48 2020 +0300
Update Gradle: 6.3 -> 6.5
---
babel/build.gradle.kts | 2 +-
.../org/apache/calcite/buildtools/javacc/JavaCCTask.kt | 17 +++++++----------
core/build.gradle.kts | 4 ++--
gradle/wrapper/gradle-wrapper.properties | 4 ++--
server/build.gradle.kts | 2 +-
5 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/babel/build.gradle.kts b/babel/build.gradle.kts
index ee24594..091bcd8 100644
--- a/babel/build.gradle.kts
+++ b/babel/build.gradle.kts
@@ -46,7 +46,7 @@ val javaCCMain by
tasks.registering(org.apache.calcite.buildtools.javacc.JavaCCT
dependsOn(fmppMain)
lookAhead.set(2)
val parserFile = fmppMain.map {
- it.output.asFileTree.matching { include("**/Parser.jj") }.singleFile
+ it.output.asFileTree.matching { include("**/Parser.jj")
}.singleOrNull().toPlatformType()
}
inputFile.set(parserFile)
packageName.set("org.apache.calcite.sql.parser.babel")
diff --git
a/buildSrc/subprojects/javacc/src/main/kotlin/org/apache/calcite/buildtools/javacc/JavaCCTask.kt
b/buildSrc/subprojects/javacc/src/main/kotlin/org/apache/calcite/buildtools/javacc/JavaCCTask.kt
index 4de0ea8..ced2c71 100644
---
a/buildSrc/subprojects/javacc/src/main/kotlin/org/apache/calcite/buildtools/javacc/JavaCCTask.kt
+++
b/buildSrc/subprojects/javacc/src/main/kotlin/org/apache/calcite/buildtools/javacc/JavaCCTask.kt
@@ -18,6 +18,7 @@
package org.apache.calcite.buildtools.javacc
import java.io.File
+import java.util.function.Function
import javax.inject.Inject
import org.gradle.api.DefaultTask
import org.gradle.api.artifacts.Configuration
@@ -25,7 +26,6 @@ import org.gradle.api.model.ObjectFactory
import org.gradle.api.tasks.Classpath
import org.gradle.api.tasks.Input
import org.gradle.api.tasks.InputFile
-import org.gradle.api.tasks.Internal
import org.gradle.api.tasks.OutputDirectory
import org.gradle.api.tasks.TaskAction
import org.gradle.kotlin.dsl.property
@@ -37,17 +37,14 @@ open class JavaCCTask @Inject constructor(
val javaCCClasspath = objectFactory.property<Configuration>()
.convention(project.configurations.named(JavaCCPlugin.JAVACC_CLASSPATH_CONFIGURATION_NAME))
- @Internal
+ @InputFile
val inputFile = objectFactory.property<File>()
- // See https://github.com/gradle/gradle/issues/12627
- @get:InputFile
- val actualInputFile: File? get() = try {
- inputFile.get()
- } catch (e: IllegalStateException) {
- // This means Gradle queries property too early
- null
- }
+ /**
+ * This enables to cast a nullable value to a non-nullable one
+ * @see [https://github.com/gradle/gradle/issues/12627]
+ */
+ inline fun <reified T> T?.toPlatformType(): T =
Function.identity<T>().apply(this)
@Input
val lookAhead = objectFactory.property<Int>().convention(1)
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 6a5c103..c4faaac 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -159,7 +159,7 @@ val fmppMain by
tasks.registering(org.apache.calcite.buildtools.fmpp.FmppTask::c
val javaCCMain by
tasks.registering(org.apache.calcite.buildtools.javacc.JavaCCTask::class) {
dependsOn(fmppMain)
val parserFile = fmppMain.map {
- it.output.asFileTree.matching { include("**/Parser.jj") }.singleFile
+ it.output.asFileTree.matching { include("**/Parser.jj")
}.singleOrNull().toPlatformType()
}
inputFile.set(parserFile)
packageName.set("org.apache.calcite.sql.parser.impl")
@@ -173,7 +173,7 @@ val fmppTest by
tasks.registering(org.apache.calcite.buildtools.fmpp.FmppTask::c
val javaCCTest by
tasks.registering(org.apache.calcite.buildtools.javacc.JavaCCTask::class) {
dependsOn(fmppTest)
val parserFile = fmppTest.map {
- it.output.asFileTree.matching { include("**/Parser.jj") }.singleFile
+ it.output.asFileTree.matching { include("**/Parser.jj")
}.singleOrNull().toPlatformType()
}
inputFile.set(parserFile)
packageName.set("org.apache.calcite.sql.parser.parserextensiontesting")
diff --git a/gradle/wrapper/gradle-wrapper.properties
b/gradle/wrapper/gradle-wrapper.properties
index 0db054b..2c65038 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -16,7 +16,7 @@
#
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionSha256Sum=0f316a67b971b7b571dac7215dcf2591a30994b3450e0629925ffcfe2c68cc5c
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
+distributionSha256Sum=c9910513d0eed63cd8f5c7fec4cb4a05731144770104a0871234a4edc3ba3cef
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/server/build.gradle.kts b/server/build.gradle.kts
index 33a153d..58d09ff 100644
--- a/server/build.gradle.kts
+++ b/server/build.gradle.kts
@@ -45,7 +45,7 @@ val fmppMain by
tasks.registering(org.apache.calcite.buildtools.fmpp.FmppTask::c
val javaCCMain by
tasks.registering(org.apache.calcite.buildtools.javacc.JavaCCTask::class) {
dependsOn(fmppMain)
val parserFile = fmppMain.map {
- it.output.asFileTree.matching { include("**/Parser.jj") }.singleFile
+ it.output.asFileTree.matching { include("**/Parser.jj")
}.singleOrNull().toPlatformType()
}
inputFile.set(parserFile)
packageName.set("org.apache.calcite.sql.parser.ddl")
