Skip to content

Commit 1d183db

Browse files
authored
Merge pull request #2 from Giulianini/develop
Develop
2 parents d2cc243 + f92d319 commit 1d183db

36 files changed

+1123
-473
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ bin/
44
.gradle
55
.gradle/
66
build/
7+
.idea/
78

89
# Ignore Gradle GUI config
910
gradle-app.setting
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
#Tue Jul 17 11:31:39 CEST 2018
21
connection.project.dir=
2+
eclipse.preferences.version=1

.travis.yml

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
11
language: java
2-
32
script:
4-
- 'if [ "$TRAVIS_BRANCH" = "release" ]; then bash travis_build.sh; fi'
3+
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash travis_build.sh; fi'
4+
- 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash travis_build_pull_request.sh; fi'
5+
before_deploy: echo Preparing for deploy
6+
deploy:
7+
- provider: releases
8+
skip_cleanup: true
9+
api_key:
10+
secure: NNb27gzHHmJ9aCH/NuyT6iOYX+E0ubKbgRWNykpZoDMfG9OX+GLyKuMRH4aFmCdbNePJ/z8R4r2z54XbGWPCu2V900ev7bgoG1ljbyzJYm7PwJxIjyPzwYKgnYmvqRk2MYtkC/8gZyAckggBMZRtWUB+k6cfto/LWKdguv487bxcI3LH37Q3yFfiJzZ1fXJOFEBI1v+6uTdBR5Saeivq/79V22WlaCMuGHGLWiTQbXs70JVy3k5CotgUK+IZZsIkJ9z8A2tzzxUIXOeIAiW/wDqN+r6NdUXY5LrOP2zU7UxR0g3sUp5CuqwPotjSD39IZJz7Wbzr0JTUoUrmkff/51lmMMml7K1qWPQLMrdLIGrVQDMr8dM4MMicgKGRbMyvXEC1idvdPp0V51aX+AWAB7LpvkoOJx6C75N1wtPlsAiRkJWKIqtuDb9Ldc4boLnaNH/9Awvtj369STKO4u4seXvn2ibNIQLr+Ch+hbbDgcTacVupQ13aEcTE9gzSsjXqMpDL4Ss/FVhaxrjBqNfS4VRBxsMzn8OyJd9EdL7nPS6Aegw+bkiYpAylrZImzAe/Z39uW3F0ZU0Rpwqddm7NWR8f9TDs/LpkCttRFhdxTQo+RkJqnSIIoNPBOncfPBxEQGNOIcQoJnp+kcrA1JzLpeK3+Xph1VYwNG8JMquts+M=
11+
file_glob: true
12+
file: "${HOME}/build/${TRAVIS_REPO_SLUG}/Jestures*/build/libs/jestures-*.jar"
13+
on:
14+
repo: Giulianini/Jestures
15+
- provider: surge
16+
skip_cleanup: true
17+
project: "./report"
18+
domain: jestures-reports.surge.sh
19+
on:
20+
repo: Giulianini/Jestures
21+
all_branches: true

Jestures/.pmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
<useProjectRuleSet>true</useProjectRuleSet>
44
<ruleSetFile>pmd.xml</ruleSetFile>
55
<includeDerivedFiles>false</includeDerivedFiles>
6-
<violationsAsErrors>true</violationsAsErrors>
6+
<violationsAsErrors>false</violationsAsErrors>
77
<fullBuildEnabled>true</fullBuildEnabled>
88
</pmd>

0 commit comments

Comments
 (0)