Merge pull request #122 from paxtonhare/enhance_travis

Enhance travis

Author: paxtonhare

.travis.yml

@@ -3,11 +3,9 @@ jdk:
   - oraclejdk8
 sudo: true
 before_install:
-- echo 'America/Los_Angeles' | sudo tee /etc/timezone
-- sudo dpkg-reconfigure --frontend noninteractive tzdata
+  - echo 'America/Los_Angeles' | sudo tee /etc/timezone
+  - sudo dpkg-reconfigure --frontend noninteractive tzdata
 install:
-- env
-- if [ "${TRAVIS_SECURE_ENV_VARS}" = "true" ] ; then ./shared/dev-tasks/travis-install-ml.sh
-  release ; else (exit 0) ; fi
-- if [ "${TRAVIS_SECURE_ENV_VARS}" = "true" ] ; then ./shared/dev-tasks/setup-marklogic.sh
-  ; else (exit 0) ; fi
+  - ./shared/dev-tasks/install-dependencies.sh
+script:
+  - '[ "${TRAVIS_SECURE_ENV_VARS}" = "false" ] && ./gradlew test || ./gradlew jshint'

quick-start/build.gradle

@@ -41,8 +41,9 @@ dependencies {
 javascript.source {
     dev {
         js {
-            srcDir "src/main/resources/static/app"
+            srcDir "src/main/resources/static"
             include "**/*.js"
+            exclude "lib/**/*"
         }
     }
 }
@@ -55,3 +56,6 @@ jshint {
     tasks.jshint.reporter = 'checkstyle'
     options = ["--config":"src/main/resources/static/.jshintrc"]
 }
+
+
+test.dependsOn tasks.jshint

shared/dev-tasks/install-dependencies.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+if [ "${TRAVIS_SECURE_ENV_VARS}" = "true" ] ; then
+  ./shared/dev-tasks/travis-install-ml.sh release
+  ./shared/dev-tasks/setup-marklogic.sh
+fi