Skip to content

Commit e37add0

Browse files
committed
Merge pull request #20 from orkonano/develop
Updating to grails 3.1.4
2 parents a8d3099 + 8866d0a commit e37add0

File tree

5 files changed

+51
-10
lines changed

5 files changed

+51
-10
lines changed

.travis.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
1-
sudo: false
21
language: groovy
3-
2+
sudo: false
3+
jdk:
4+
- oraclejdk7
5+
env:
6+
global:
7+
- secure: RxdKs4qrXJ4wLoqjP2JnLNUPVN8boRPs4LeKj28yAEn9Dgj9Z98DoEa4sVLbCo/9Rk0NvQ0iXzRNYqx0qlkWSNgC4IipP32f9EW1ewcgeiofzipAqLjViwsT38gfPUmEMJkfxh3I1RNr3GqgQtgGN//TZ7PLr1NVTlsxECzcbuY0RKS76QAOqZpAjbaeAczHba/NcOi61FqqZxe3MepOXkwIJguBi1rhNWneQdBHHdIpQ0gpdfu+89thEz0YP4joMlt6MsN4FJ2Zwn6r+UYqmBGpzzQuZ+ed3v5RxQT62gfWcM6KrWYnUnvC+3aVtKwDwbI25ndG4l6u9tf8L689h4XbTDwVjTXySuYcNn4DnPYIX9bYsoXNnn5jO2sl9VJ3eL9kZwi+bXCicqe2DAzIEHPavziPvF85Vf/SDxOKqedpypb07aAUODeFfQoCnK3m9oDqgKOyb311vjZhWyJHYKZZBtBJjHjE1e5JfI6WjtEGMshOyPEKw6EqioM3RSdjiIfa8RPvP2VH0FcGmh8YCOaUtF7AcNAIkwG60wFL/+tgAaxc/SnVzZy1yiqP1xzkcC841qT/11xyu1VWzxqZgXKtdfQPLRaySSLKU7++JASKuwYfyzftQqUkoqKIJ22oag7bxriUVVI8XHCkPQicsW0vvFo9ENIeH1vPXa8QkG8=
8+
- secure: LUib/DRYZYLIy9b0OAf9e+LMSS+eePhbOgdCrEeW7nWuc01oouphwErbwUoNkle1E2fY5f+EpfY2EXOChYpe8qchap8OOsnXlKd8rw7s0SRN0sRt0/EqvHOP5Z5Ud9EqGwazApSXrMYcI10dffvE0S2+xWaTd+Ria22XnuGfpYwf9yU4gRknlm+pHG2nY9/3smWrPz8xDuE+Sspk9ItLRHtXQQJ3QxbpBL1LfD2EfukfZwHG5znVGF+KwfYq2z3gBaVQr75VUQuDJPxSbTbyPnqAjxfw9Fa/jNUsviUt48/5scDl4ZI/VSy5efMxQu9wMPyAwSMg3oGqK3u1WA6W9hwXL1Y8pxyuyQW+Z3m0Bda19oQQWgr7HA3mHxn0XDvJVg2oAn+1za2TloeHsnlgaPFjwJXjKofB3OGcFphJ+8aDvaj5qEZz2fJI4fdy9bAfjP7xUs4+63U44ibXF3zQezOBruiQMHXTO3M0WaBRWWHPRw8HW3Icb+9TTpESUv/9cmqnaAdrYSFywuCgeL7pe1BG8Y6ymhX9LOoDYvTe+3Hh8YzJn+3YwDWIQNvkaRqRLmeruVq5eBibL7y7FcVW4OPVkxqda2s3IWizNQQIN7+hxbdvBO0GmN8vhqOOCKi+0bmB+8X3MB34opVjA8GS6G0SLjynnMXXa8R4bfNhOH0=
49
before_script:
510
- chmod +x gradlew
611
- chmod +x travis-build.sh
12+
- chmod +x travis-publish.sh
713
script: ./travis-build.sh
14+
after_success:
15+
- ./travis-publish.sh
16+
notifications:
17+
slack:
18+
secure: CH8XkPAueZBVF60DaFRAM6ajNiG3mRCBZFlRbNd5Ya1ivPUSKYJQp1jJVoSQizd4EabEbK1/1+dDwBm+OiEoNN3FAzkleC8DZNSh/EjmQT2RArLZrv41dx2RlKkMyB0oF16mN6ivDGQofqDqBNDcWOZGpgnewGMgHMWtEluAOrA=

build.gradle

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,13 @@ plugins {
1515
id "io.spring.dependency-management" version "0.5.4.RELEASE"
1616
}
1717

18-
version "2.0.2"
18+
ext {
19+
mailgunPluginVersion = '2.0.3'
20+
grailsVersion = project.grailsVersion
21+
gradleWrapperVersion = project.gradleWrapperVersion
22+
}
23+
24+
version mailgunPluginVersion
1925
group "org.grails.plugins"
2026

2127
apply plugin: 'maven-publish'
@@ -27,10 +33,6 @@ apply plugin: "org.grails.grails-gsp"
2733
apply plugin: "org.grails.grails-plugin-publish"
2834
apply plugin: "jacoco"
2935

30-
ext {
31-
grailsVersion = project.grailsVersion
32-
gradleWrapperVersion = project.gradleWrapperVersion
33-
}
3436

3537
sourceCompatibility = 1.7
3638
targetCompatibility = 1.7

gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
grailsVersion=3.1.1
1+
grailsVersion=3.1.4
22
gradleWrapperVersion=2.9
3+
mailgunPluginVersion=

travis-build.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
#!/bin/bash
22

3-
./gradlew clean
4-
./gradlew test
3+
if [[ -z $TRAVIS_TAG ]]; then
4+
./gradlew test
5+
fi
6+
7+
exit $?

travis-publish.sh

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#!/bin/bash
2+
3+
vesion="$(grep 'mailgunPluginVersion =' build.gradle)"
4+
vesion="${vesion#*=}"
5+
vesion="${vesion//[[:blank:]\'\"]/}"
6+
7+
tagVersion="v$version"
8+
9+
echo "Publishing $vesion version"
10+
11+
EXIT_STATUS=0
12+
13+
if [[ $TRAVIS_REPO_SLUG == "orkonano/grails-mailgun" && $TRAVIS_PULL_REQUEST == 'false' && $TRAVIS_TAG == $tagVersion && $EXIT_STATUS -eq 0 ]]; then
14+
./gradlew bintrayUpload
15+
else
16+
if [[ $TRAVIS_REPO_SLUG == "orkonano/grails-mailgun" && $TRAVIS_PULL_REQUEST == 'false' && $TRAVIS_TAG != $tagVersion && $EXIT_STATUS -eq 0 ]]; then
17+
echo "Not publish because $tagVersion is different to Travis Tag $TRAVIS_TAG"
18+
EXIT_STATUS=1
19+
else
20+
EXIT_STATUS=0
21+
fi
22+
fi
23+
24+
exit $EXIT_STATUS

0 commit comments

Comments
 (0)