diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8d9cb069956..02ede10993b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,3 +29,14 @@ jobs:
uses: gradle/gradle-build-action@v2.4.2
with:
arguments: build --scan
+
+ publish_coverage:
+ runs-on: ubuntu-latest
+ needs: build
+ steps:
+ - uses: actions/checkout@v3
+ - name: Run codacy-coverage-reporter
+ uses: codacy/codacy-coverage-reporter-action@v1.3.0
+ with:
+ project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
+ coverage-reports: /build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
diff --git a/build.gradle b/build.gradle
index b7f7f60cf65..500dfd4d831 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,3 +1,5 @@
+import org.gradle.internal.logging.ConsoleRenderer
+
buildscript {
repositories {
mavenCentral()
@@ -6,8 +8,8 @@ buildscript {
}
dependencies {
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.17'
- classpath 'com.google.gradle:osdetector-gradle-plugin:1.6.0'
- classpath 'com.github.jengelman.gradle.plugins:shadow:5.2.0'
+ classpath 'com.google.gradle:osdetector-gradle-plugin:1.7.3'
+ classpath 'com.github.johnrengelman:shadow:7.1.2'
classpath 'org.openjfx:javafx-plugin:0.0.10'
}
}
@@ -23,7 +25,10 @@ configure(rootProject) {
}
configure(subprojects) {
+ apply plugin: 'java'
apply plugin: 'com.google.osdetector'
+ apply plugin: 'jacoco'
+ apply plugin: 'jacoco-report-aggregation'
ext { // in alphabetical order
grpcVersion = '1.42.1'
@@ -32,6 +37,21 @@ configure(subprojects) {
os = osdetector.os == 'osx' ? 'mac' : osdetector.os == 'windows' ? 'win' : osdetector.os
}
+
+ jacoco {
+ toolVersion = "0.8.9"
+ reportsDirectory = file("$rootDir/build/reports/jacoco")
+ }
+
+ test.finalizedBy {
+ testCodeCoverageReport {
+ // tests are required to run before generating the report
+ reports {
+ xml.required.set(true)
+ html.required.set(false)
+ }
+ }
+ }
}
@@ -457,7 +477,7 @@ configure(project(':apitest')) {
// Show report link if all tests passed in case you want to see more detail, stdout, skipped, etc.
if (result.resultType == TestResult.ResultType.SUCCESS) {
DirectoryReport htmlReport = getReports().getHtml()
- String reportUrl = new org.gradle.internal.logging.ConsoleRenderer()
+ String reportUrl = new ConsoleRenderer()
.asClickableFileUrl(htmlReport.getEntryPoint())
println("REPORT " + reportUrl)
}
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 8275996d486..46076fb18d3 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -241,6 +241,14 @@
+
+
+
+
+
+
+
+
@@ -353,6 +361,14 @@
+
+
+
+
+
+
+
+
@@ -704,6 +720,14 @@
+
+
+
+
+
+
+
+
@@ -1016,6 +1040,14 @@
+
+
+
+
+
+
+
+
@@ -1113,6 +1145,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1190,6 +1259,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -1198,6 +1277,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1206,6 +1301,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1214,6 +1325,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1222,6 +1349,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1238,6 +1381,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1358,6 +1517,11 @@
+
+
+
+
+
@@ -1366,6 +1530,14 @@
+
+
+
+
+
+
+
+
@@ -1374,6 +1546,11 @@
+
+
+
+
+
@@ -1382,6 +1559,14 @@
+
+
+
+
+
+
+
+
@@ -1390,6 +1575,14 @@
+
+
+
+
+
+
+
+
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7454180f2ae..943f0cbfa75 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 070cb702f09..58e3982e3ca 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionSha256Sum=518a863631feb7452b8f1b3dc2aaee5f388355cc3421bbd0275fbeadd77e84b2
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
+networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 1b6c787337f..65dcd68d65c 100755
--- a/gradlew
+++ b/gradlew
@@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
-# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
esac
done
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
+ # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
+ # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
@@ -205,6 +209,12 @@ set -- \
org.gradle.wrapper.GradleWrapperMain \
"$@"
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+ die "xargs is not available"
+fi
+
# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/gradlew.bat b/gradlew.bat
index 107acd32c4e..93e3f59f135 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
@rem limitations under the License.
@rem
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@@ -25,7 +25,8 @@
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
:end
@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
:mainEnd
if "%OS%"=="Windows_NT" endlocal