Skip to content

Commit

Permalink
Use gradle 1.6 and add header check to checkstyle
Browse files Browse the repository at this point in the history
  • Loading branch information
jnizet committed Jun 24, 2013
1 parent c2d8a6f commit 6e926f1
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 23 deletions.
15 changes: 3 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,18 +1,9 @@
buildscript {
repositories {
mavenCentral()
}
dependencies {
classpath "net.saliman:gradle-cobertura-plugin:1.0.1"
}
}

apply plugin : 'java'
apply plugin : 'eclipse'
apply plugin : 'checkstyle'
apply plugin : 'pmd'
apply plugin : 'findbugs'
apply plugin : 'cobertura'
apply plugin : 'jacoco'
apply plugin : 'maven'
apply plugin : 'signing'

Expand All @@ -23,7 +14,7 @@ repositories {
mavenCentral()
}

build.dependsOn tasks.getByName("cobertura")
check.dependsOn tasks.getByName("jacocoTestReport")

dependencies {
compile 'com.google.code.findbugs:jsr305:2.0.0'
Expand Down Expand Up @@ -231,5 +222,5 @@ signing {
}

task wrapper(type: Wrapper) {
gradleVersion = '1.1'
gradleVersion = '1.6'
}
14 changes: 6 additions & 8 deletions config/checkstyle/checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -144,14 +144,6 @@
<module name="CovariantEquals">
</module>

<!-- See http:https://checkstyle.sf.net/config_coding.html -->
<!--
The "double-checked locking" idiom (DCL) tries to avoid the
runtime cost of synchronization.
-->
<module name="DoubleCheckedLocking">
</module>

<!-- See http:https://checkstyle.sf.net/config_coding.html -->
<!-- Detects empty statements (standalone ;). -->
<module name="EmptyStatement">
Expand Down Expand Up @@ -627,4 +619,10 @@
-->
<module name="FileTabCharacter">
</module>

<module name="Header">
<property name="headerFile" value="config/checkstyle/java.header"/>
<property name="ignoreLines" value="4"/>
<property name="fileExtensions" value="java"/>
</module>
</module>
23 changes: 23 additions & 0 deletions config/checkstyle/java.header
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
* The MIT License
*
* Copyright (c) 2012-2013, Ninja Squad
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Aug 06 18:48:35 CEST 2012
#Mon Jun 24 19:42:45 CEST 2013
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=http\:https://services.gradle.org/distributions/gradle-1.1-bin.zip
distributionUrl=http\:https://services.gradle.org/distributions/gradle-1.6-bin.zip
2 changes: 1 addition & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query businessSystem maximum file descriptor limit: $MAX_FD_LIMIT"
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi

Expand Down

0 comments on commit 6e926f1

Please sign in to comment.