From a4842de29e34e876bdf838305b248a1503688475 Mon Sep 17 00:00:00 2001 From: Jonathan Bernard Date: Sat, 23 Jul 2016 23:14:14 -0500 Subject: [PATCH] Build process updates for Spike Wars. --- .gitignore | 1 + spike-wars/.flowconfig | 7 +++++++ spike-wars/build.gradle | 22 ++++++---------------- 3 files changed, 14 insertions(+), 16 deletions(-) create mode 100644 spike-wars/.flowconfig diff --git a/.gitignore b/.gitignore index 7fa4805..a0548f9 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ gorillas.css.map node_modules/ bower_components/ .gradle/ +build/ diff --git a/spike-wars/.flowconfig b/spike-wars/.flowconfig new file mode 100644 index 0000000..4a58bdc --- /dev/null +++ b/spike-wars/.flowconfig @@ -0,0 +1,7 @@ +[ignore] + +[include] + +[libs] + +[options] diff --git a/spike-wars/build.gradle b/spike-wars/build.gradle index b23ac2b..8cdd264 100644 --- a/spike-wars/build.gradle +++ b/spike-wars/build.gradle @@ -14,8 +14,8 @@ plugins { id "com.moowork.node" version "0.11" } -group = "" -version = "" +group = "com.jdbernard" +version = "1.0.0" task clean( group: 'build', @@ -36,20 +36,10 @@ task compileScss( group: 'build', description: 'Compile SCSS files into CSS.', type: Exec) { - inputs.dir("src/main/scss") + inputs.file("src/main/scss/spike-wars.scss") outputs.dir("build/webroot/css") executable "scss" - args "--update", "src/main/scss:build/webroot/css", "-I", "src/main/scss-lib", "-t", "compressed" -} - -task esLint( - group: 'check', - description: 'Run ESLint on JavaScript sources.', - dependsOn: npmInstall, - type: NodeTask) { - inputs.dir("src/main/js") - script = file('node_modules/eslint/bin/eslint') - args = ["src/main/js"] + args "--update", "src/main/scss/spike-wars.scss:build/webroot/css/spike-wars-${version}.css", "-I", "src/main/scss-lib", "-t", "compressed" } task bowerInstall( @@ -72,7 +62,7 @@ task flowCheck( task browserify( group: 'build', - dependsOn: npmInstall, + dependsOn: [npmInstall, flowCheck], type: NodeTask) { inputs.dir('src/main/js/${project.name}.js') @@ -133,7 +123,7 @@ task copyResources( task compile( group: 'build', description: 'Compile all webapp resources', - dependsOn: [jsHint, copyResources, compileScss, browserify, minifyJavaScript, compileHtml]) + dependsOn: [copyResources, compileScss, browserify, minifyJavaScript, compileHtml]) task assemble( group: 'build',