Skip to content

Commit

Permalink
Merge branch '5.1-jdk11'
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/build.yml
#	README.md
#	examples/multi-projects-war-application/settings.gradle
#	gradle/wrapper/gradle-wrapper.properties
#	site/src/static/sitemap.xml
#	sonar-project.properties
  • Loading branch information
v1nc3n4 committed May 2, 2021
2 parents 3fd199e + e91cdd8 commit 3c8bb84
Show file tree
Hide file tree
Showing 205 changed files with 2,385 additions and 2,067 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -12,7 +12,7 @@ on:

jobs:
build:
name: Build plugin
name: Build
runs-on: ${{ matrix.os }}
strategy:
matrix:
Expand All @@ -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'
Expand Down Expand Up @@ -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/*
Expand All @@ -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

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<h2 align="center">Frontend Gradle plugin - Integrated <a href="https://nodejs.org/" title="Node.js">Node.js</a>, <a href="https://www.npmjs.com/" title="npm">npm</a>, <a href="https://yarnpkg.com/" title="Yarn">Yarn</a> builds</h2>
<p align="center">
<a href="https://github.com/siouan/frontend-gradle-plugin/releases/tag/v5.0.1"><img src="https://img.shields.io/badge/Latest%20release-5.0.1-blue.svg" alt="Latest release 5.0.1"/></a>
<a href="https://github.com/siouan/frontend-gradle-plugin/releases/tag/v5.1.0"><img src="https://img.shields.io/badge/Latest%20release-5.1.0-blue.svg" alt="Latest release 5.1.0"/></a>
<a href="https://opensource.org/licenses/Apache-2.0"><img src="https://img.shields.io/badge/License-Apache%202.0-green.svg" alt="License Apache 2.0"/></a>
<br/>
<a href="https://travis-ci.com/siouan/frontend-gradle-plugin"><img src="https://travis-ci.com/siouan/frontend-gradle-plugin.svg?branch=master" alt="Build status"/></a>
<a href="https://github.com/siouan/frontend-gradle-plugin/actions/workflows/build.yml"><img src="https://github.com/siouan/frontend-gradle-plugin/actions/workflows/build.yml/badge.svg?branch=master" alt="Build status"/></a>
<a href="https://sonarcloud.io/dashboard?id=siouan_frontend-gradle-plugin"><img src="https://sonarcloud.io/api/project_badges/measure?project=siouan_frontend-gradle-plugin&metric=alert_status" alt="Quality gate status"/></a>
<a href="https://sonarcloud.io/dashboard?id=siouan_frontend-gradle-plugin"><img src="https://sonarcloud.io/api/project_badges/measure?project=siouan_frontend-gradle-plugin&metric=coverage" alt="Code coverage"/></a>
<a href="https://sonarcloud.io/dashboard?id=siouan_frontend-gradle-plugin"><img src="https://sonarcloud.io/api/project_badges/measure?project=siouan_frontend-gradle-plugin&metric=reliability_rating" alt="Reliability"/></a>
Expand Down
33 changes: 31 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -84,6 +85,7 @@ tasks.named<Task>("check") {
}

tasks.named<JacocoReport>("jacocoTestReport") {
dependsOn(tasks.named("integrationTest"))
executionData.setFrom(file("${project.buildDir}/jacoco/test.exec"), file("${project.buildDir}/jacoco/integrationTest.exec"))
reports {
xml.isEnabled = true
Expand Down Expand Up @@ -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")

}
}
4 changes: 2 additions & 2 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ dependencies {
}

java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
6 changes: 3 additions & 3 deletions docs/200.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<!doctype html>
<html>
<head>
<meta data-n-head="1" charset="utf-8"><meta data-n-head="1" http-equiv="X-UA-Compatible" content="IE=edge"><meta data-n-head="1" http-equiv="content-type" content="text/html"><meta data-n-head="1" http-equiv="Cache-Control" content="no-cache,no-store,must-revalidate"><meta data-n-head="1" http-equiv="Pragma" content="no-cache"><meta data-n-head="1" http-equiv="Expires" content="-1"><meta data-n-head="1" name="viewport" content="width=device-width,initial-scale=1"><meta data-n-head="1" name="robots" content="index,follow"><meta data-n-head="1" name="og:locale" content="en_US"><meta data-n-head="1" name="og:type" content="website"><meta data-n-head="1" name="og:url" content=""><meta data-n-head="1" name="og:site_name" content=""><meta data-n-head="1" name="google" content="nositelinkssearchbox"><link data-n-head="1" rel="icon" type="image/x-icon" href="siouan-icon.png"><base href="/frontend-gradle-plugin/"><link rel="preload" href="/frontend-gradle-plugin/_nuxt/96420a3.js" as="script"><link rel="preload" href="/frontend-gradle-plugin/_nuxt/06e4957.js" as="script"><link rel="preload" href="/frontend-gradle-plugin/_nuxt/5af5ec9.js" as="script"><link rel="preload" href="/frontend-gradle-plugin/_nuxt/d0845ff.js" as="script">
<meta data-n-head="1" charset="utf-8"><meta data-n-head="1" http-equiv="X-UA-Compatible" content="IE=edge"><meta data-n-head="1" http-equiv="content-type" content="text/html"><meta data-n-head="1" http-equiv="Cache-Control" content="no-cache,no-store,must-revalidate"><meta data-n-head="1" http-equiv="Pragma" content="no-cache"><meta data-n-head="1" http-equiv="Expires" content="-1"><meta data-n-head="1" name="viewport" content="width=device-width,initial-scale=1"><meta data-n-head="1" name="robots" content="index,follow"><meta data-n-head="1" name="og:locale" content="en_US"><meta data-n-head="1" name="og:type" content="website"><meta data-n-head="1" name="og:url" content=""><meta data-n-head="1" name="og:site_name" content=""><meta data-n-head="1" name="google" content="nositelinkssearchbox"><link data-n-head="1" rel="icon" type="image/x-icon" href="siouan-icon.png"><base href="/frontend-gradle-plugin/"><link rel="preload" href="/frontend-gradle-plugin/_nuxt/b5104be.js" as="script"><link rel="preload" href="/frontend-gradle-plugin/_nuxt/5b9b2fc.js" as="script"><link rel="preload" href="/frontend-gradle-plugin/_nuxt/6d8eeff.js" as="script"><link rel="preload" href="/frontend-gradle-plugin/_nuxt/7a2530a.js" as="script">
</head>
<body>
<div id="__nuxt"><style>#nuxt-loading{background:#fff;visibility:hidden;opacity:0;position:absolute;left:0;right:0;top:0;bottom:0;display:flex;justify-content:center;align-items:center;flex-direction:column;animation:nuxtLoadingIn 10s ease;-webkit-animation:nuxtLoadingIn 10s ease;animation-fill-mode:forwards;overflow:hidden}@keyframes nuxtLoadingIn{0%{visibility:hidden;opacity:0}20%{visibility:visible;opacity:0}100%{visibility:visible;opacity:1}}@-webkit-keyframes nuxtLoadingIn{0%{visibility:hidden;opacity:0}20%{visibility:visible;opacity:0}100%{visibility:visible;opacity:1}}#nuxt-loading>div,#nuxt-loading>div:after{border-radius:50%;width:5rem;height:5rem}#nuxt-loading>div{font-size:10px;position:relative;text-indent:-9999em;border:.5rem solid #f5f5f5;border-left:.5rem solid #000;-webkit-transform:translateZ(0);-ms-transform:translateZ(0);transform:translateZ(0);-webkit-animation:nuxtLoading 1.1s infinite linear;animation:nuxtLoading 1.1s infinite linear}#nuxt-loading.error>div{border-left:.5rem solid #ff4500;animation-duration:5s}@-webkit-keyframes nuxtLoading{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes nuxtLoading{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}</style><script>window.addEventListener("error",function(){var e=document.getElementById("nuxt-loading");e&&(e.className+=" error")})</script><div id="nuxt-loading" aria-live="polite" role="status"><div>Loading...</div></div></div><script>window.__NUXT__={config:{},staticAssetsBase:"/frontend-gradle-plugin/_nuxt/static/1615723399"}</script>
<script src="/frontend-gradle-plugin/_nuxt/96420a3.js"></script><script src="/frontend-gradle-plugin/_nuxt/06e4957.js"></script><script src="/frontend-gradle-plugin/_nuxt/5af5ec9.js"></script><script src="/frontend-gradle-plugin/_nuxt/d0845ff.js"></script></body>
<div id="__nuxt"><style>#nuxt-loading{background:#fff;visibility:hidden;opacity:0;position:absolute;left:0;right:0;top:0;bottom:0;display:flex;justify-content:center;align-items:center;flex-direction:column;animation:nuxtLoadingIn 10s ease;-webkit-animation:nuxtLoadingIn 10s ease;animation-fill-mode:forwards;overflow:hidden}@keyframes nuxtLoadingIn{0%{visibility:hidden;opacity:0}20%{visibility:visible;opacity:0}100%{visibility:visible;opacity:1}}@-webkit-keyframes nuxtLoadingIn{0%{visibility:hidden;opacity:0}20%{visibility:visible;opacity:0}100%{visibility:visible;opacity:1}}#nuxt-loading>div,#nuxt-loading>div:after{border-radius:50%;width:5rem;height:5rem}#nuxt-loading>div{font-size:10px;position:relative;text-indent:-9999em;border:.5rem solid #f5f5f5;border-left:.5rem solid #000;-webkit-transform:translateZ(0);-ms-transform:translateZ(0);transform:translateZ(0);-webkit-animation:nuxtLoading 1.1s infinite linear;animation:nuxtLoading 1.1s infinite linear}#nuxt-loading.error>div{border-left:.5rem solid #ff4500;animation-duration:5s}@-webkit-keyframes nuxtLoading{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes nuxtLoading{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}</style><script>window.addEventListener("error",function(){var e=document.getElementById("nuxt-loading");e&&(e.className+=" error")})</script><div id="nuxt-loading" aria-live="polite" role="status"><div>Loading...</div></div></div><script>window.__NUXT__={config:{_app:{basePath:"/frontend-gradle-plugin/",assetsPath:"/frontend-gradle-plugin/_nuxt/",cdnURL:null}},staticAssetsBase:"/frontend-gradle-plugin/_nuxt/static/1619947874"}</script>
<script src="/frontend-gradle-plugin/_nuxt/b5104be.js"></script><script src="/frontend-gradle-plugin/_nuxt/5b9b2fc.js"></script><script src="/frontend-gradle-plugin/_nuxt/6d8eeff.js"></script><script src="/frontend-gradle-plugin/_nuxt/7a2530a.js"></script></body>
</html>
1 change: 1 addition & 0 deletions docs/_nuxt/04740b2.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions docs/_nuxt/06e4957.js

This file was deleted.

1 change: 1 addition & 0 deletions docs/_nuxt/09db5d4.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions docs/_nuxt/0c0b7ac.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions docs/_nuxt/0f451f0.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 3c8bb84

Please sign in to comment.