Upgrade gradle version to 6.9.2 (#107)

* Test github actions for CI * Upgrade gradle version to 6.9.2 Notes: cant go to 7.x just yet; we have some deprecated things to fix up. Doing this step wise. Confirmed that it fails the CI --------- Co-authored-by: Sokol Andrey <[email protected]>
uber-java · Dec 21, 2023 · 7a4cdff · 7a4cdff
1 parent 749c486
commit 7a4cdff
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -23,12 +23,12 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 11
+    - name: Set up JDK 8
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '8'
         distribution: 'temurin'
     - name: Build with Gradle
-      uses: gradle/gradle-build-action@bd5760595778326ba7f1441bcf7e88b49de61a25 # v2.6.0
+      uses: gradle/gradle-build-action@0d13054264b0bb894ded474f08ebb30921341cee
       with:
         arguments: build
diff --git a/build.gradle b/build.gradle
@@ -169,9 +169,10 @@ subprojects {
 
 ext."signing.secretKeyRingFile" = "ci/${ext.secretKeyRingFileName}"
 
-task wrapper(type: Wrapper) {
+
+wrapper {
     // Gradle version 4+ required for JMH benchmarking, otherwise v3.5+ is sufficient
-    gradleVersion = '4.0'
+    gradleVersion = '6.9'
 }
 
 // --------------------------------------
@@ -183,9 +184,9 @@ coveralls {
 
 task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
     dependsOn = subprojects.test
-    sourceDirectories = files(subprojects.sourceSets.main.allSource.srcDirs)
-    classDirectories =  files(subprojects.sourceSets.main.output.classesDirs)
-    executionData = files(subprojects.jacocoTestReport.executionData)
+    sourceDirectories.setFrom(files(subprojects.sourceSets.main.allSource.srcDirs))
+    classDirectories.setFrom(files(subprojects.sourceSets.main.output.classesDirs))
+    executionData.setFrom(files(subprojects.jacocoTestReport.executionData))
 
     reports {
         xml.enabled = true

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 #Fri Dec 25 03:30:51 CET 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists