Skip to content

Commit 3866901

Browse files
committed
fix: build
1 parent 6dd4f79 commit 3866901

File tree

2 files changed

+26
-20
lines changed

2 files changed

+26
-20
lines changed

frontend/build.gradle

+20-20
Original file line numberDiff line numberDiff line change
@@ -19,48 +19,48 @@ version = '0.0.1-SNAPSHOT'
1919

2020
task cleanAngular {
2121
if(project.hasProperty('withAngular')) {
22-
logger.info('Task cleanAngular')
22+
println('Task cleanAngular')
2323
delete('src/angular/node_modules')
2424
}
2525
}
2626

27-
task buildAngular {
28-
if(project.hasProperty('withAngular')) {
29-
providers.exec {
30-
logger.info('Task buildAngular - npm install')
31-
workingDir 'src/angular'
27+
task buildAngular(type:Exec) {
28+
if(project.hasProperty('withAngular')) {
29+
exec{
30+
println('Task buildAngular - npm install')
31+
workingDir 'src/angular'
3232
if (System.getProperty("os.name").toUpperCase().contains("WINDOWS")){
33-
commandLine('npm.cmd', 'install')
33+
commandLine 'npm.cmd', 'install'
3434
} else {
35-
commandLine('npm', 'install')
35+
commandLine 'npm', 'install'
3636
}
3737
}
38-
providers.exec {
39-
logger.info('Task buildAngular - npm run build')
38+
exec {
39+
println('Task buildAngular - npm run build')
4040
workingDir 'src/angular'
4141
if (System.getProperty("os.name").toUpperCase().contains("WINDOWS")){
42-
commandLine('npm.cmd', 'run', 'build')
42+
commandLine 'npm.cmd', 'run', 'build'
4343
} else {
44-
commandLine('npm', 'run', 'build')
44+
commandLine 'npm', 'run', 'build'
4545
}
4646
}
4747
}
4848
}
4949

50-
task testAngular {
50+
task testAngular(type:Exec) {
5151
if(project.hasProperty('withAngular')) {
52-
providers.exec {
52+
exec {
5353
workingDir 'src/angular'
5454
if (System.getProperty("os.name").toUpperCase().contains("WINDOWS")){
55-
logger.info('Task buildAngular - npm run test')
56-
commandLine('npm.cmd', 'run', 'test')
55+
println('Task buildAngular - npm run test')
56+
commandLine 'npm.cmd', 'run', 'test'
5757
} else {
5858
if(project.hasProperty("useChromium")) {
59-
logger.info('Task buildAngular - npm run test-chromium')
60-
commandLine('npm', 'run', 'test-chromium')
59+
println('Task buildAngular - npm run test-chromium')
60+
commandLine 'npm', 'run', 'test-chromium'
6161
} else {
62-
logger.info('Task buildAngular - npm run test')
63-
commandLine('npm', 'run', 'test')
62+
println('Task buildAngular - npm run test')
63+
commandLine 'npm', 'run', 'test'
6464
}
6565
}
6666
}

frontend/package-lock.json

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)