diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7283a45b52c..7f054dcc4bd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macOS-latest, windows-latest] - java: [ '11', '11.0.3', '15', '15.0.5'] + java: [ '11.0.19', '15.0.10', '17.0.7', '20.0.1'] name: Test Java ${{ matrix.Java }}, ${{ matrix.os }} steps: - uses: actions/checkout@v3.5.3 diff --git a/build-logic/gradle-tasks/build.gradle b/build-logic/gradle-tasks/build.gradle index 7c84d601498..211bfe0d5d8 100644 --- a/build-logic/gradle-tasks/build.gradle +++ b/build-logic/gradle-tasks/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.jetbrains.kotlin.jvm' version '1.7.10' - id 'org.gradle.kotlin.kotlin-dsl' version '2.4.1' + id 'org.jetbrains.kotlin.jvm' version '1.8.20' + id 'org.gradle.kotlin.kotlin-dsl' version '4.0.14' } repositories { diff --git a/build-logic/tor-binary/build.gradle b/build-logic/tor-binary/build.gradle index 5f4d40ed6ec..6ccf057a82b 100644 --- a/build-logic/tor-binary/build.gradle +++ b/build-logic/tor-binary/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.jetbrains.kotlin.jvm' version '1.7.10' - id 'org.gradle.kotlin.kotlin-dsl' version '2.4.1' + id 'org.jetbrains.kotlin.jvm' version '1.8.20' + id 'org.gradle.kotlin.kotlin-dsl' version '4.0.14' } repositories { diff --git a/build.gradle b/build.gradle index 1be40c69ac0..d0ebe2ab0d5 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ 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.github.johnrengelman:shadow:8.1.1' classpath 'org.openjfx:javafx-plugin:0.0.10' } } diff --git a/gradle/README.md b/gradle/README.md index c9dce68ef5f..8f41d8dc039 100644 --- a/gradle/README.md +++ b/gradle/README.md @@ -8,9 +8,9 @@ Visit the [Gradle website](https://gradle.org/releases/) and decide the: Adjust the following command with tha arguments above and execute it twice: - ./gradlew wrapper --gradle-version 6.6.1 \ + ./gradlew wrapper --gradle-version 8.2 \ --distribution-type all \ - --gradle-distribution-sha256-sum 11657af6356b7587bfb37287b5992e94a9686d5c8a0a1b60b87b9928a2decde5 + --gradle-distribution-sha256-sum 5022b0b25fe182b0e50867e77f484501dba44feeea88f5c1f13b6b4660463640 The first execution should automatically update: diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 87e35c2761b..34b451bb368 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -38,7 +38,7 @@ junit-jupiter = { strictly = '5.7.0' } kotlin = { strictly = '1.3.41' } logback = { strictly = '1.1.11' } lombok = { strictly = '1.18.22' } -mockito = { strictly = '4.0.0' } +mockito = { strictly = '5.4.0' } natpryce-make-it-easy = { strictly = '4.0.1' } netlayer = { strictly = '0.7.6' } protobuf = { strictly = '3.19.1' } diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 4e74fc28728..f3900c77da4 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -1,5 +1,5 @@ - + true false @@ -43,9 +43,14 @@ + + + + + - + @@ -53,11 +58,21 @@ + + + + + + + + + + @@ -241,12 +256,12 @@ - - - + + + - - + + @@ -540,12 +555,12 @@ - - - + + + - - + + @@ -572,6 +587,14 @@ + + + + + + + + @@ -633,6 +656,11 @@ + + + + + @@ -711,6 +739,11 @@ + + + + + @@ -719,6 +752,16 @@ + + + + + + + + + + @@ -767,6 +810,14 @@ + + + + + + + + @@ -775,11 +826,24 @@ + + + + + + + + + + + + + @@ -842,11 +906,24 @@ + + + + + + + + + + + + + @@ -855,6 +932,14 @@ + + + + + + + + @@ -863,6 +948,11 @@ + + + + + @@ -955,6 +1045,11 @@ + + + + + @@ -965,6 +1060,11 @@ + + + + + @@ -981,6 +1081,19 @@ + + + + + + + + + + + + + @@ -997,6 +1110,14 @@ + + + + + + + + @@ -1069,72 +1190,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -1155,17 +1213,27 @@ - - - + + + - - - + + + - - + + + + + + + + + + + + @@ -1176,17 +1244,17 @@ - - - + + + - - + + - - - + + + @@ -1197,41 +1265,41 @@ - - - + + + - - + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - + + @@ -1258,6 +1326,14 @@ + + + + + + + + @@ -1282,6 +1358,22 @@ + + + + + + + + + + + + + + + + @@ -1290,6 +1382,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1298,6 +1422,22 @@ + + + + + + + + + + + + + + + + @@ -1306,6 +1446,22 @@ + + + + + + + + + + + + + + + + @@ -1314,6 +1470,22 @@ + + + + + + + + + + + + + + + + @@ -1322,6 +1494,22 @@ + + + + + + + + + + + + + + + + @@ -1330,6 +1518,22 @@ + + + + + + + + + + + + + + + + @@ -1338,6 +1542,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1349,6 +1585,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -1357,6 +1615,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1365,6 +1655,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1373,6 +1695,22 @@ + + + + + + + + + + + + + + + + @@ -1381,6 +1719,22 @@ + + + + + + + + + + + + + + + + @@ -1389,6 +1743,22 @@ + + + + + + + + + + + + + + + + @@ -1397,6 +1767,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -1405,6 +1799,14 @@ + + + + + + + + @@ -1413,6 +1815,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -1421,6 +1847,22 @@ + + + + + + + + + + + + + + + + @@ -1429,6 +1871,22 @@ + + + + + + + + + + + + + + + + @@ -1437,6 +1895,22 @@ + + + + + + + + + + + + + + + + @@ -1445,6 +1919,22 @@ + + + + + + + + + + + + + + + + @@ -1453,6 +1943,22 @@ + + + + + + + + + + + + + + + + @@ -1469,6 +1975,22 @@ + + + + + + + + + + + + + + + + @@ -1485,6 +2007,22 @@ + + + + + + + + + + + + + + + + @@ -1501,6 +2039,14 @@ + + + + + + + + @@ -1517,6 +2063,14 @@ + + + + + + + + @@ -1525,6 +2079,22 @@ + + + + + + + + + + + + + + + + @@ -1541,17 +2111,33 @@ - - - + + + + + + + + + + + + + + + + + + + - - + + - - - + + + @@ -1578,6 +2164,22 @@ + + + + + + + + + + + + + + + + @@ -1642,6 +2244,14 @@ + + + + + + + + @@ -1650,11 +2260,24 @@ + + + + + + + + + + + + + @@ -1746,6 +2369,11 @@ + + + + + @@ -1762,6 +2390,22 @@ + + + + + + + + + + + + + + + + @@ -1778,6 +2422,11 @@ + + + + + @@ -1794,20 +2443,36 @@ - - - + + + + + + + + + + + - - + + - - - + + + - - + + + + + + + + + + @@ -1854,6 +2519,14 @@ + + + + + + + + @@ -1870,5 +2543,13 @@ + + + + + + + + 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..c9420a89196 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=5022b0b25fe182b0e50867e77f484501dba44feeea88f5c1f13b6b4660463640 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-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