Skip to content

Commit

Permalink
Merge branch '9.0-jdk21' into 9.0-jdk17
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/ISSUE_TEMPLATE/bug_report.md
#	.github/ISSUE_TEMPLATE/feature_request.md
#	.github/workflows/build.yml
#	site/src/pages/getting-started.vue
#	site/src/public/sitemap.xml
  • Loading branch information
v1nc3n4 committed Oct 20, 2024
2 parents b7785fc + c895407 commit 56a1370
Show file tree
Hide file tree
Showing 195 changed files with 8,843 additions and 5,755 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 @@ Actual results: ...
- 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]
- Frontend Gradle plugin: [e.g. 9.0.0 JDK 21]

Settings in `build.gradle[.kts]` file:
```groovy
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Explain what you would like the plugin do: ...
- 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]
- Frontend Gradle plugin: [e.g. 9.0.0 JDK 21]

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

steps:
- name: Init Ubuntu environment
if: matrix.os == 'ubuntu-22.04'
if: matrix.os == 'ubuntu-24.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
Expand All @@ -32,13 +32,13 @@ jobs:
- name: Git checkout for source code analysis
uses: actions/checkout@v4
if: matrix.os == 'ubuntu-22.04'
if: matrix.os == 'ubuntu-24.04'
with:
fetch-depth: 0

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

Expand All @@ -61,7 +61,7 @@ jobs:
- name: Cache Sonar's cache
uses: actions/cache@v4
if: matrix.os == 'ubuntu-22.04'
if: matrix.os == 'ubuntu-24.04'
with:
path: |
~/.sonar/cache/
Expand All @@ -71,7 +71,7 @@ jobs:
run: chmod +x gradlew plugin/src/integrationTest/resources/*/bin/*

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

- name: Build plugin on MacOS
Expand All @@ -85,8 +85,11 @@ jobs:
./gradlew :plugin:build --console=plain
- name: Scan source code and test results
if: matrix.os == 'ubuntu-22.04'
if: matrix.os == 'ubuntu-24.04'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: ./gradlew :plugin:sonar --console=plain -Dorg.gradle.jvmargs=-Xmx512m -i

- name: Stop Gradle before caching
run: ./gradlew --stop
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ The project relies on [GitHub Actions][github-actions] to integrate continuously
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.4
- Linux Ubuntu 24.04
- Mac OS 14.5
- Windows Server 2022

Expand Down
22 changes: 21 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<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.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://github.com/siouan/frontend-gradle-plugin/releases/tag/v9.0.0"><img src="https://img.shields.io/badge/Latest%20release-9.0.0-blue.svg" alt="Latest release 9.0.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=8.1-jdk17" alt="Build status"/></a>
Expand Down Expand Up @@ -40,16 +40,35 @@

## Special thanks

### They use this plugin, thanks to these organizations!

<p align="center">
<a href="https://x-road.global/" title="X-Road - Data Exchange Layer"><img src="resources/x-road.png" alt="X-Road logo" height="64" /></a>
&nbsp;&nbsp;&nbsp;&nbsp;
<a href="https://akhq.io/" title="AKHQ - Kafka GUI for Apache Kafka"><img src="resources/akhq.svg" alt="AKHQ logo" height="64" /></a>
&nbsp;&nbsp;&nbsp;&nbsp;
<a href="https://kestra.io/" title="Kestra - Event-driven declarative orchestration platform"><img src="resources/kestra.svg" alt="Kestra logo" height="64"></a>
&nbsp;&nbsp;&nbsp;&nbsp;
<a href="https://egeria-project.org/" title="Egeria - Open Metadata and Governance"><img src="resources/egeria.png" alt="Egeria logo" height="64" /></a>
&nbsp;&nbsp;&nbsp;&nbsp;
<a href="https://serverpackcreator.de/" title="ServerPackCreator - Quick and easy generation of server packs of your favourite Minecraft modpacks"><img src="resources/serverpackcreator.png" alt="ServerPackCreator logo" height="64" /></a>
</p>

### IDE

The plugin is built using [IntelliJ IDEA][intellij-idea], special thanks to [JetBrains][jetbrains] for this amazing
IDE, and their support to this project.

<a href="https://www.jetbrains.com/" title="JetBrains"><img src="resources/jetbrains-logo.svg" alt="JetBrains logo" height="96" /></a>
<a href="https://www.jetbrains.com/idea/" title="IntelliJ IDEA"><img src="resources/intellij-idea-icon.svg" alt="IntelliJ IDEA icon" height="96" /></a>

### Community

With their feedback, plugin improvement is possible. Special thanks to:

@[andreaschiona](https://github.com/andreaschiona),
@[apo1967](https://github.com/apo1967),
@[bric3](https://github.com/bric3),
@[byxor](https://github.com/byxor),
@[ChFlick](https://github.com/ChFlick),
@[ckosloski](https://github.com/ckosloski),
Expand All @@ -73,6 +92,7 @@ With their feedback, plugin improvement is possible. Special thanks to:
@[thebignet](https://github.com/thebignet)
@[tngwoerleij](https://github.com/tngwoerleij),
@[trohr](https://github.com/trohr),
@[t-h-e](https://github.com/t-h-e),
@[xehonk](https://github.com/xehonk)

[contributing]: <CONTRIBUTING.md> (Contributing to this project)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import org.siouan.frontendgradleplugin.infrastructure.gradle.RunNode
import org.siouan.frontendgradleplugin.infrastructure.gradle.RunNpm
import org.siouan.frontendgradleplugin.infrastructure.gradle.RunNodeTaskType
import org.siouan.frontendgradleplugin.infrastructure.gradle.RunNpmTaskType

plugins {
id("org.siouan.frontend-jdk17")
Expand All @@ -16,12 +16,12 @@ frontend {
checkScript.set("run check")
}

tasks.register<RunNode>("nodeVersion") {
tasks.register<RunNodeTaskType>("nodeVersion") {
dependsOn("installNode")
script.set("-v")
}

tasks.register<RunNpm>("npmVersion") {
tasks.register<RunNpmTaskType>("npmVersion") {
dependsOn("installPackageManager")
script.set("-v")
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"private": true,
"packageManager": "npm@9.6.7",
"packageManager": "npm@10.9.0",
"scripts": {
"build": "echo Building frontend",
"check": "echo Checking frontend && npm run lint && npm run test",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pluginManagement {
plugins {
id("org.siouan.frontend-jdk17") version "8.1.0"
id("org.siouan.frontend-jdk17") version "9.0.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
}

frontend {
nodeVersion.set("20.14.0")
nodeVersion.set("20.18.0")
assembleScript.set("run build")
cleanScript.set("run clean")
checkScript.set("run check")
Expand Down
2 changes: 1 addition & 1 deletion examples/fullstack-war-application/frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"private": true,
"packageManager": "npm@9.6.7",
"packageManager": "npm@10.9.0",
"devDependencies": {
"mkdirp": "~3"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/fullstack-war-application/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pluginManagement {
id("war")
id("org.springframework.boot") version "2.7.12"
id("io.spring.dependency-management") version "1.1.0"
id("org.siouan.frontend-jdk17") version "8.1.0"
id("org.siouan.frontend-jdk17") version "9.0.0"
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import org.siouan.frontendgradleplugin.infrastructure.gradle.RunNode
import org.siouan.frontendgradleplugin.infrastructure.gradle.RunNodeTaskType

plugins {
id("org.siouan.frontend-jdk17")
}

frontend {
nodeVersion.set("20.14.0")
nodeVersion.set("20.18.0")
nodeInstallDirectory.set(file(rootProject.ext.get("nodeInstallDirectory")!!))
}

tasks.register<RunNode>("nodeVersion") {
tasks.register<RunNodeTaskType>("nodeVersion") {
dependsOn("installNode")
script.set("--version")
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import org.siouan.frontendgradleplugin.infrastructure.gradle.ResolvePackageManagerTask
import org.siouan.frontendgradleplugin.infrastructure.gradle.RunNpm
import org.siouan.frontendgradleplugin.infrastructure.gradle.RunNpmTaskType

plugins {
id("org.siouan.frontend-jdk17")
Expand All @@ -14,7 +14,7 @@ tasks.named<ResolvePackageManagerTask>("resolvePackageManager") {
dependsOn(":node-subproject:installNode")
}

tasks.register<RunNpm>("npm6Version") {
tasks.register<RunNpmTaskType>("npm6Version") {
dependsOn("installPackageManager")
script.set("--version")
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import org.siouan.frontendgradleplugin.infrastructure.gradle.ResolvePackageManagerTask
import org.siouan.frontendgradleplugin.infrastructure.gradle.RunNpm
import org.siouan.frontendgradleplugin.infrastructure.gradle.RunNpmTaskType

plugins {
id("org.siouan.frontend-jdk17")
Expand All @@ -14,7 +14,7 @@ tasks.named<ResolvePackageManagerTask>("resolvePackageManager") {
dependsOn(":node-subproject:installNode")
}

tasks.register<RunNpm>("npm9Version") {
tasks.register<RunNpmTaskType>("npm9Version") {
dependsOn("installPackageManager")
script.set("--version")
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"private": true,
"packageManager": "npm@9.6.7"
"packageManager": "npm@10.9.0"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import org.siouan.frontendgradleplugin.infrastructure.gradle.ResolvePackageManagerTask
import org.siouan.frontendgradleplugin.infrastructure.gradle.RunPnpm
import org.siouan.frontendgradleplugin.infrastructure.gradle.RunPnpmTaskType

plugins {
id("org.siouan.frontend-jdk17")
Expand All @@ -14,7 +14,7 @@ tasks.named<ResolvePackageManagerTask>("resolvePackageManager") {
dependsOn(":node-subproject:installNode")
}

tasks.register<RunPnpm>("pnpm6Version") {
tasks.register<RunPnpmTaskType>("pnpm6Version") {
dependsOn("installPackageManager")
script.set("--version")
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import org.siouan.frontendgradleplugin.infrastructure.gradle.ResolvePackageManagerTask
import org.siouan.frontendgradleplugin.infrastructure.gradle.RunPnpm
import org.siouan.frontendgradleplugin.infrastructure.gradle.RunPnpmTaskType

plugins {
id("org.siouan.frontend-jdk17")
Expand All @@ -14,7 +14,7 @@ tasks.named<ResolvePackageManagerTask>("resolvePackageManager") {
dependsOn(":node-subproject:installNode")
}

tasks.register<RunPnpm>("pnpm8Version") {
tasks.register<RunPnpmTaskType>("pnpm8Version") {
dependsOn("installPackageManager")
script.set("--version")
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pluginManagement {
plugins {
id("org.siouan.frontend-jdk17") version "8.1.0"
id("org.siouan.frontend-jdk21") version "9.0.0"
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import org.siouan.frontendgradleplugin.infrastructure.gradle.ResolvePackageManagerTask
import org.siouan.frontendgradleplugin.infrastructure.gradle.RunYarn
import org.siouan.frontendgradleplugin.infrastructure.gradle.RunYarnTaskType

plugins {
id("org.siouan.frontend-jdk17")
Expand All @@ -14,7 +14,7 @@ tasks.named<ResolvePackageManagerTask>("resolvePackageManager") {
dependsOn(":node-subproject:installNode")
}

tasks.register<RunYarn>("yarn1Version") {
tasks.register<RunYarnTaskType>("yarn1Version") {
dependsOn("installPackageManager")
script.set("--version")
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import org.siouan.frontendgradleplugin.infrastructure.gradle.ResolvePackageManagerTask
import org.siouan.frontendgradleplugin.infrastructure.gradle.RunYarn
import org.siouan.frontendgradleplugin.infrastructure.gradle.RunYarnTaskType

plugins {
id("org.siouan.frontend-jdk17")
Expand All @@ -14,7 +13,7 @@ tasks.named<Task>("resolvePackageManager") {
dependsOn(":node-subproject:installNode")
}

tasks.register<RunYarn>("yarn3Version") {
tasks.register<RunYarnTaskType>("yarn3Version") {
dependsOn("installPackageManager")
script.set("--version")
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"private": true,
"packageManager": "yarn@3.6.0"
"packageManager": "yarn@4.5.0"
}
2 changes: 1 addition & 1 deletion examples/npm-application/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {
}

frontend {
nodeVersion.set("20.14.0")
nodeVersion.set("20.18.0")
assembleScript.set("run build")
cleanScript.set("run clean")
checkScript.set("run check")
Expand Down
2 changes: 1 addition & 1 deletion examples/npm-application/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"private": true,
"packageManager": "npm@9.6.7",
"packageManager": "npm@10.9.0",
"scripts": {
"build": "echo Building frontend",
"check": "echo Checking frontend && npm run lint && npm run test",
Expand Down
2 changes: 1 addition & 1 deletion examples/npm-application/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pluginManagement {
plugins {
id("org.siouan.frontend-jdk17") version "8.1.0"
id("org.siouan.frontend-jdk17") version "9.0.0"
}
}
2 changes: 1 addition & 1 deletion examples/pnpm-application/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {
}

frontend {
nodeVersion.set("20.14.0")
nodeVersion.set("20.18.0")
assembleScript.set("run build")
cleanScript.set("run clean")
checkScript.set("run check")
Expand Down
2 changes: 1 addition & 1 deletion examples/pnpm-application/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"private": true,
"packageManager": "pnpm@8.6.6",
"packageManager": "pnpm@9.12.0",
"scripts": {
"build": "echo Building frontend",
"check": "echo Checking frontend && pnpm run lint && pnpm run test",
Expand Down
2 changes: 1 addition & 1 deletion examples/pnpm-application/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pluginManagement {
plugins {
id("org.siouan.frontend-jdk17") version "8.1.0"
id("org.siouan.frontend-jdk17") version "9.0.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {
}

frontend {
nodeVersion.set("20.14.0")
nodeVersion.set("20.18.0")
assembleScript.set("run build")
cleanScript.set("run clean")
checkScript.set("run check")
Expand Down
Loading

0 comments on commit 56a1370

Please sign in to comment.