Skip to content

Commit

Permalink
Merge pull request #7 from AtlasOfLivingAustralia/dev
Browse files Browse the repository at this point in the history
Merging v1.1-SNAPSHOT
  • Loading branch information
chrisala authored Sep 28, 2018
2 parents 887244f + 84d1f66 commit 6da044b
Show file tree
Hide file tree
Showing 160 changed files with 52,887 additions and 404 deletions.
13 changes: 13 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,16 @@

# "temporary" build files
/target

# IntelliJ IDEA configuration
/.idea
/*.iml
/.classpath
/.project

# npm installed modules
/node_modules

# spring loaded cache for debugging
/.slcache

9 changes: 8 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,22 @@ branches:
only:
- master
- dev
- biocollect-merge
- issue-1499
before_install:
- rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install $TRAVIS_NODE_VERSION
- wget -q https://raw.githubusercontent.com/AtlasOfLivingAustralia/travis-build-configuration/master/ala_common.sh
- chmod +x ala_common.sh
- source ./ala_common.sh
- ala_travis_grails_setup_env
before_script:
- npm install
- npm run-script package-turf
script:
- node_modules/karma/bin/karma start karma.conf.js --single-run --browsers PhantomJS
- grails -Dgeb.env=phantomjs test-app -clover.on --non-interactive --stacktrace
- ala_travis_grails_build
env:
global:
- TRAVIS_NODE_VERSION="10.8.0"
- secure: APIxsQqe4M4rIPwU1wKwq6DabQ+CrFu2onzp9k8R9Bv0InewxUf0eOWsp8Xl2m3/Lh7IgUkxI5GbuBvZm/j3NRCkA+VuHBSbA1qUu9aDkUQrtyHzkoe+Uk9Ze0QO22O7//WtbtH/bqgvbagCUk1W5sL6h2aL081td760DY+h+D43XvegqFTSE2mWLvZDD7gz3Lw982LLn7DwQhVOAws+h3fXhydRtqSU+ig6SAr1lzhVyrRLFLAqh1V3canZXh1RKZ28aRwEYUxnVi4kVvH254ogx++bL81pmMfatcebsXUCuAfc6FS1m/QGz6wyqdKO0mZIsAavWmtoKBEbzwNMBS0fZVuW9rslRdJd+K+vQOhigTaWyqj7MlfdY7o99y+trcQECvPGDlw0eYThpeRZK1h1r1auOuSZ46FiXRsWtiSQ3f6GQSRERXiKczvlSqZlNWiWswcNtOS60QvMDdRKa2RRLPrtgPNuG/BnHdaH197riTa74jOW3pgjRZTJyT5aRkHTdZS4l1B/JWjZBwY9yjukfwtFql4HHf8o7jtbTUSXqWt80fwlxXQBEcXxKJzn1vpnEpydS/GeftDFOCXfEFZpM+z6ben3Ti5PufjYfX1Emb6ZwEb/IDhYeCK/xTZlvqxbDgepLqeMiuV+CeHo0NBcu3qnORQMiTZCdEs1hFU=
- secure: ufGvrU/vc0XQ8dbcx9ER4eb8MQloeVvC8ToQrwh3T5WUN4CbnugJ2EcSqoGAsXSZ2VUqE8NmdN2VfCQ6KxAtWKvNNxoe1M33DMgS1hRLWOa934Z7+cZ9RlclW29WGi9C4zpPMd4rJdeGyQMr+q4+TZWuk/I48DXRKyWv3FM4t68F52Jlr0wagWPr1oFJScjzJmmAPReJivF8g49d24rE9G2x04PYy/yCOmgiqUuYhArYKmqdquQL2X/SF4ifFpFIADKw9K6Ari48JskwXweuDCzrvHnj7xeDkDt9uiIpe85nf+th9MmS5NOX4nIod8y6NJyTdflD/k1vVRSLILtu21PXXnn7SpuLpS3FuSh4tKjEO3wZrndFiVqMobv7DaYkxshldRMkNHqeyZUThl2H4hskk2BkK/DaHwPg/JDdlyk8MmaN7LJEezmGhIEtZiEm62NVKU5vGDUB2UmyFEhI4UjcIrfyGR77P5xTW4iBHagP10qqMNrNZ8CkaugfuefI9PCK+nt7YuvP1s+AV05TKNrO7QFFw7+6k5Stv+kJb/k6Vfs4hUCM0Uhv01oYr3dZa9s+Sra/BS2mkmdurNcp0s4AZg4HbXcd03dCfA7dF5EVS2pObVViWy8CDUREc2XMWYKxdwals17Q8O7SjSHHzngXX7Jj0lw1EKQQtgoyb6g=
2 changes: 1 addition & 1 deletion EcodataClientPluginGrailsPlugin.groovy
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
class EcodataClientPluginGrailsPlugin {
// the plugin version
def version = "1.0.4"
def version = "1.1-SNAPSHOT"
// the version or versions of Grails the plugin is designed for
def grailsVersion = "2.4 > *"
// resources that are excluded from plugin packaging
Expand Down
Loading

0 comments on commit 6da044b

Please sign in to comment.