Skip to content

Commit

Permalink
Upgrade to frontend plugin 8.0.0
Browse files Browse the repository at this point in the history
This fixes a yarn install issue we were having with 6.0.0 not respecting the version of yarn specified. The new version of the plugin requires JDK 17, so upgrades the CI build to 17.
  • Loading branch information
shakuzen committed Oct 24, 2023
1 parent c641408 commit 693c23a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ jobs:
- name: Setup java
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '8'
distribution: 'liberica'
java-version: '17'
- name: Cache local Maven repository
uses: actions/cache@v3
with:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,5 @@ node/

build/
.yarnrc.yml

.frontend-gradle-plugin/
8 changes: 2 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ buildscript {
classpath 'gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.16.1'
classpath 'io.spring.nohttp:nohttp-gradle:0.0.11'
classpath 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.39'
classpath 'org.siouan:frontend-gradle-plugin-jdk8:6.0.0'
classpath 'org.siouan:frontend-jdk17:8.0.0'

constraints {
classpath('org.ow2.asm:asm:7.3.1') {
Expand Down Expand Up @@ -158,12 +158,10 @@ subprojects {
}
}

apply plugin: 'org.siouan.frontend-jdk8'
apply plugin: 'org.siouan.frontend-jdk17'

frontend {
nodeVersion = '16.16.0'
yarnEnabled = true
yarnVersion = '3.2.1'
assembleScript = 'run build'
cleanScript = 'run clean'
publishScript = 'run deploy'
Expand Down Expand Up @@ -203,8 +201,6 @@ tasks.register('yarnUpgrade', RunYarn) {
script = 'run upgrade'
}

installYarnGlobally.dependsOn("setupYarnRc")

[assembleFrontend, checkFrontend, yarnStart].each {
it.dependsOn(":samples:build", ":docs-util:generateCoalescedAdocs")
}
Expand Down

0 comments on commit 693c23a

Please sign in to comment.