diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aceceb9e..c6392776 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,11 +42,11 @@ jobs: with: fetch-depth: 1 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: distribution: temurin - java-version: '11' + java-version: '17' architecture: x64 - name: Cache Gradle's cache and wrapper diff --git a/README.md b/README.md index 46ff13fb..f07ceee2 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Latest release 7.0.0 License Apache 2.0
- Build status + Build status Quality gate status Code coverage Reliability diff --git a/examples/application-with-preinstalled-nodejs-distribution/build.gradle.kts b/examples/application-with-preinstalled-nodejs-distribution/build.gradle.kts index 771264b7..301292c6 100644 --- a/examples/application-with-preinstalled-nodejs-distribution/build.gradle.kts +++ b/examples/application-with-preinstalled-nodejs-distribution/build.gradle.kts @@ -2,7 +2,7 @@ import org.siouan.frontendgradleplugin.infrastructure.gradle.RunNode import org.siouan.frontendgradleplugin.infrastructure.gradle.RunNpm plugins { - id("org.siouan.frontend-jdk11") + id("org.siouan.frontend-jdk17") } //val preinstalledNodeDistributionDirectory = file(); diff --git a/examples/application-with-preinstalled-nodejs-distribution/settings.gradle.kts b/examples/application-with-preinstalled-nodejs-distribution/settings.gradle.kts index 00e80057..855fbf19 100644 --- a/examples/application-with-preinstalled-nodejs-distribution/settings.gradle.kts +++ b/examples/application-with-preinstalled-nodejs-distribution/settings.gradle.kts @@ -1,5 +1,5 @@ pluginManagement { plugins { - id("org.siouan.frontend-jdk11") version "7.0.0" + id("org.siouan.frontend-jdk17") version "7.0.0" } } diff --git a/examples/fullstack-war-application/frontend/build.gradle.kts b/examples/fullstack-war-application/frontend/build.gradle.kts index 1da0614a..08a39969 100644 --- a/examples/fullstack-war-application/frontend/build.gradle.kts +++ b/examples/fullstack-war-application/frontend/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("org.siouan.frontend-jdk11") + id("org.siouan.frontend-jdk17") } frontend { diff --git a/examples/fullstack-war-application/settings.gradle.kts b/examples/fullstack-war-application/settings.gradle.kts index 17a0b91e..89f85ed7 100644 --- a/examples/fullstack-war-application/settings.gradle.kts +++ b/examples/fullstack-war-application/settings.gradle.kts @@ -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-jdk11") version "7.0.0" + id("org.siouan.frontend-jdk17") version "7.0.0" } } diff --git a/examples/multiple-package-managers-with-shared-nodejs-distribution/node-subproject/build.gradle.kts b/examples/multiple-package-managers-with-shared-nodejs-distribution/node-subproject/build.gradle.kts index 6fbe841f..afdc1a37 100644 --- a/examples/multiple-package-managers-with-shared-nodejs-distribution/node-subproject/build.gradle.kts +++ b/examples/multiple-package-managers-with-shared-nodejs-distribution/node-subproject/build.gradle.kts @@ -1,7 +1,7 @@ import org.siouan.frontendgradleplugin.infrastructure.gradle.RunNode plugins { - id("org.siouan.frontend-jdk11") + id("org.siouan.frontend-jdk17") } frontend { diff --git a/examples/multiple-package-managers-with-shared-nodejs-distribution/npm-6-subproject/build.gradle.kts b/examples/multiple-package-managers-with-shared-nodejs-distribution/npm-6-subproject/build.gradle.kts index 6414fbd6..072de7b2 100644 --- a/examples/multiple-package-managers-with-shared-nodejs-distribution/npm-6-subproject/build.gradle.kts +++ b/examples/multiple-package-managers-with-shared-nodejs-distribution/npm-6-subproject/build.gradle.kts @@ -2,7 +2,7 @@ import org.siouan.frontendgradleplugin.infrastructure.gradle.ResolvePackageManag import org.siouan.frontendgradleplugin.infrastructure.gradle.RunNpm plugins { - id("org.siouan.frontend-jdk11") + id("org.siouan.frontend-jdk17") } frontend { diff --git a/examples/multiple-package-managers-with-shared-nodejs-distribution/npm-9-subproject/build.gradle.kts b/examples/multiple-package-managers-with-shared-nodejs-distribution/npm-9-subproject/build.gradle.kts index a5bcb3bb..4ef330d3 100644 --- a/examples/multiple-package-managers-with-shared-nodejs-distribution/npm-9-subproject/build.gradle.kts +++ b/examples/multiple-package-managers-with-shared-nodejs-distribution/npm-9-subproject/build.gradle.kts @@ -2,7 +2,7 @@ import org.siouan.frontendgradleplugin.infrastructure.gradle.ResolvePackageManag import org.siouan.frontendgradleplugin.infrastructure.gradle.RunNpm plugins { - id("org.siouan.frontend-jdk11") + id("org.siouan.frontend-jdk17") } frontend { diff --git a/examples/multiple-package-managers-with-shared-nodejs-distribution/pnpm-6-subproject/build.gradle.kts b/examples/multiple-package-managers-with-shared-nodejs-distribution/pnpm-6-subproject/build.gradle.kts index 113db518..aad53c3f 100644 --- a/examples/multiple-package-managers-with-shared-nodejs-distribution/pnpm-6-subproject/build.gradle.kts +++ b/examples/multiple-package-managers-with-shared-nodejs-distribution/pnpm-6-subproject/build.gradle.kts @@ -2,7 +2,7 @@ import org.siouan.frontendgradleplugin.infrastructure.gradle.ResolvePackageManag import org.siouan.frontendgradleplugin.infrastructure.gradle.RunPnpm plugins { - id("org.siouan.frontend-jdk11") + id("org.siouan.frontend-jdk17") } frontend { diff --git a/examples/multiple-package-managers-with-shared-nodejs-distribution/pnpm-8-subproject/build.gradle.kts b/examples/multiple-package-managers-with-shared-nodejs-distribution/pnpm-8-subproject/build.gradle.kts index 43eb0e09..0e59c4fe 100644 --- a/examples/multiple-package-managers-with-shared-nodejs-distribution/pnpm-8-subproject/build.gradle.kts +++ b/examples/multiple-package-managers-with-shared-nodejs-distribution/pnpm-8-subproject/build.gradle.kts @@ -2,7 +2,7 @@ import org.siouan.frontendgradleplugin.infrastructure.gradle.ResolvePackageManag import org.siouan.frontendgradleplugin.infrastructure.gradle.RunPnpm plugins { - id("org.siouan.frontend-jdk11") + id("org.siouan.frontend-jdk17") } frontend { diff --git a/examples/multiple-package-managers-with-shared-nodejs-distribution/settings.gradle.kts b/examples/multiple-package-managers-with-shared-nodejs-distribution/settings.gradle.kts index 64697631..bf3a0edc 100644 --- a/examples/multiple-package-managers-with-shared-nodejs-distribution/settings.gradle.kts +++ b/examples/multiple-package-managers-with-shared-nodejs-distribution/settings.gradle.kts @@ -1,6 +1,6 @@ pluginManagement { plugins { - id("org.siouan.frontend-jdk11") version "7.0.0" + id("org.siouan.frontend-jdk17") version "7.0.0" } } diff --git a/examples/multiple-package-managers-with-shared-nodejs-distribution/yarn-1-subproject/build.gradle.kts b/examples/multiple-package-managers-with-shared-nodejs-distribution/yarn-1-subproject/build.gradle.kts index c4b689b6..d1f5c26c 100644 --- a/examples/multiple-package-managers-with-shared-nodejs-distribution/yarn-1-subproject/build.gradle.kts +++ b/examples/multiple-package-managers-with-shared-nodejs-distribution/yarn-1-subproject/build.gradle.kts @@ -2,7 +2,7 @@ import org.siouan.frontendgradleplugin.infrastructure.gradle.ResolvePackageManag import org.siouan.frontendgradleplugin.infrastructure.gradle.RunYarn plugins { - id("org.siouan.frontend-jdk11") + id("org.siouan.frontend-jdk17") } frontend { diff --git a/examples/multiple-package-managers-with-shared-nodejs-distribution/yarn-3-subproject/build.gradle.kts b/examples/multiple-package-managers-with-shared-nodejs-distribution/yarn-3-subproject/build.gradle.kts index 86775517..bda0f7ba 100644 --- a/examples/multiple-package-managers-with-shared-nodejs-distribution/yarn-3-subproject/build.gradle.kts +++ b/examples/multiple-package-managers-with-shared-nodejs-distribution/yarn-3-subproject/build.gradle.kts @@ -2,7 +2,7 @@ import org.siouan.frontendgradleplugin.infrastructure.gradle.ResolvePackageManag import org.siouan.frontendgradleplugin.infrastructure.gradle.RunYarn plugins { - id("org.siouan.frontend-jdk11") + id("org.siouan.frontend-jdk17") } frontend { diff --git a/examples/npm-application/build.gradle.kts b/examples/npm-application/build.gradle.kts index b5526bf1..57442d8b 100644 --- a/examples/npm-application/build.gradle.kts +++ b/examples/npm-application/build.gradle.kts @@ -3,7 +3,7 @@ import kotlin.io.path.Path import org.siouan.frontendgradleplugin.infrastructure.gradle.InstallFrontendTask plugins { - id("org.siouan.frontend-jdk11") + id("org.siouan.frontend-jdk17") } frontend { diff --git a/examples/npm-application/settings.gradle.kts b/examples/npm-application/settings.gradle.kts index 00e80057..855fbf19 100644 --- a/examples/npm-application/settings.gradle.kts +++ b/examples/npm-application/settings.gradle.kts @@ -1,5 +1,5 @@ pluginManagement { plugins { - id("org.siouan.frontend-jdk11") version "7.0.0" + id("org.siouan.frontend-jdk17") version "7.0.0" } } diff --git a/examples/pnpm-application/build.gradle.kts b/examples/pnpm-application/build.gradle.kts index 23c3626c..2bb0dfb3 100644 --- a/examples/pnpm-application/build.gradle.kts +++ b/examples/pnpm-application/build.gradle.kts @@ -3,7 +3,7 @@ import kotlin.io.path.Path import org.siouan.frontendgradleplugin.infrastructure.gradle.InstallFrontendTask plugins { - id("org.siouan.frontend-jdk11") + id("org.siouan.frontend-jdk17") } frontend { diff --git a/examples/pnpm-application/settings.gradle.kts b/examples/pnpm-application/settings.gradle.kts index 00e80057..855fbf19 100644 --- a/examples/pnpm-application/settings.gradle.kts +++ b/examples/pnpm-application/settings.gradle.kts @@ -1,5 +1,5 @@ pluginManagement { plugins { - id("org.siouan.frontend-jdk11") version "7.0.0" + id("org.siouan.frontend-jdk17") version "7.0.0" } } diff --git a/examples/yarn-application-with-node-modules-linker/build.gradle.kts b/examples/yarn-application-with-node-modules-linker/build.gradle.kts index ec84700c..50e3785f 100644 --- a/examples/yarn-application-with-node-modules-linker/build.gradle.kts +++ b/examples/yarn-application-with-node-modules-linker/build.gradle.kts @@ -3,7 +3,7 @@ import kotlin.io.path.Path import org.siouan.frontendgradleplugin.infrastructure.gradle.InstallFrontendTask plugins { - id("org.siouan.frontend-jdk11") + id("org.siouan.frontend-jdk17") } frontend { diff --git a/examples/yarn-application-with-node-modules-linker/settings.gradle.kts b/examples/yarn-application-with-node-modules-linker/settings.gradle.kts index 00e80057..855fbf19 100644 --- a/examples/yarn-application-with-node-modules-linker/settings.gradle.kts +++ b/examples/yarn-application-with-node-modules-linker/settings.gradle.kts @@ -1,5 +1,5 @@ pluginManagement { plugins { - id("org.siouan.frontend-jdk11") version "7.0.0" + id("org.siouan.frontend-jdk17") version "7.0.0" } } diff --git a/examples/yarn-application-with-pnp-linker/build.gradle.kts b/examples/yarn-application-with-pnp-linker/build.gradle.kts index 799122aa..71e5337d 100644 --- a/examples/yarn-application-with-pnp-linker/build.gradle.kts +++ b/examples/yarn-application-with-pnp-linker/build.gradle.kts @@ -3,7 +3,7 @@ import kotlin.io.path.Path import org.siouan.frontendgradleplugin.infrastructure.gradle.InstallFrontendTask plugins { - id("org.siouan.frontend-jdk11") + id("org.siouan.frontend-jdk17") } frontend { diff --git a/examples/yarn-application-with-pnp-linker/settings.gradle.kts b/examples/yarn-application-with-pnp-linker/settings.gradle.kts index 00e80057..855fbf19 100644 --- a/examples/yarn-application-with-pnp-linker/settings.gradle.kts +++ b/examples/yarn-application-with-pnp-linker/settings.gradle.kts @@ -1,5 +1,5 @@ pluginManagement { plugins { - id("org.siouan.frontend-jdk11") version "7.0.0" + id("org.siouan.frontend-jdk17") version "7.0.0" } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e5832..c1962a79 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1f017e4e..8707e8b5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index a69d9cb6..aeb74cbb 100644 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -143,12 +140,16 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then done fi + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + # Collect all arguments for the java command; # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in diff --git a/gradlew.bat b/gradlew.bat index f127cfd4..93e3f59f 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts index eed2156e..d79548a9 100644 --- a/plugin/build.gradle.kts +++ b/plugin/build.gradle.kts @@ -27,8 +27,8 @@ version = fgpVersion description = fgpDescription java { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 withJavadocJar() withSourcesJar() } @@ -77,6 +77,13 @@ tasks.named("wrapper") { tasks.withType { useJUnitPlatform() outputs.upToDateWhen { false } + jvmArgs( + "--add-opens", "java.base/java.lang=ALL-UNNAMED", + "--add-opens", "java.base/java.util=ALL-UNNAMED" + ) + distribution { + enabled.set(true) + } } tasks.register("integrationTest") { @@ -140,7 +147,7 @@ sonarqube { property("sonar.organization", "siouan") property("sonar.projectKey", "siouan_frontend-gradle-plugin") property("sonar.projectName", "frontend-gradle-plugin") - property("sonar.projectVersion", "${fgpVersion}-jdk11") + property("sonar.projectVersion", "${fgpVersion}-jdk17") property("sonar.links.homepage", "https://github.com/siouan/frontend-gradle-plugin") property("sonar.links.ci", "https://travis-ci.com/siouan/frontend-gradle-plugin") diff --git a/plugin/buildSrc/build.gradle.kts b/plugin/buildSrc/build.gradle.kts index a44afdf1..39f9584b 100644 --- a/plugin/buildSrc/build.gradle.kts +++ b/plugin/buildSrc/build.gradle.kts @@ -7,6 +7,6 @@ dependencies { } java { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } diff --git a/plugin/gradle.properties b/plugin/gradle.properties index e381490f..8973ce7e 100644 --- a/plugin/gradle.properties +++ b/plugin/gradle.properties @@ -1,4 +1,4 @@ -fgpArtifactId=frontend-jdk11 +fgpArtifactId=frontend-jdk17 fgpGroup=org.siouan fgpVersion=7.0.0 fgpDisplayName=Frontend Gradle plugin diff --git a/plugin/src/intTest/java/org/siouan/frontendgradleplugin/test/GradleBuildFiles.java b/plugin/src/intTest/java/org/siouan/frontendgradleplugin/test/GradleBuildFiles.java index 849ad207..42fe224d 100644 --- a/plugin/src/intTest/java/org/siouan/frontendgradleplugin/test/GradleBuildFiles.java +++ b/plugin/src/intTest/java/org/siouan/frontendgradleplugin/test/GradleBuildFiles.java @@ -114,7 +114,7 @@ public static void createBuildFile(final Path projectDirectory, final boolean pl final String additionalContent) throws IOException { final Set pluginsWithFrontend = new HashSet<>(plugins); if (pluginEnabled) { - pluginsWithFrontend.add("id 'org.siouan.frontend-jdk11' apply " + pluginApplied); + pluginsWithFrontend.add("id 'org.siouan.frontend-jdk17' apply " + pluginApplied); } createBuildFile(projectDirectory, pluginsWithFrontend, properties, additionalContent); } diff --git a/plugin/src/intTest/java/org/siouan/frontendgradleplugin/test/GradleHelper.java b/plugin/src/intTest/java/org/siouan/frontendgradleplugin/test/GradleHelper.java index 486e654b..8c6d0ed5 100644 --- a/plugin/src/intTest/java/org/siouan/frontendgradleplugin/test/GradleHelper.java +++ b/plugin/src/intTest/java/org/siouan/frontendgradleplugin/test/GradleHelper.java @@ -19,7 +19,7 @@ */ public final class GradleHelper { - private static final String MINIMAL_GRADLE_VERSION = "6.1"; + private static final String MINIMAL_GRADLE_VERSION = "7.3"; private GradleHelper() { } diff --git a/site/build.gradle.kts b/site/build.gradle.kts index 48ee03dc..4cc85bd8 100644 --- a/site/build.gradle.kts +++ b/site/build.gradle.kts @@ -4,12 +4,12 @@ buildscript { } dependencies { - classpath("org.siouan", "frontend-jdk11", "7.0.0") + classpath("org.siouan", "frontend-jdk17", "7.0.0") } } plugins { - id("org.siouan.frontend-jdk11") + id("org.siouan.frontend-jdk17") } frontend { diff --git a/site/src/pages/getting-started.vue b/site/src/pages/getting-started.vue index e66ba926..11dc09bc 100644 --- a/site/src/pages/getting-started.vue +++ b/site/src/pages/getting-started.vue @@ -7,8 +7,8 @@ The following tools must be installed to use the plugin:

    -
  • 6.1+
    • -
  • JDK 11+ 64 bits
    • +
  • 7.3+ and JDK 17 build
    • +
  • 6.1+ and JDK 11 build

The plugin is built and tested on Linux, Mac OS, Windows (see the list of build environments used in @@ -38,12 +38,16 @@ @@ -77,11 +85,15 @@ apply plugin: 'org.siouan.frontend-jdk11' url = uri("https://plugins.gradle.org/m2/") } dependencies { + // For JDK 17+ + classpath("org.siouan:frontend-gradle-plugin-jdk17:7.0.0") // For JDK 11+ classpath("org.siouan:frontend-gradle-plugin-jdk11:7.0.0") } } +// For JDK 17+ +apply(plugin = "org.siouan.frontend-jdk17") // For JDK 11+ apply(plugin = "org.siouan.frontend-jdk11")