diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index e55bcf35..51301a1e 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -26,7 +26,7 @@ Hi,
- OS: [e.g. Ubuntu 18.04.1, Windows 10 Pro, Mac OS X]
- JDK: [e.g. Oracle JDK 11 64 bits]
- Gradle: [e.g. Gradle 6.8]
-- Frontend Gradle plugin: [e.g. 5.0.1 JDK 11]
+- Frontend Gradle plugin: [e.g. 5.1.0 JDK 11]
Settings in `build.gradle[.kts]` file:
```groovy
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 945ffede..283ea673 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,7 +1,7 @@
# This workflow will build a Java project with Gradle
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
-name: Build status
+name: Build
on:
push:
@@ -12,7 +12,7 @@ on:
jobs:
build:
- name: Build plugin
+ name: Build
runs-on: ${{ matrix.os }}
strategy:
matrix:
@@ -21,11 +21,11 @@ jobs:
steps:
- name: Init Ubuntu environment
if: matrix.os == 'ubuntu-20.04'
- run: sudo rm -f /usr/local/bin/node /usr/local/bin/npm /usr/local/bin/npx /usr/bin/yarn
+ run: sudo rm -f /usr/local/bin/node /usr/local/bin/npm /usr/local/bin/npx /usr/local/bin/yarn /usr/bin/yarn
- name: Init MacOS environment
if: matrix.os == 'macos-10.15'
- run: sudo rm -f /usr/local/bin/node /usr/local/bin/npm /usr/local/bin/npx /usr/bin/yarn /Users/runner/.yarn/bin/yarn
+ run: sudo rm -f /usr/local/bin/node /usr/local/bin/npm /usr/local/bin/npx /usr/local/bin//yarn /usr/bin/yarn /Users/runner/.yarn/bin/yarn
- name: Init Windows environment
if: matrix.os == 'windows-2019'
@@ -64,7 +64,7 @@ jobs:
with:
path: |
- ~/.sonar/cache/
- key: ${{ runner.os }}-sonar-${{ hashFiles('**/*.gradle*') }}
+ key: ${{ runner.os }}-sonar
- name: Grant executable permission
run: chmod +x gradlew src/intTest/resources/*/bin/*
@@ -78,8 +78,9 @@ jobs:
run: ./gradlew :build --console=plain
- name: Scan source code and test results
- uses: SonarSource/sonarcloud-github-action@v1.4
if: matrix.os == 'ubuntu-20.04'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+ run: ./gradlew -i sonarqube --console=plain
+
diff --git a/README.md b/README.md
index c235934a..976fe673 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
Frontend Gradle plugin - Integrated Node.js, npm, Yarn builds
- 
+ 
- 
+ 
diff --git a/build.gradle.kts b/build.gradle.kts
index 24da4bc7..ed806b40 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -14,11 +14,12 @@ plugins {
id("java-gradle-plugin")
id("jacoco")
id("com.gradle.plugin-publish")
- id ("maven-publish")
+ id("maven-publish")
+ id("org.sonarqube")
}
repositories {
- jcenter()
+ mavenCentral()
}
group = fgpGroup
@@ -84,6 +85,7 @@ tasks.named("check") {
}
tasks.named("jacocoTestReport") {
+ dependsOn(tasks.named("integrationTest"))
executionData.setFrom(file("${project.buildDir}/jacoco/test.exec"), file("${project.buildDir}/jacoco/integrationTest.exec"))
reports {
xml.isEnabled = true
@@ -114,3 +116,30 @@ pluginBundle {
}
}
}
+
+sonarqube {
+ properties {
+ property("sonar.host.url", "https://sonarcloud.io")
+ property("sonar.organization", "siouan")
+ property("sonar.projectKey", "siouan_frontend-gradle-plugin")
+ property("sonar.projectName", "frontend-gradle-plugin")
+ property("sonar.projectVersion", "5.1.0")
+
+ property("sonar.links.homepage", "https://github.com/siouan/frontend-gradle-plugin")
+ property("sonar.links.ci", "https://travis-ci.com/siouan/frontend-gradle-plugin")
+ property("sonar.links.scm", "https://github.com/siouan/frontend-gradle-plugin")
+ property("sonar.links.issue", "https://github.com/siouan/frontend-gradle-plugin/issues")
+
+ property("sonar.sources", "src/main")
+ property("sonar.tests", "src/test,src/intTest")
+
+ property("sonar.java.binaries", "build/classes/java/main")
+ property("sonar.java.test.binaries", "build/classes/java/test,build/classes/java/intTest")
+ property("sonar.junit.reportPaths", "build/test-results/test/,build/test-results/integrationTest/")
+ property("sonar.coverage.jacoco.xmlReportPaths", "${buildDir}/reports/jacoco/report.xml")
+
+ // Unrelevant duplications detected on task inputs
+ property("sonar.cpd.exclusions", "**/org/siouan/frontendgradleplugin/domain/model/*.java,**/org/siouan/frontendgradleplugin/domain/usecase/Get*ExecutablePath.java")
+
+ }
+}
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 6e496c7c..a44afdf1 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -7,6 +7,6 @@ dependencies {
}
java {
- sourceCompatibility = JavaVersion.VERSION_1_8
- targetCompatibility = JavaVersion.VERSION_1_8
+ sourceCompatibility = JavaVersion.VERSION_11
+ targetCompatibility = JavaVersion.VERSION_11
}
diff --git a/docs/200.html b/docs/200.html
index 19ecf036..78d1ffa0 100644
--- a/docs/200.html
+++ b/docs/200.html
@@ -1,9 +1,9 @@
-
+
-
-
+
+