Skip to content

Commit

Permalink
gradle V2 and V3 difference
Browse files Browse the repository at this point in the history
  • Loading branch information
@DaniilShmelev
DaniilShmelev committed Aug 19, 2021
1 parent e8fe50e commit 03fb23a
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 28 deletions.
16 changes: 8 additions & 8 deletions Tests/L0.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ import { AnalysisResult } from 'azure-pipelines-tasks-codeanalysis-common/Common
let isWindows: RegExpMatchArray = os.type().match(/^Win/);
let gradleWrapper: string = isWindows ? 'gradlew.bat' : 'gradlew';

let gradleFile: string = '/GradleV2/node_modules/azure-pipelines-tasks-codeanalysis-common/sonar.gradle';
let gradleFile: string = '/GradleV3/node_modules/azure-pipelines-tasks-codeanalysis-common/sonar.gradle';
let ccCoverageXmlFile: string = 'CCReport43F6D5EF/coverage.xml';
let checkstyleFile: string = '/GradleV2/node_modules/azure-pipelines-tasks-codeanalysis-common/checkstyle.gradle';
let findbugsFile: string = '/GradleV2/node_modules/azure-pipelines-tasks-codeanalysis-common/findbugs.gradle';
let pmdFile: string = '/GradleV2/node_modules/azure-pipelines-tasks-codeanalysis-common/pmd.gradle';
let checkstyleFile: string = '/GradleV3/node_modules/azure-pipelines-tasks-codeanalysis-common/checkstyle.gradle';
let findbugsFile: string = '/GradleV3/node_modules/azure-pipelines-tasks-codeanalysis-common/findbugs.gradle';
let pmdFile: string = '/GradleV3/node_modules/azure-pipelines-tasks-codeanalysis-common/pmd.gradle';
// Fix up argument paths for Windows
if (isWindows) {
gradleFile = '\\GradleV2\\node_modules\\azure-pipelines-tasks-codeanalysis-common\\sonar.gradle';
gradleFile = '\\GradleV3\\node_modules\\azure-pipelines-tasks-codeanalysis-common\\sonar.gradle';
ccCoverageXmlFile = 'CCReport43F6D5EF\\coverage.xml';
checkstyleFile = '\\GradleV2\\node_modules\\azure-pipelines-tasks-codeanalysis-common\\checkstyle.gradle';
findbugsFile = '\\GradleV2\\node_modules\\azure-pipelines-tasks-codeanalysis-common\\findbugs.gradle';
pmdFile = '\\GradleV2\\node_modules\\azure-pipelines-tasks-codeanalysis-common\\pmd.gradle';
checkstyleFile = '\\GradleV3\\node_modules\\azure-pipelines-tasks-codeanalysis-common\\checkstyle.gradle';
findbugsFile = '\\GradleV3\\node_modules\\azure-pipelines-tasks-codeanalysis-common\\findbugs.gradle';
pmdFile = '\\GradleV3\\node_modules\\azure-pipelines-tasks-codeanalysis-common\\pmd.gradle';
}

