Skip to content

Commit

Permalink
Merge branch 'refs/heads/8.1-jdk21'
Browse files Browse the repository at this point in the history
# Conflicts:
#	site/src/public/sitemap.xml
  • Loading branch information
v1nc3n4 committed Jun 14, 2024
2 parents 2add49d + 9e53a3a commit 9464fd2
Show file tree
Hide file tree
Showing 708 changed files with 18,493 additions and 25,360 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
*.sql text
*.txt text
*.ts text
*.vue text
*.xml text
*.yaml text
*.yml text
Expand Down
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ Actual results: ...

**Environment**

- OS: [e.g. Ubuntu 22.04.1, Windows 11 Pro, Mac OS X]
- JDK: [e.g. Adoptium Temurin JDK 17 64 bits]
- Gradle: [e.g. Gradle 8.2.1]
- Frontend Gradle plugin: [e.g. 8.0.0 JDK 17]
- OS: [e.g. Ubuntu 22.04.4, Windows 11 Pro, Mac OS X]
- JDK: [e.g. Adoptium Temurin JDK 21 64 bits]
- Gradle: [e.g. Gradle 8.8]
- Frontend Gradle plugin: [e.g. 8.1.0 JDK 21]

Settings in `build.gradle[.kts]` file:
```groovy
Expand Down
9 changes: 5 additions & 4 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,11 @@ Hi,
Explain what you would like the plugin do: ...

**Target environment**

- 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.3]

- OS: [e.g. Ubuntu 22.04.4, Windows 11 Pro, Mac OS X]
- JDK: [e.g. Adoptium Temurin JDK 21 64 bits]
- Gradle: [e.g. Gradle 8.8]
- Frontend Gradle plugin: [e.g. 8.1.0 JDK 21]

Settings in `build.gradle[.kts]` file:
```groovy
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-22.04, macos-12, windows-2022]
os: [ubuntu-22.04, macos-14, windows-2022]

steps:
- name: Init Ubuntu environment
if: matrix.os == 'ubuntu-22.04'
run: sudo rm -f /usr/local/bin/node /usr/local/bin/npm /usr/local/bin/pnpm /usr/local/bin/yarn

- name: Init MacOS environment
if: matrix.os == 'macos-12'
run: sudo rm -f /usr/local/bin/node /usr/local/bin/npm /usr/local/bin/pnpm /usr/bin/yarn /Users/runner/.yarn/bin/yarn
if: matrix.os == 'macos-14'
run: sudo rm -f /opt/homebrew/bin/node /usr/local/bin/npm /usr/local/bin/pnpm /usr/bin/yarn /Users/runner/.yarn/bin/yarn

- name: Init Windows environment
if: matrix.os == 'windows-2022'
Expand All @@ -31,26 +31,26 @@ jobs:
Rename-Item "C:\npm" "npm.old" -Force
- name: Git checkout for source code analysis
uses: actions/checkout@v3
uses: actions/checkout@v4
if: matrix.os == 'ubuntu-22.04'
with:
fetch-depth: 0

- name: Git checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
if: matrix.os != 'ubuntu-22.04'
with:
fetch-depth: 1

- name: Set up JDK 17
uses: actions/setup-java@v3
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: '17'
java-version: '21'
architecture: x64

- name: Cache Gradle's cache and wrapper
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.gradle/caches/
Expand All @@ -60,22 +60,22 @@ jobs:
${{ runner.os }}-gradle-
- name: Cache Sonar's cache
uses: actions/cache@v3
uses: actions/cache@v4
if: matrix.os == 'ubuntu-22.04'
with:
path: |
~/.sonar/cache/
key: ${{ runner.os }}-sonar-${{ hashFiles('**/*.gradle*') }}

