GradleV3 Update codecoverage-tools packge (#20444)

microsoft · Sep 20, 2024 · 4ab3b20 · 4ab3b20
1 parent 2f305b1
commit 4ab3b20
Show file tree

Hide file tree

Showing 24 changed files with 150 additions and 83 deletions.
diff --git a/Tasks/GradleV3/Modules/code-coverage.ts b/Tasks/GradleV3/Modules/code-coverage.ts
@@ -24,6 +24,8 @@ export function enableCodeCoverageAsync(settings: ICodeCoverageSettings): Q.Prom
  buildProperties['ismultimodule'] = String(settings.isMultiModule);
  buildProperties['gradle5xOrHigher'] = String(settings.gradle5xOrHigher);
  buildProperties['gradleVersion'] = settings.gradleVersion;
+ buildProperties['useJacocoTemplateV2forSingleModule'] = String(settings.useJacocoTemplateV2forSingleModule);
+ buildProperties['useJacocoTemplateV2forMultiModule'] = String(settings.useJacocoTemplateV2forMultiModule);
 
  const codeCoverageEnabler: ICodeCoverageEnabler = new CodeCoverageEnablerFactory().getTool('gradle', settings.codeCoverageTool.toLowerCase());
  return codeCoverageEnabler.enableCodeCoverage(buildProperties);

diff --git a/Tasks/GradleV3/_buildConfigs/Node20/package-lock.json b/Tasks/GradleV3/_buildConfigs/Node20/package-lock.json
diff --git a/Tasks/GradleV3/_buildConfigs/Node20/package.json b/Tasks/GradleV3/_buildConfigs/Node20/package.json
@@ -12,7 +12,7 @@
  "@types/node": "^20.3.1",
  "azure-pipelines-task-lib": "^4.16.0",
  "azure-pipelines-tasks-codeanalysis-common": "^2.242.0",
- "azure-pipelines-tasks-codecoverage-tools": "^3.242.0",
+ "azure-pipelines-tasks-codecoverage-tools": "^3.245.1",
  "azure-pipelines-tasks-java-common": "^2.219.1",
  "azure-pipelines-tasks-utility-common": "^3.241.0"
  },

