From 46eb19906d857f94823ea60104749ceab2baa716 Mon Sep 17 00:00:00 2001 From: napoly Date: Tue, 21 Mar 2023 12:07:39 +0100 Subject: [PATCH] upgrade to gradle 8.0.2 for checkstyle heap size adjustment --- .github/workflows/codeql-analysis.yml | 9 +- .github/workflows/label.yml | 6 +- build.gradle | 22 ++- config/{ => checkstyle}/checkstyle.xml | 0 gradle.properties | 1 - gradle/README.md | 4 +- gradle/verification-metadata.xml | 222 +++++++++++------------ gradle/wrapper/gradle-wrapper.properties | 4 +- 8 files changed, 133 insertions(+), 135 deletions(-) rename config/{ => checkstyle}/checkstyle.xml (100%) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index db3d3389..2cebc57e 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -45,6 +45,11 @@ jobs: # Prefix the list here with "+" to use these queries and those in the config file. # queries: ./path/to/local/query, your-org/your-repo/queries@main + # Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java). + # If this step fails, then you should remove it and run the build manually (see below). + - name: Autobuild + uses: github/codeql-action/autobuild@v2 + # ℹ️ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -52,8 +57,8 @@ jobs: # and modify them (or add more) to build your code if your project # uses a compiled language - - run: | - ./gradlew build + #- run: | + # ./gradlew build - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v2 diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml index e365e913..66f702c2 100644 --- a/.github/workflows/label.yml +++ b/.github/workflows/label.yml @@ -10,15 +10,15 @@ jobs: runs-on: ubuntu-latest steps: - name: Bounty explanation - uses: peter-evans/create-or-update-comment@v1 + uses: peter-evans/create-or-update-comment@v2 if: github.event.label.name == '💰bounty' with: token: ${{ secrets.GITHUB_TOKEN }} issue-number: ${{ github.event.issue.number }} body: > There is a bounty on this issue, the amount is in the title. The reward will be awarded to the first person or group of people who resolves this issue. - - + + If you are starting to work on this bounty, please write a comment, so that we can assign the issue to you. We expect contributors to provide a PR in a reasonable time frame or, in case of an extensive work, updates on their progresses. We will unassign the issue if we feel the assignee is not responsive or has abandoned the task. diff --git a/build.gradle b/build.gradle index 1bf1a756..f8b613f1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,5 @@ import org.apache.tools.ant.taskdefs.condition.Os +import org.gradle.internal.logging.ConsoleRenderer buildscript { repositories { @@ -6,10 +7,10 @@ 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:8.1.1' classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.6.3' - classpath 'com.gradle:gradle-enterprise-gradle-plugin:3.7' // added for windows build verfication-metadata.xml error + classpath 'com.gradle:gradle-enterprise-gradle-plugin:3.12.4' // added for windows build verification-metadata.xml error } } @@ -69,7 +70,7 @@ configure(subprojects) { logbackVersion = '1.1.11' loggingVersion = '1.2' lombokVersion = '1.18.24' - mockitoVersion = '4.0.0' + mockitoVersion = '5.2.0' netlayerVersion = '6797461310f077bbea4f43a3a509c077b0ed8c34' // Netlayer version 0.7.3 with Tor browser version 11.0.14 and tor binary version: 0.4.7.7 protobufVersion = '3.19.1' protocVersion = protobufVersion @@ -99,13 +100,18 @@ configure(subprojects) { checkstyle { toolVersion = '10.8.1' // https://raw.githubusercontent.com/checkstyle/checkstyle/checkstyle-10.8.1/src/main/resources/google_checks.xml - configFile = rootProject.file("${rootDir}/config/checkstyle.xml") + configFile = rootProject.file("${rootDir}/config/checkstyle/checkstyle.xml") + } + + tasks.withType(Checkstyle) { + minHeapSize.set('200m') + maxHeapSize.set('1g') } jacocoTestReport { reports { - xml.enabled true - html.enabled false + xml.required.set(true) + html.required.set(false) } } // Codacy report generated with every build at assets/build/reports/jacoco/test/jacocoTestReport.xml @@ -853,7 +859,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/config/checkstyle.xml b/config/checkstyle/checkstyle.xml similarity index 100% rename from config/checkstyle.xml rename to config/checkstyle/checkstyle.xml diff --git a/gradle.properties b/gradle.properties index 2e015935..e4d9a54c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,2 @@ systemProp.org.gradle.internal.http.connectionTimeout=120000 systemProp.org.gradle.internal.http.socketTimeout=120000 -org.gradle.parallel=true diff --git a/gradle/README.md b/gradle/README.md index d0f6dd05..b1f90bd9 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 7.3.3 \ + ./gradlew wrapper --gradle-version 8.0.2 \ --distribution-type all \ - --gradle-distribution-sha256-sum c9490e938b221daf0094982288e4038deed954a3f12fb54cbf270ddf4e37d879 + --gradle-distribution-sha256-sum 47a5bfed9ef814f90f8debcbbb315e8e7c654109acd224595ea39fca95c5d4da The first execution should automatically update: diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 5047a5ce..ccf6b7d8 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -1,5 +1,5 @@ - + false false @@ -476,9 +476,9 @@ - - - + + + @@ -724,9 +724,9 @@ - - - + + + @@ -961,14 +961,9 @@ - - - - - - - - + + + @@ -1047,13 +1042,15 @@ + + + + + - - - @@ -1664,14 +1661,9 @@ - - - - - - - - + + + @@ -1695,6 +1687,11 @@ + + + + + @@ -1716,6 +1713,11 @@ + + + + + @@ -1830,14 +1832,14 @@ - - - + + + - - - + + + @@ -2080,24 +2082,14 @@ - - - + + + - - - - - - - - - - - - - + + + @@ -2252,9 +2244,9 @@ - - - + + + @@ -2423,6 +2415,11 @@ + + + + + @@ -2431,54 +2428,19 @@ - - - - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -2524,9 +2486,9 @@ - - - + + + @@ -3057,6 +3019,11 @@ + + + + + @@ -3073,6 +3040,11 @@ + + + + + @@ -3184,6 +3156,11 @@ + + + + + @@ -3192,6 +3169,16 @@ + + + + + + + + + + @@ -3205,12 +3192,9 @@ - - - - - - + + + @@ -3226,12 +3210,14 @@ - - - + + + - - + + + + @@ -3247,12 +3233,14 @@ - - - + + + - - + + + + @@ -3717,9 +3705,9 @@ - - - + + + diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ee6ba9a3..1a703c8b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=c9490e938b221daf0094982288e4038deed954a3f12fb54cbf270ddf4e37d879 -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip +distributionSha256Sum=47a5bfed9ef814f90f8debcbbb315e8e7c654109acd224595ea39fca95c5d4da +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists