Skip to content

Commit

Permalink
Miscellaneous updates
Browse files Browse the repository at this point in the history
  • Loading branch information
aalmiray committed Jan 22, 2015
1 parent bca7b55 commit 8358e6d
Show file tree
Hide file tree
Showing 29 changed files with 1,187 additions and 856 deletions.
4 changes: 1 addition & 3 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
= griffon-jide-plugin
:version: 1.0.0.SNAPSHOT
:linkattrs:
:project-name: griffon-jide-plugin

image:http://img.shields.io/travis/griffon-plugins/{project-name}/master.svg["Build Status", link="https://travis-ci.org/griffon-plugins/{project-name}"]
image:http://img.shields.io/coveralls/griffon-plugins/{project-name}/master.svg["Coverage Status", link="https://coveralls.io/r/griffon-plugins/{project-name}"]
image:http://img.shields.io/:semver-{version}-blue.svg["Semantic Versioning", link="http://semver.org"]
image:http://img.shields.io/badge/license-ASF2-blue.svg["Apache License 2", link="http://www.apache.org/licenses/LICENSE-2.0.txt"]
image:http://img.shields.io/badge/download-latest-bb00bb.svg[link="https://bintray.com/griffon/griffon-plugins/{project-name}/_latestVersion"]
image:https://api.bintray.com/packages/griffon/griffon-plugins/{project-name}/images/download.svg[link="https://bintray.com/griffon/griffon-plugins/{project-name}/_latestVersion"]

---

Expand Down
25 changes: 15 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ buildscript {
}

dependencies {
classpath 'org.codehaus.griffon:gradle-griffon-plugin:2.0.0.RC2'
classpath 'org.codehaus.griffon:gradle-griffon-build-plugin:2.0.0.RC2'
classpath 'net.saliman:gradle-cobertura-plugin:2.2.4'
classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.0.0'
classpath 'org.codehaus.griffon:gradle-griffon-plugin:2.0.0'
classpath 'org.codehaus.griffon:gradle-griffon-build-plugin:2.0.0'
classpath 'net.saliman:gradle-cobertura-plugin:2.2.5'
classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.1.0'
classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.11.0'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:0.5'
classpath 'org.ajoberstar:gradle-git:0.9.0'
classpath 'org.kordamp.gradle:stats-gradle-plugin:0.1.1'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.5-beta-6'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.1'
classpath 'org.ajoberstar:gradle-git:0.12.0'
classpath 'org.kordamp.gradle:stats-gradle-plugin:0.1.3'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.7'
}
}

Expand All @@ -25,7 +25,7 @@ apply plugin: 'build-dashboard'
apply from: 'gradle/idea.gradle'
apply plugin: 'org.codehaus.griffon.griffon-build'
apply from: 'gradle/bom.gradle'
apply plugin: 'github-pages'
apply plugin: 'org.ajoberstar.github-pages'

Date buildTimeAndDate = new Date()
ext {
Expand Down Expand Up @@ -56,6 +56,11 @@ subprojects { subproj ->
testCompileOnly
}

subproj.tasks.withType(JavaCompile) {
sourceCompatibility = rootProject.sourceCompatibility
targetCompatibility = rootProject.targetCompatibility
}

sourceSets {
main {
compileClasspath += [configurations.compileOnly]
Expand All @@ -77,7 +82,7 @@ subprojects { subproj ->
}

dependencies {
testCompile 'junit:junit:4.11'
testCompile 'junit:junit:4.12'
testCompile 'org.spockframework:spock-core:0.7-groovy-2.0'
testCompile 'org.slf4j:slf4j-simple:1.7.7'
}
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
group=org.codehaus.griffon.plugins
version=1.0.0-SNAPSHOT
version=1.0.0
pluginBaseName=griffon-jide
griffonVersion=2.0.0.RC2
griffonVersion=2.0.0
griffonPlugin=true
publishJars=false
sourceCompatibility=1.7
Expand All @@ -12,6 +12,6 @@ projectWebsiteUrl=http://griffon-plugins.github.io/griffon-jide-plugin
projectIssueTrackerUrl=https://github.com/griffon-plugins/griffon-jide-plugin/issues
projectVcsUrl=https://github.com/griffon-plugins/griffon-jide-plugin
javadocFooter=Copyright © 2014 Andres Almiray. All rights reserved.
jideVersion=3.6.0
jideVersion=3.6.4
jidefxVersion=0.9.1
projectLabels=griffon,plugin,jide
6 changes: 4 additions & 2 deletions gradle/bom.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@ publishToMavenLocal.dependsOn generateBom

gradle.taskGraph.whenReady { g ->
def generatePom = gradle.taskGraph.allTasks.find { it.name == 'generatePomFileForMavenBomPublication' }
def publicationExt = project.extensions.findByType(PublishingExtension)
def pub = publicationExt.publications.findByName('mavenBom')
generatePom?.doLast {
copy {
into project.file("${buildDir}/publications/mavenBom")
from generateBom.outputDir
into pub.asNormalisedPublication().pomFile.parentFile
from generateBom.outputFile
rename generateBom.outputFile.name, 'pom-default.xml'
}
}
Expand Down
4 changes: 2 additions & 2 deletions gradle/code-coverage.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apply plugin: 'cobertura'
apply plugin: 'net.saliman.cobertura'
apply plugin: 'jacoco'

cobertura {
Expand All @@ -11,7 +11,7 @@ cobertura {
}

jacoco {
toolVersion = '0.7.1.201405082137'
toolVersion = '0.7.2.201409121644'
}

jacocoTestReport {
Expand Down
48 changes: 28 additions & 20 deletions gradle/code-quality.gradle
Original file line number Diff line number Diff line change
@@ -1,34 +1,41 @@
//apply plugin: 'findbugs'
apply plugin: 'jdepend'
apply plugin: 'checkstyle'
apply plugin: 'com.github.hierynomus.license'

def configDir = new File(buildscript.sourceFile.parentFile.parentFile, 'config')
ext.checkstyleConfigDir = "$configDir/checkstyle"

/*
findbugs {
toolVersion = '3.0.0'
sourceSets = [sourceSets.main]
ignoreFailures = true
reportsDir = file("$project.buildDir/reports/findbugs")
effort = 'max'
reportLevel = 'high'
checkstyle {
toolVersion = '6.0'
configFile = new File(checkstyleConfigDir, 'checkstyle.xml')
configProperties.checkstyleConfigDir = checkstyleConfigDir
}

findbugsMain {
reports {
xml.enabled = false
html.enabled = true
if (project.hasProperty('findBugsEnabled') && project.findBugsEnabled.toBoolean()) {
apply plugin: 'findbugs'
findbugs {
toolVersion = '3.0.0'
sourceSets = [sourceSets.main]
ignoreFailures = true
reportsDir = file("$project.buildDir/reports/findbugs")
effort = 'max'
reportLevel = 'high'
}

findbugsMain {
reports {
xml.enabled = false
html.enabled = true
}
}
}

findbugsTest {
reports {
xml.enabled = false
html.enabled = true
findbugsTest {
reports {
xml.enabled = false
html.enabled = true
}
}
}
*/

jdepend {
toolVersion = '2.9.1'
Expand All @@ -45,7 +52,8 @@ license {
java = 'SLASHSTAR_STYLE'
groovy = 'SLASHSTAR_STYLE'
}
ext.year = '2014'
ext.year = '2014-2015'
exclude '**/*.png'
}

licenseTest {
Expand Down
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 @@
#Fri Aug 08 10:34:05 CEST 2014
#Mon Sep 08 14:12:16 CEST 2014
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-bin.zip

0 comments on commit 8358e6d

Please sign in to comment.