[calcite-avatica] branch main updated: [CALCITE-5803] Migrate Avatica to Gradle 8.1.1

[snuyanzin]

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

snuyanzin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/calcite-avatica.git


The following commit(s) were added to refs/heads/main by this push:
     new fc6ce0c6e [CALCITE-5803] Migrate Avatica to Gradle 8.1.1
fc6ce0c6e is described below

commit fc6ce0c6e9e70fe79b348a053523be66fc7f0f14
Author: Richard Antal <richard.an...@cloudera.com>
AuthorDate: Thu Jun 22 14:27:02 2023 +0200

    [CALCITE-5803] Migrate Avatica to Gradle 8.1.1
    
    Change-Id: I0456067000e26478693f74942e1e87735ee248c7
---
 build.gradle.kts                         |  4 ++--
 core/build.gradle.kts                    | 41 +++++++++++++++++++++-----------
 gradle.properties                        |  4 ++--
 gradle/wrapper/gradle-wrapper.properties |  4 ++--
 settings.gradle.kts                      |  2 +-
 5 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 88753b56e..d5671dab9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -413,8 +413,8 @@ allprojects {
                     description = "$description (skipped by default, to enable 
it add -Dspotbugs)"
                 }
                 reports {
-                    html.isEnabled = reportsForHumans()
-                    xml.isEnabled = !reportsForHumans()
+                    html.getRequired().set(reportsForHumans())
+                    xml.getRequired().set(reportsForHumans())
                 }
                 enabled = enableSpotBugs
             }
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index e1ea37d40..34b64ce66 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -57,15 +57,30 @@ sourceSets {
     }
 }
 
-val generatedProtobufDir = File(buildDir, "generated/source/proto/main/java")
+val filterJava by tasks.registering(Sync::class) {
+    inputs.property("version", project.version)
+    outputs.dir(javaFilteredOutput)
+
+    from("$projectDir/src/main/java-filtered") {
+        filteringCharset = "UTF-8"
+        include("**/*.java")
+        filter { x: String ->
+            x.replace("${'$'}{avatica.release.version}", 
project.version.toString())
+        }
+    }
+    into(javaFilteredOutput)
+}
 
 tasks {
     named<Jar>("sourcesJar") {
         // TODO: remove when protobuf-generated files are removed
         from(generatedProtobufDir)
+        dependsOn(filterJava)
     }
 }
 
+val generatedProtobufDir = File(buildDir, "generated/source/proto/main/java")
+
 val String.v: String get() = rootProject.extra["$this.version"] as String
 
 protobuf {
@@ -75,6 +90,9 @@ protobuf {
     }
     generateProtoTasks {
         for (task in ofSourceSet("main")) {
+            tasks.getByName("sourcesJar") {
+                dependsOn(task)
+            }
             ide {
                 generatedJavaSources(task, generatedProtobufDir)
             }
@@ -84,20 +102,15 @@ protobuf {
 
 val javaFilteredOutput = File(buildDir, "generated/java-filtered")
 
-val filterJava by tasks.registering(Sync::class) {
-    inputs.property("version", project.version)
-    outputs.dir(javaFilteredOutput)
+ide {
+    generatedJavaSources(filterJava.get(), javaFilteredOutput)
+}
 
-    from("$projectDir/src/main/java-filtered") {
-        filteringCharset = "UTF-8"
-        include("**/*.java")
-        filter { x: String ->
-            x.replace("${'$'}{avatica.release.version}", 
project.version.toString())
-        }
-    }
-    into(javaFilteredOutput)
+tasks.processResources {
+    dependsOn(tasks.getByName("extractProto"))
 }
 
-ide {
-    generatedJavaSources(filterJava.get(), javaFilteredOutput)
+tasks.autostyleJavaCheck {
+    dependsOn(filterJava)
+    dependsOn(tasks.getByName("generateProto"))
 }
diff --git a/gradle.properties b/gradle.properties
index c8d00e605..481275002 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -35,13 +35,13 @@ calcite.avatica.version=1.24.0
 
 # Plugins
 com.github.autostyle.version=3.0
-com.github.johnrengelman.shadow.version=5.1.0
+com.github.johnrengelman.shadow.version=8.0.0
 com.github.spotbugs.version=2.0.0
 com.github.vlsi.vlsi-release-plugins.version=1.84
 com.google.protobuf.version=0.8.12
 de.thetaphi.forbiddenapis.version=3.4
 org.jetbrains.gradle.plugin.idea-ext.version=0.5
-org.nosphere.apache.rat.version=0.5.3
+org.nosphere.apache.rat.version=0.8.0
 org.owasp.dependencycheck.version=5.2.2
 
 # TODO
diff --git a/gradle/wrapper/gradle-wrapper.properties 
b/gradle/wrapper/gradle-wrapper.properties
index 43f6ab650..604ca8515 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -16,8 +16,8 @@
 #
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=6147605a23b4eff6c334927a86ff3508cb5d6722cd624c97ded4c2e8640f1f87
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle.kts b/settings.gradle.kts
index d15749eef..7f9ef7ea8 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -20,7 +20,7 @@ pluginManagement {
         fun PluginDependenciesSpec.idv(id: String, key: String = id) = id(id) 
version key.v()
 
         idv("com.github.autostyle")
-        idv("com.github.johnrengelman.shadow")
+        idv("com.github.johnrengelman.shadow", 
"com.github.johnrengelman.shadow")
         idv("com.github.spotbugs")
         idv("com.github.vlsi.crlf", "com.github.vlsi.vlsi-release-plugins")
         idv("com.github.vlsi.gradle-extensions", 
"com.github.vlsi.vlsi-release-plugins")