Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ plugins {
id 'idea'
id 'jacoco'
id 'java'
id 'com.github.johnrengelman.shadow' version '6.1.0'
id 'com.liferay.node' version '7.2.16'
id 'com.github.johnrengelman.shadow' version '7.1.2'
id 'com.liferay.node' version '7.2.18'
id 'com.github.psxpaul.execfork' version '0.2.0'
id 'com.palantir.git-version' version '0.13.0'
}
Expand Down Expand Up @@ -54,7 +54,7 @@ sourceSets {
}

wrapper {
gradleVersion = '6.9.2'
gradleVersion = '7.4.2'
}

def installFrontend = tasks.register('installFrontend', com.liferay.gradle.plugins.node.tasks.ExecutePackageManagerTask) {
Expand All @@ -78,6 +78,10 @@ def zipReport = tasks.register('zipReport', Zip) {
def compileJava = tasks.compileJava
def classes = tasks.classes

tasks.named("processSystemtestResources").configure {
duplicatesStrategy = DuplicatesStrategy.INCLUDE
}

tasks.run.dependsOn(zipReport);

run {
Expand Down Expand Up @@ -121,6 +125,7 @@ tasks.shadowJar.dependsOn(zipReport);

shadowJar {
tasks.compileJava.mustRunAfter(zipReport)
tasks.processResources.mustRunAfter(zipReport)
archiveFileName = 'RepoSense.jar'
destinationDirectory = file("${buildDir}/jar/")

Expand Down Expand Up @@ -167,8 +172,9 @@ tasks.register('systemtest', Test) {
}

def serveTestReportInBackground = tasks.register('serveTestReportInBackground', com.github.psxpaul.task.JavaExecFork) {
dependsOn zipReport, compileJava, classes
dependsOn zipReport, compileJava, processResources, classes
tasks.compileJava.mustRunAfter(zipReport)
tasks.processResources.mustRunAfter(zipReport)
main = mainClassName
classpath = sourceSets.main.runtimeClasspath
args = ['--config', './frontend/cypress/config', '--since', 'd1', '--view']
Expand Down Expand Up @@ -215,9 +221,9 @@ jacoco {

jacocoTestReport {
reports {
html.enabled = true
xml.enabled true
csv.enabled false
html.required = true
xml.required = true
csv.required = false
html.destination file("${buildDir}/jacocoHtml")
}

Expand All @@ -238,8 +244,8 @@ coverage.configure {
}

reports {
html.enabled = true
xml.enabled = true
html.required = true
xml.required = true
}
}

Expand Down
4 changes: 3 additions & 1 deletion docs/ug/cli.md
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ This flag overrides the `Ignore file size limit` field in the CSV config file.
<box type="info" seamless>

* If both start date and end date are not specified, the date of generating the report will be taken as the end date.
* May analyze the incorrect date range if used with `--since d1`. The program will throw a warning.
* Cannot be used with both `--since` and `--until`. The program will throw an exception.
</box>
<!-- ------------------------------------------------------------------------------------------------------ -->
Expand Down Expand Up @@ -216,7 +217,8 @@ Cannot be used with `--last-modified-date`. This may result in an incorrect last
<box type="info" seamless>

* If the start date is not specified, only commits made one month before the end date (if specified) or the date of generating the report, will be captured and analyzed.
* If `d1` is specified as the start date (`--since d1` or `-s d1`), then the earliest commit date of all repositories will be taken as the start date.
* If `d1` is specified as the start date (`--since d1` or `-s d1`), then the program will search for the earliest commit date of all repositories and use that as the start date.
* If `d1` is specified together with `--period`, then the program will warn that the date range being analyzed may be incorrect.
</box>
<!-- ------------------------------------------------------------------------------------------------------ -->

Expand Down
5 changes: 4 additions & 1 deletion frontend/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,10 @@
{
"code": 130
}
]
],
"prefer-object-spread": 0,
"function-call-argument-newline": 0,
"vue/no-computed-properties-in-data": 0
},
"parserOptions": {
"parser": "@typescript-eslint/parser"
Expand Down
14 changes: 13 additions & 1 deletion frontend/.stylelintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
"plugins": [
"stylelint-order"
],
"extends": [
"stylelint-config-recommended-scss",
"stylelint-config-recommended-vue"
],
"rules": {
"color-no-invalid-hex": true,
"string-no-newline": true,
Expand All @@ -24,6 +28,14 @@
"selector-list-comma-newline-after": "always",
"no-eol-whitespace": true,
"order/properties-alphabetical-order": true,
"indentation": 2
"indentation": 2,
"scss/at-import-partial-extension": null,
"function-no-unknown": null,
"scss/at-import-no-partial-leading-underscore": null,
"no-descending-specificity": null,
"scss/no-global-function-names": null,
"selector-type-no-unknown": null,
"at-rule-no-unknown": null,
"no-duplicate-selectors": null
}
}
Loading