diff --git a/Tasks/GradleV3/gradletask.ts b/Tasks/GradleV3/gradletask.ts
@@ -82,6 +82,13 @@ async function run() {
  // Clean the report directory before enabling code coverage
  tl.rmRF(reportDirectory);
 
+ const useJacocoTemplateV2forSingleModule = tl.getPipelineFeature('useJacocoTemplateV2forSingleModule');
+ const useJacocoTemplateV2forMultiModule = tl.getPipelineFeature('useJacocoTemplateV2forMultiModule');
+
+ // Print the status of useJacocoTemplateV2forSingleModule and useJacocoTemplateV2forMultiModule feature flags
+ console.log(`useJacocoTemplateV2forSingleModule: ${useJacocoTemplateV2forSingleModule}`);
+ console.log(`useJacocoTemplateV2forMultiModule: ${useJacocoTemplateV2forMultiModule}`);
+
  const codeCoverageSettings: ICodeCoverageSettings = {
  wrapperScript: wrapperScript,
  isCodeCoverageOpted: isCodeCoverageOpted,
@@ -93,7 +100,9 @@ async function run() {
  summaryFileName: codeCoveragePreset.summaryFileName,
  isMultiModule: isMultiModule,
  gradle5xOrHigher: gradle5xOrHigher,
- gradleVersion: gradleVersion
+ gradleVersion: gradleVersion,
+ useJacocoTemplateV2forSingleModule: useJacocoTemplateV2forSingleModule,
+ useJacocoTemplateV2forMultiModule: useJacocoTemplateV2forMultiModule
  };
 
  emitTelemetry('TaskHub', 'GradleV3', { codeCoverageSettings: codeCoverageSettings });

diff --git a/Tasks/GradleV3/interfaces.ts b/Tasks/GradleV3/interfaces.ts
@@ -17,6 +17,8 @@ export interface ICodeCoverageSettings {
  isMultiModule: boolean;
  gradle5xOrHigher: boolean;
  gradleVersion: string;
+ useJacocoTemplateV2forSingleModule: boolean;
+ useJacocoTemplateV2forMultiModule: boolean;
 }
 
 export interface IPublishCodeCoverageSettings {

diff --git a/Tasks/GradleV3/package-lock.json b/Tasks/GradleV3/package-lock.json
diff --git a/Tasks/GradleV3/package.json b/Tasks/GradleV3/package.json
@@ -12,7 +12,7 @@
  "@types/node": "^16.11.39",
  "azure-pipelines-task-lib": "^4.16.0",
  "azure-pipelines-tasks-codeanalysis-common": "^2.242.0",
- "azure-pipelines-tasks-codecoverage-tools": "^3.242.0",
+ "azure-pipelines-tasks-codecoverage-tools": "^3.245.1",
  "azure-pipelines-tasks-java-common": "^2.219.1",
  "azure-pipelines-tasks-utility-common": "^3.241.0"
  },

diff --git a/Tasks/GradleV3/task.json b/Tasks/GradleV3/task.json
@@ -17,7 +17,7 @@
  "version": {
  "Major": 3,
  "Minor": 246,
- "Patch": 0
+ "Patch": 2
  },
  "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": [],

diff --git a/Tasks/GradleV3/task.loc.json b/Tasks/GradleV3/task.loc.json
@@ -17,7 +17,7 @@
  "version": {
  "Major": 3,
  "Minor": 246,
- "Patch": 0
+ "Patch": 2
  },
  "releaseNotes": "ms-resource:loc.releaseNotes",
  "demands": [],

diff --git a/_generated/GradleV3.versionmap.txt b/_generated/GradleV3.versionmap.txt
@@ -1,2 +1,2 @@
-Default|3.246.0
-Node20_229_2|3.246.1
+Default|3.246.2
+Node20_229_2|3.246.3
diff --git a/_generated/GradleV3/Modules/code-coverage.ts b/_generated/GradleV3/Modules/code-coverage.ts
@@ -24,6 +24,8 @@ export function enableCodeCoverageAsync(settings: ICodeCoverageSettings): Q.Prom
  buildProperties['ismultimodule'] = String(settings.isMultiModule);
  buildProperties['gradle5xOrHigher'] = String(settings.gradle5xOrHigher);
  buildProperties['gradleVersion'] = settings.gradleVersion;
+ buildProperties['useJacocoTemplateV2forSingleModule'] = String(settings.useJacocoTemplateV2forSingleModule);
+ buildProperties['useJacocoTemplateV2forMultiModule'] = String(settings.useJacocoTemplateV2forMultiModule);
 
  const codeCoverageEnabler: ICodeCoverageEnabler = new CodeCoverageEnablerFactory().getTool('gradle', settings.codeCoverageTool.toLowerCase());
  return codeCoverageEnabler.enableCodeCoverage(buildProperties);

diff --git a/_generated/GradleV3/gradletask.ts b/_generated/GradleV3/gradletask.ts
@@ -82,6 +82,13 @@ async function run() {
  // Clean the report directory before enabling code coverage
  tl.rmRF(reportDirectory);
 
+ const useJacocoTemplateV2forSingleModule = tl.getPipelineFeature('useJacocoTemplateV2forSingleModule');
+ const useJacocoTemplateV2forMultiModule = tl.getPipelineFeature('useJacocoTemplateV2forMultiModule');
+
+ // Print the status of useJacocoTemplateV2forSingleModule and useJacocoTemplateV2forMultiModule feature flags
+ console.log(`useJacocoTemplateV2forSingleModule: ${useJacocoTemplateV2forSingleModule}`);
+ console.log(`useJacocoTemplateV2forMultiModule: ${useJacocoTemplateV2forMultiModule}`);
+
  const codeCoverageSettings: ICodeCoverageSettings = {
  wrapperScript: wrapperScript,
  isCodeCoverageOpted: isCodeCoverageOpted,
@@ -93,7 +100,9 @@ async function run() {
  summaryFileName: codeCoveragePreset.summaryFileName,
  isMultiModule: isMultiModule,
  gradle5xOrHigher: gradle5xOrHigher,
- gradleVersion: gradleVersion
+ gradleVersion: gradleVersion,
+ useJacocoTemplateV2forSingleModule: useJacocoTemplateV2forSingleModule,
+ useJacocoTemplateV2forMultiModule: useJacocoTemplateV2forMultiModule
  };
 
  emitTelemetry('TaskHub', 'GradleV3', { codeCoverageSettings: codeCoverageSettings });

diff --git a/_generated/GradleV3/interfaces.ts b/_generated/GradleV3/interfaces.ts
@@ -17,6 +17,8 @@ export interface ICodeCoverageSettings {
  isMultiModule: boolean;
  gradle5xOrHigher: boolean;
  gradleVersion: string;
+ useJacocoTemplateV2forSingleModule: boolean;
+ useJacocoTemplateV2forMultiModule: boolean;
 }
 
 export interface IPublishCodeCoverageSettings {

diff --git a/_generated/GradleV3/package-lock.json b/_generated/GradleV3/package-lock.json
diff --git a/_generated/GradleV3/package.json b/_generated/GradleV3/package.json
@@ -12,7 +12,7 @@
  "@types/node": "^16.11.39",
  "azure-pipelines-task-lib": "^4.16.0",
  "azure-pipelines-tasks-codeanalysis-common": "^2.242.0",
- "azure-pipelines-tasks-codecoverage-tools": "^3.242.0",
+ "azure-pipelines-tasks-codecoverage-tools": "^3.245.1",
  "azure-pipelines-tasks-java-common": "^2.219.1",
  "azure-pipelines-tasks-utility-common": "^3.241.0"
  },

diff --git a/_generated/GradleV3/task.json b/_generated/GradleV3/task.json
@@ -17,7 +17,7 @@
  "version": {
  "Major": 3,
  "Minor": 246,
- "Patch": 0
+ "Patch": 2
  },
  "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": [],
@@ -427,7 +427,7 @@
  "UnableToExtractGradleVersion": "Unable to extract Gradle version from gradle output."
  },
  "_buildConfigMapping": {
- "Default": "3.246.0",
- "Node20_229_2": "3.246.1"
+ "Default": "3.246.2",
+ "Node20_229_2": "3.246.3"
  }
 }
diff --git a/_generated/GradleV3/task.loc.json b/_generated/GradleV3/task.loc.json
@@ -17,7 +17,7 @@
  "version": {
  "Major": 3,
  "Minor": 246,
- "Patch": 0
+ "Patch": 2
  },
  "releaseNotes": "ms-resource:loc.releaseNotes",
  "demands": [],
@@ -427,7 +427,7 @@
  "UnableToExtractGradleVersion": "ms-resource:loc.messages.UnableToExtractGradleVersion"
  },
  "_buildConfigMapping": {
- "Default": "3.246.0",
- "Node20_229_2": "3.246.1"
+ "Default": "3.246.2",
+ "Node20_229_2": "3.246.3"
  }
 }
diff --git a/_generated/GradleV3_Node20/Modules/code-coverage.ts b/_generated/GradleV3_Node20/Modules/code-coverage.ts
@@ -24,6 +24,8 @@ export function enableCodeCoverageAsync(settings: ICodeCoverageSettings): Q.Prom
  buildProperties['ismultimodule'] = String(settings.isMultiModule);
  buildProperties['gradle5xOrHigher'] = String(settings.gradle5xOrHigher);
  buildProperties['gradleVersion'] = settings.gradleVersion;
+ buildProperties['useJacocoTemplateV2forSingleModule'] = String(settings.useJacocoTemplateV2forSingleModule);
+ buildProperties['useJacocoTemplateV2forMultiModule'] = String(settings.useJacocoTemplateV2forMultiModule);
 
  const codeCoverageEnabler: ICodeCoverageEnabler = new CodeCoverageEnablerFactory().getTool('gradle', settings.codeCoverageTool.toLowerCase());
  return codeCoverageEnabler.enableCodeCoverage(buildProperties);