Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gradle plugin version updates for npm setup updates and removal of yarn tasks #922

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ windowsProteomicsBinariesVersion=1.0
# The current version numbers for the gradle plugins.
artifactoryPluginVersion=5.2.5
gradleNodePluginVersion=7.1.0
gradlePluginsVersion=5.0.0
gradlePluginsVersion=5.1.0-npmSetupUpdates-SNAPSHOT
owaspDependencyCheckPluginVersion=11.0.0
versioningPluginVersion=1.1.2

Expand Down
8 changes: 0 additions & 8 deletions server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -228,12 +228,4 @@ else
}
}

// We add this configuration here so we have a single location to link to for the npm and node executables.
// Each project that requires node will have its own downloaded version of node and npm, but for the symlinkNode
// task we need a single location, and one that works even when not building from source (Issue 35207)
project.node {
workDir = BuildUtils.getRootBuildDirFile(project, ".node")
npmWorkDir = BuildUtils.getRootBuildDirFile(project, ".node")
yarnWorkDir = BuildUtils.getRootBuildDirFile(project, ".node")
}
project.tasks.named('deployApp').configure { dependsOn(project.tasks.npmSetup) }
7 changes: 7 additions & 0 deletions server/minification/build.gradle
Original file line number Diff line number Diff line change
@@ -1 +1,8 @@

apply plugin: 'org.labkey.build.npmRun'

project.node {
download = true
workDir = project.file(".gradle/nodejs")
npmWorkDir = project.file(".gradle/npm")
}