From 2d5929fc975c431c8a545a44115cdbb57e0e0689 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Thu, 13 Feb 2020 01:04:45 +0300 Subject: Yarn -> NPM --- build.gradle | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle index 36e1857a..72a1a40c 100644 --- a/build.gradle +++ b/build.gradle @@ -45,25 +45,25 @@ apply plugin: 'org.springframework.boot' apply plugin: 'io.github.swagger2markup' apply plugin: 'org.asciidoctor.convert' -task yarn(type: Exec) { - inputs.file('yarn.lock') - outputs.file('yarn.lock') +task npm(type: Exec) { + inputs.file('package-lock.json') + outputs.file('package-lock.json') if (DefaultNativePlatform.getCurrentOperatingSystem().isWindows()) { - commandLine 'cmd', '/c', 'yarn' + commandLine 'cmd', '/c', 'npm', 'install' } else { - commandLine 'yarn' + commandLine 'npm', 'install' } } -task yarnCompile(type: Exec) { +task npmCompile(type: Exec) { inputs.files(fileTree('node_modules')) inputs.files(fileTree('src')) inputs.file('webpack.config.js') outputs.dir('src/main/resources/static') if (DefaultNativePlatform.getCurrentOperatingSystem().isWindows()) { - commandLine 'cmd', '/c', 'yarn', 'run', 'compile' + commandLine 'cmd', '/c', 'npm', 'run', 'compile' } else { - commandLine 'yarn', 'run', 'compile' + commandLine 'npm', 'run', 'compile' } } @@ -193,8 +193,8 @@ bootRun { sourceResources sourceSets.main } -yarnCompile.dependsOn 'yarn' -processResources.dependsOn 'yarnCompile' +npmCompile.dependsOn 'npm' +processResources.dependsOn 'npmCompile' sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 -- cgit v1.2.3