Skip to content

Commit

Permalink
Merge branch '5.3-jdk11'
Browse files Browse the repository at this point in the history
# Conflicts:
#	README.md
#	build.gradle.kts
#	site/src/static/sitemap.xml
  • Loading branch information
v1nc3n4 committed Jul 25, 2021
2 parents adedc5c + fa499fd commit 1411b67
Show file tree
Hide file tree
Showing 171 changed files with 382 additions and 238 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.2.0 JDK 11]
- Frontend Gradle plugin: [e.g. 5.3.0 JDK 11]

Settings in `build.gradle[.kts]` file:
```groovy
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<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.2.0"><img src="https://img.shields.io/badge/Latest%20release-5.2.0-blue.svg" alt="Latest release 5.2.0"/></a>
<a href="https://github.com/siouan/frontend-gradle-plugin/releases/tag/v5.3.0"><img src="https://img.shields.io/badge/Latest%20release-5.3.0-blue.svg" alt="Latest release 5.3.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://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>
Expand Down Expand Up @@ -48,6 +48,7 @@ With their feedback, plugin improvement is possible. Special thanks to:
@[ckosloski](https://github.com/ckosloski),
@[davidkron](https://github.com/davidkron),
@[fdw](https://github.com/fdw),
@[Griefed](https://github.com/Griefed),
@[joschi](https://github.com/joschi),
@[jorgheymans](https://github.com/jorgheymans),
@[ludik0](https://github.com/ludik0),
Expand Down
18 changes: 9 additions & 9 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@ configurations["intTestRuntimeOnly"]

dependencies {
implementation(gradleApi())
implementation("org.apache.httpcomponents.client5:httpclient5:5.0.3")
implementation("org.apache.commons:commons-compress:1.20")
implementation("org.apache.httpcomponents.client5:httpclient5:5.1")
implementation("org.apache.commons:commons-compress:1.21")

testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.0")
testImplementation("org.junit.jupiter:junit-jupiter-params:5.7.0")
testImplementation("org.mockito:mockito-core:3.7.7")
testImplementation("org.mockito:mockito-junit-jupiter:3.7.7")
testImplementation("org.assertj:assertj-core:3.18.1")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.7.0")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.2")
testImplementation("org.junit.jupiter:junit-jupiter-params:5.7.2")
testImplementation("org.mockito:mockito-core:3.11.2")
testImplementation("org.mockito:mockito-junit-jupiter:3.11.2")
testImplementation("org.assertj:assertj-core:3.20.2")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.7.2")

intTestImplementation("com.github.tomakehurst:wiremock:2.27.2")
}
Expand Down Expand Up @@ -123,7 +123,7 @@ sonarqube {
property("sonar.organization", "siouan")
property("sonar.projectKey", "siouan_frontend-gradle-plugin")
property("sonar.projectName", "frontend-gradle-plugin")
property("sonar.projectVersion", "5.2.0")
property("sonar.projectVersion", "5.3.0")

property("sonar.links.homepage", "https://github.com/siouan/frontend-gradle-plugin")
property("sonar.links.ci", "https://travis-ci.com/siouan/frontend-gradle-plugin")
Expand Down
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/616cc1d.js" as="script"><link rel="preload" href="/frontend-gradle-plugin/_nuxt/5b9b2fc.js" as="script"><link rel="preload" href="/frontend-gradle-plugin/_nuxt/17f4726.js" as="script"><link rel="preload" href="/frontend-gradle-plugin/_nuxt/7a2530a.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/0c39b38.js" as="script"><link rel="preload" href="/frontend-gradle-plugin/_nuxt/2ee509c.js" as="script"><link rel="preload" href="/frontend-gradle-plugin/_nuxt/a761aa2.js" as="script"><link rel="preload" href="/frontend-gradle-plugin/_nuxt/1c34f4b.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:{_app:{basePath:"/frontend-gradle-plugin/",assetsPath:"/frontend-gradle-plugin/_nuxt/",cdnURL:null}},staticAssetsBase:"/frontend-gradle-plugin/_nuxt/static/1622385816"}</script>
<script src="/frontend-gradle-plugin/_nuxt/616cc1d.js"></script><script src="/frontend-gradle-plugin/_nuxt/5b9b2fc.js"></script><script src="/frontend-gradle-plugin/_nuxt/17f4726.js"></script><script src="/frontend-gradle-plugin/_nuxt/7a2530a.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/1627203349"}</script>
<script src="/frontend-gradle-plugin/_nuxt/0c39b38.js"></script><script src="/frontend-gradle-plugin/_nuxt/2ee509c.js"></script><script src="/frontend-gradle-plugin/_nuxt/a761aa2.js"></script><script src="/frontend-gradle-plugin/_nuxt/1c34f4b.js"></script></body>
</html>
2 changes: 1 addition & 1 deletion docs/_nuxt/80197c8.js → docs/_nuxt/012fcb8.js

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

Loading

0 comments on commit 1411b67

Please sign in to comment.