- name: Grant executable permission
run: chmod +x gradlew plugin/src/intTest/resources/*/bin/*
run: chmod +x gradlew plugin/src/integrationTest/resources/*/bin/*

- name: Build plugin on Linux (with test coverage)
if: matrix.os == 'ubuntu-22.04'
run: ./gradlew :plugin:jacocoTestReport --console=plain

- name: Build plugin on MacOS
if: matrix.os == 'macos-12'
if: matrix.os == 'macos-14'
run: ./gradlew :plugin:build --console=plain

- name: Build plugin on Windows
Expand All @@ -89,4 +89,4 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: ./gradlew :plugin:sonar --console=plain -Dorg.gradle.jvmargs=-Xmx512m -Dsonar.verbose=true
run: ./gradlew :plugin:sonar --console=plain -Dorg.gradle.jvmargs=-Xmx512m -i
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,15 @@ gradlew pluginUnderTestMetadata
## Continuous integration

The project relies on [GitHub Actions][github-actions] to integrate continuously every changes (pull requests) in the
repository. The configuration actually allows to build and test the plugin with Adoptium Temurin JDK 17 64 bits, on the
repository. The configuration actually allows to build and test the plugin with Adoptium Temurin JDK 21 64 bits, on the
environments below:

- Linux Ubuntu 22.04.2
- Mac OS 12.6.5
- Linux Ubuntu 22.04.4
- Mac OS 14.5
- Windows Server 2022

Ubuntu is the reference O/S, used to analyze the source code with SonarCloud. Developments are frequently done on a
Windows 10 Professionnal workstation with Adoptium Temurin JDK 17 64 bits and [IntelliJ IDEA][intellij-idea].
Windows 10 Professionnal workstation with Adoptium Temurin JDK 21 64 bits and [IntelliJ IDEA][intellij-idea].

[apache-commons-compress]: <https://commons.apache.org/proper/commons-compress/> (Apache Commons Compress)
[apache-http-components]: <https://hc.apache.org/> (Apache HttpComponents)
Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<a href="https://www.npmjs.com/" title="npm">npm</a>, <a href="https://pnpm.io/" title="pnpm">pnpm</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/v8.0.0"><img src="https://img.shields.io/badge/Latest%20release-8.0.0-blue.svg" alt="Latest release 8.0.0"/></a>
<a href="https://github.com/siouan/frontend-gradle-plugin/releases/tag/v8.1.0"><img src="https://img.shields.io/badge/Latest%20release-8.1.0-blue.svg" alt="Latest release 8.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://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=7.0-jdk17" 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=8.1-jdk21" alt="Build status"/></a>
<a href="https://sonarcloud.io/project/overview?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/summary/overall?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/summary/overall?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 Expand Up @@ -59,6 +59,8 @@ With their feedback, plugin improvement is possible. Special thanks to:
@[joschi](https://github.com/joschi),
@[jorgheymans](https://github.com/jorgheymans),
@[ludik0](https://github.com/ludik0),
@[marcospereira](https://github.com/marcospereira),
@[mgiorgino-iobeya](https://github.com/mgiorgino-iobeya),
@[mhalbritter](https://github.com/mhalbritter),
@[mike-howell](https://github.com/mike-howell),
@[napstr](https://github.com/napstr),
Expand Down
49 changes: 40 additions & 9 deletions docs/200.html

Large diffs are not rendered by default.

40 changes: 40 additions & 0 deletions docs/404.html

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions docs/5/_payload.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"data":1,"prerenderedAt":3},["Reactive",2],{},1718376604583]
1 change: 1 addition & 0 deletions docs/5/configuration/_payload.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"data":1,"prerenderedAt":3},["Reactive",2],{},1718376604579]
145 changes: 145 additions & 0 deletions docs/5/configuration/index.html

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions docs/5/faqs/_payload.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"data":1,"prerenderedAt":3},["Reactive",2],{},1718376604581]
58 changes: 58 additions & 0 deletions docs/5/faqs/index.html

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions docs/5/getting-started/_payload.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"data":1,"prerenderedAt":3},["Reactive",2],{},1718376604582]
98 changes: 98 additions & 0 deletions docs/5/getting-started/index.html

Large diffs are not rendered by default.

58 changes: 58 additions & 0 deletions docs/5/index.html

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions docs/5/node-corepack-npm-pnpm-yarn-tasks/_payload.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"data":1,"prerenderedAt":3},["Reactive",2],{},1718376605670]
146 changes: 146 additions & 0 deletions docs/5/node-corepack-npm-pnpm-yarn-tasks/index.html

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions docs/6/_payload.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"data":1,"prerenderedAt":3},["Reactive",2],{},1718376604588]
1 change: 1 addition & 0 deletions docs/6/configuration/_payload.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"data":1,"prerenderedAt":3},["Reactive",2],{},1718376604585]
136 changes: 136 additions & 0 deletions docs/6/configuration/index.html

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions docs/6/faqs/_payload.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"data":1,"prerenderedAt":3},["Reactive",2],{},1718376604586]
58 changes: 58 additions & 0 deletions docs/6/faqs/index.html

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions docs/6/getting-started/_payload.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"data":1,"prerenderedAt":3},["Reactive",2],{},1718376604586]
98 changes: 98 additions & 0 deletions docs/6/getting-started/index.html

Large diffs are not rendered by default.

58 changes: 58 additions & 0 deletions docs/6/index.html

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions docs/6/node-corepack-npm-pnpm-yarn-tasks/_payload.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"data":1,"prerenderedAt":3},["Reactive",2],{},1718376605656]
156 changes: 156 additions & 0 deletions docs/6/node-corepack-npm-pnpm-yarn-tasks/index.html

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions docs/7/_payload.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"data":1,"prerenderedAt":3},["Reactive",2],{},1718376604592]
1 change: 1 addition & 0 deletions docs/7/configuration/_payload.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"data":1,"prerenderedAt":3},["Reactive",2],{},1718376604589]
130 changes: 130 additions & 0 deletions docs/7/configuration/index.html

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions docs/7/faqs/_payload.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"data":1,"prerenderedAt":3},["Reactive",2],{},1718376604590]
58 changes: 58 additions & 0 deletions docs/7/faqs/index.html

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions docs/7/getting-started/_payload.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"data":1,"prerenderedAt":3},["Reactive",2],{},1718376604591]
100 changes: 100 additions & 0 deletions docs/7/getting-started/index.html

Large diffs are not rendered by default.

59 changes: 59 additions & 0 deletions docs/7/index.html

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions docs/7/node-corepack-npm-pnpm-yarn-tasks/_payload.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"data":1,"prerenderedAt":3},["Reactive",2],{},1718376604592]
165 changes: 165 additions & 0 deletions docs/7/node-corepack-npm-pnpm-yarn-tasks/index.html

Large diffs are not rendered by default.

File renamed without changes.
1 change: 0 additions & 1 deletion docs/_nuxt/0015224.js

This file was deleted.

1 change: 0 additions & 1 deletion docs/_nuxt/06dbd75.js

This file was deleted.

1 change: 0 additions & 1 deletion docs/_nuxt/07582e9.js

This file was deleted.

1 change: 0 additions & 1 deletion docs/_nuxt/08c6b9f.js

This file was deleted.

1 change: 0 additions & 1 deletion docs/_nuxt/09792ce.js

This file was deleted.

1 change: 0 additions & 1 deletion docs/_nuxt/10fc040.js

This file was deleted.

1 change: 0 additions & 1 deletion docs/_nuxt/1169a30.js

This file was deleted.

1 change: 0 additions & 1 deletion docs/_nuxt/130f25e.js

This file was deleted.

Loading

0 comments on commit 9464fd2

Please sign in to comment.