function assertFileDoesNotExistInDir(stagingDir:string, filePath:string): void {
Expand Down
4 changes: 2 additions & 2 deletions Tests/L0CAEmptyResultsEnabledTools.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ tr.setInput('findbugsAnalysisEnabled', 'false');
//construct a string that is JSON, call JSON.parse(string), send that to ma.TaskLibAnswers
let myAnswers: string = `{
"exec":{
"gradlew build -I /GradleV2/node_modules/azure-pipelines-tasks-codeanalysis-common/pmd.gradle": {
"gradlew build -I /GradleV3/node_modules/azure-pipelines-tasks-codeanalysis-common/pmd.gradle": {
"code": 0,
"stdout": "Sample gradle + PMD"
},
"gradlew.bat build -I /GradleV2/node_modules/azure-pipelines-tasks-codeanalysis-common/pmd.gradle": {
"gradlew.bat build -I /GradleV3/node_modules/azure-pipelines-tasks-codeanalysis-common/pmd.gradle": {
"code": 0,
"stdout": "Sample gradle + PMD"
}
Expand Down
4 changes: 2 additions & 2 deletions Tests/L0CANoUploadArtifactsIfReportsEmpty.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ tr.setInput('findbugsAnalysisEnabled', 'true');
//construct a string that is JSON, call JSON.parse(string), send that to ma.TaskLibAnswers
let myAnswers: string = `{
"exec":{
"gradlew build -I /GradleV2/node_modules/azure-pipelines-tasks-codeanalysis-common/checkstyle.gradle -I /GradleV2/node_modules/azure-pipelines-tasks-codeanalysis-common/findbugs.gradle -I /GradleV2/node_modules/azure-pipelines-tasks-codeanalysis-common/pmd.gradle": {
"gradlew build -I /GradleV3/node_modules/azure-pipelines-tasks-codeanalysis-common/checkstyle.gradle -I /GradleV3/node_modules/azure-pipelines-tasks-codeanalysis-common/findbugs.gradle -I /GradleV3/node_modules/azure-pipelines-tasks-codeanalysis-common/pmd.gradle": {
"code": 0,
"stdout": "Sample gradle + Checkstyle + PMD + FindBugs"
},
"gradlew.bat build -I /GradleV2/node_modules/azure-pipelines-tasks-codeanalysis-common/checkstyle.gradle -I /GradleV2/node_modules/azure-pipelines-tasks-codeanalysis-common/findbugs.gradle -I /GradleV2/node_modules/azure-pipelines-tasks-codeanalysis-common/pmd.gradle": {
"gradlew.bat build -I /GradleV3/node_modules/azure-pipelines-tasks-codeanalysis-common/checkstyle.gradle -I /GradleV3/node_modules/azure-pipelines-tasks-codeanalysis-common/findbugs.gradle -I /GradleV3/node_modules/azure-pipelines-tasks-codeanalysis-common/pmd.gradle": {
"code": 0,
"stdout": "Sample gradle + Checkstyle + PMD + FindBugs"
}
Expand Down
4 changes: 2 additions & 2 deletions Tests/L0MultiModuleCheckstyleFindBugsPMD.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ tr.setInput('pmdAnalysisEnabled', 'true');
//construct a string that is JSON, call JSON.parse(string), send that to ma.TaskLibAnswers
let myAnswers: string = `{
"exec":{
"gradlew.bat build -I /GradleV2/node_modules/azure-pipelines-tasks-codeanalysis-common/checkstyle.gradle -I /GradleV2/node_modules/azure-pipelines-tasks-codeanalysis-common/findbugs.gradle -I /GradleV2/node_modules/azure-pipelines-tasks-codeanalysis-common/pmd.gradle": {
"gradlew.bat build -I /GradleV3/node_modules/azure-pipelines-tasks-codeanalysis-common/checkstyle.gradle -I /GradleV3/node_modules/azure-pipelines-tasks-codeanalysis-common/findbugs.gradle -I /GradleV3/node_modules/azure-pipelines-tasks-codeanalysis-common/pmd.gradle": {
"code": 0,
"stdout": "Sample gradle + Checkstyle + PMD + FindBugs"
},
"gradlew build -I /GradleV2/node_modules/azure-pipelines-tasks-codeanalysis-common/checkstyle.gradle -I /GradleV2/node_modules/azure-pipelines-tasks-codeanalysis-common/findbugs.gradle -I /GradleV2/node_modules/azure-pipelines-tasks-codeanalysis-common/pmd.gradle": {
"gradlew build -I /GradleV3/node_modules/azure-pipelines-tasks-codeanalysis-common/checkstyle.gradle -I /GradleV3/node_modules/azure-pipelines-tasks-codeanalysis-common/findbugs.gradle -I /GradleV3/node_modules/azure-pipelines-tasks-codeanalysis-common/pmd.gradle": {
"code": 0,
"stdout": "Sample gradle + Checkstyle + PMD + FindBugs"
}
Expand Down
4 changes: 2 additions & 2 deletions Tests/L0SQ.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ tr.setInput('sqGradlePluginVersion', '2.6.1');
//construct a string that is JSON, call JSON.parse(string), send that to ma.TaskLibAnswers
let myAnswers: string = `{
"exec":{
"gradlew build -I /GradleV2/node_modules/azure-pipelines-tasks-codeanalysis-common/sonar.gradle sonarqube":{
"gradlew build -I /GradleV3/node_modules/azure-pipelines-tasks-codeanalysis-common/sonar.gradle sonarqube":{
"code":0,
"stdout":"Gradle build and SQ analysis done"
},
"gradlew.bat build -I /GradleV2/node_modules/azure-pipelines-tasks-codeanalysis-common/sonar.gradle sonarqube":{
"gradlew.bat build -I /GradleV3/node_modules/azure-pipelines-tasks-codeanalysis-common/sonar.gradle sonarqube":{
"code":0,
"stdout":"Gradle build and SQ analysis done"
}
Expand Down
4 changes: 2 additions & 2 deletions Tests/L0SingleModuleCheckstyleFindBugsPMD.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ tr.setInput('pmdAnalysisEnabled', 'true');
//construct a string that is JSON, call JSON.parse(string), send that to ma.TaskLibAnswers
let myAnswers: string = `{
"exec":{
"gradlew.bat build -I /GradleV2/node_modules/azure-pipelines-tasks-codeanalysis-common/checkstyle.gradle -I /GradleV2/node_modules/azure-pipelines-tasks-codeanalysis-common/findbugs.gradle -I /GradleV2/node_modules/azure-pipelines-tasks-codeanalysis-common/pmd.gradle": {
"gradlew.bat build -I /GradleV3/node_modules/azure-pipelines-tasks-codeanalysis-common/checkstyle.gradle -I /GradleV3/node_modules/azure-pipelines-tasks-codeanalysis-common/findbugs.gradle -I /GradleV3/node_modules/azure-pipelines-tasks-codeanalysis-common/pmd.gradle": {
"code": 0,
"stdout": "Sample gradle + Checkstyle + PMD + FindBugs"
},
"gradlew build -I /GradleV2/node_modules/azure-pipelines-tasks-codeanalysis-common/checkstyle.gradle -I /GradleV2/node_modules/azure-pipelines-tasks-codeanalysis-common/findbugs.gradle -I /GradleV2/node_modules/azure-pipelines-tasks-codeanalysis-common/pmd.gradle": {
"gradlew build -I /GradleV3/node_modules/azure-pipelines-tasks-codeanalysis-common/checkstyle.gradle -I /GradleV3/node_modules/azure-pipelines-tasks-codeanalysis-common/findbugs.gradle -I /GradleV3/node_modules/azure-pipelines-tasks-codeanalysis-common/pmd.gradle": {
"code": 0,
"stdout": "Sample gradle + Checkstyle + PMD + FindBugs"
}
Expand Down
8 changes: 3 additions & 5 deletions task.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,12 @@
],
"author": "Microsoft Corporation",
"version": {
"Major": 2,
"Minor": 191,
"Major": 3,
"Minor": 192,
"Patch": 0
},
"releaseNotes": "Configuration of the SonarQube analysis was moved to the [SonarQube](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarqube) or [SonarCloud](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarcloud) extensions, in task `Prepare Analysis Configuration`",
"demands": [
"java"
],
"demands": [],

This comment has been minimized.

Sign in to view

Copy link
@DaniilShmelev

DaniilShmelev Aug 19, 2021

Author Owner

This is pretty much the only significant difference
"minimumAgentVersion": "1.91.0",
"groups": [
{
Expand Down
8 changes: 3 additions & 5 deletions task.loc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,12 @@
],
"author": "Microsoft Corporation",
"version": {
"Major": 2,
"Minor": 191,
"Major": 3,
"Minor": 192,
"Patch": 0
},
"releaseNotes": "ms-resource:loc.releaseNotes",
"demands": [
"java"
],
"demands": [],
"minimumAgentVersion": "1.91.0",
"groups": [
{
Expand Down

0 comments on commit 03fb23a

Please sign in to comment.