Prepare for release

.travis.yml

@@ -4,14 +4,14 @@ install:
     - TERM=dumb ./gradlew -q assemble
 
 script:
-    - TERM=dumb ./gradlew build cobertura
+    - TERM=dumb ./gradlew build jacocoTestReport jacocoRootReport
 
 jdk:
-    - oraclejdk7
+    - oraclejdk8
 
 before_install:
     - export DISPLAY=:99.0
     - sh -e /etc/init.d/xvfb start
 
 after_success:
-    ./gradlew aggregateCoberturaMerge aggregateCoberturaReport coveralls
+    ./gradlew coveralls

README.adoc

@@ -1,13 +1,11 @@
 = griffon-miglayout-plugin
-:version: 1.0.0.SNAPSHOT
 :linkattrs:
 :project-name: griffon-miglayout-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"]
 
 ---
 

build.gradle

@@ -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.0.1'
         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 'com.jfrog.bintray.gradle:gradle-bintray-plugin:0.6'
+        classpath 'org.ajoberstar:gradle-git:0.11.2'
         classpath 'org.kordamp.gradle:stats-gradle-plugin:0.1.1'
-        classpath 'com.github.ben-manes:gradle-versions-plugin:0.5-beta-6'
+        classpath 'com.github.ben-manes:gradle-versions-plugin:0.5'
     }
 }
 
@@ -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 {
@@ -49,13 +49,26 @@ allprojects {
     }
 }
 
+apply plugin: 'jacoco'
+
+jacoco {
+    toolVersion = '0.7.2.201409121644'
+}
+
+ext.jacocoProjects = []
+
 subprojects { subproj ->
     plugins.withType(JavaPlugin) {
         configurations {
             compileOnly
             testCompileOnly
         }
 
+        subproj.tasks.withType(JavaCompile) {
+            sourceCompatibility = rootProject.sourceCompatibility
+            targetCompatibility = rootProject.targetCompatibility
+        }
+
         sourceSets {
             main {
                 compileClasspath += [configurations.compileOnly]
@@ -103,6 +116,8 @@ subprojects { subproj ->
         if (subproj.publishJars.toBoolean()) {
             subproj.apply from: rootProject.file('gradle/docs.gradle')
         }
+
+        subproj.test.testLogging { exceptionFormat 'full' }
     }
 }
 
@@ -124,3 +139,22 @@ githubPages {
 }
 
 publishGhPages.dependsOn(project(":${pluginBaseName}-guide").guide)
+
+coveralls {
+    sourceDirs = files(jacocoProjects.sourceSets.main.allSource.srcDirs).files.absolutePath
+}
+
+task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
+    dependsOn = jacocoProjects.test
+    additionalSourceDirs = files(jacocoProjects.sourceSets.main.allSource.srcDirs)
+    sourceDirectories = files(jacocoProjects.sourceSets.main.allSource.srcDirs)
+    classDirectories =  files(jacocoProjects.sourceSets.main.output)
+    executionData = files(jacocoProjects.jacocoTestReport.executionData)
+    reports {
+        html.enabled = true
+        xml.enabled = true
+        csv.enabled = false
+        html.destination = "${buildDir}/reports/jacoco/html"
+        xml.destination = "${buildDir}/reports/jacoco/test/jacocoTestReport.xml"
+    }
+}

gradle.properties

@@ -1,7 +1,7 @@
 group=org.codehaus.griffon.plugins
-version=1.0.0-SNAPSHOT
+version=1.0.0
 pluginBaseName=griffon-miglayout
-griffonVersion=2.0.0.RC2
+griffonVersion=2.0.0
 griffonPlugin=true
 publishJars=false
 sourceCompatibility=1.7

gradle/bom.gradle

@@ -3,7 +3,8 @@ apply plugin: 'com.jfrog.bintray'
 
 generateBom {
     additionalDependencies = [
-        "com.miglayout:miglayout-swing:$miglayoutVersion"
+        "com.miglayout:miglayout-swing:$miglayoutVersion",
+        "com.miglayout:miglayout-javafx:$miglayoutVersion"
     ]
 }
 
@@ -19,10 +20,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'
         }
     }

gradle/code-coverage.gradle

@@ -1,6 +1,7 @@
-apply plugin: 'cobertura'
+// apply plugin: 'net.saliman.cobertura'
 apply plugin: 'jacoco'
 
+/*
 cobertura {
     coverageFormats = ['html', 'xml']
     if (project.plugins.hasPlugin('groovy')) {
@@ -9,9 +10,10 @@ cobertura {
         coverageSourceDirs = sourceSets.main.java.srcDirs
     }
 }
+*/
 
 jacoco {
-    toolVersion = '0.7.1.201405082137'
+    toolVersion = '0.7.2.201409121644'
 }
 
 jacocoTestReport {
@@ -25,4 +27,6 @@ jacocoTestReport {
         csv.enabled = false
         html.enabled = true
     }
-}
+}
+
+jacocoProjects << project

gradle/code-quality.gradle

@@ -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'
@@ -46,6 +53,7 @@ license {
         groovy = 'SLASHSTAR_STYLE'
     }
     ext.year = '2014'
+    exclude '**/*.png'
 }
 
 licenseTest {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Jul 01 13:57:21 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

subprojects/griffon-miglayout-guide/griffon-miglayout-guide.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'org.asciidoctor:asciidoctor-gradle-plugin:0.7.3'
+        classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.0'
         classpath 'org.gradle.api.plugins:gradle-java2html-plugin:0.4'
     }
 }
@@ -143,19 +143,17 @@ asciidoctor {
             linkcss                 : true,
             stylesheet              : 'css/style.css',
             'source-highlighter'    : 'coderay',
-            'coderay-linenums-mode' : 'inline',
-            'project-name'          : 'Griffon Miglayout Plugin',
+            'coderay-linenums-mode' : 'table',
+            'project-title'         : project.projectDescription,
             'project-author'        : 'Andres Almiray',
-            'project-version'       : project.version,
-            'project-group'         : project.group,
             'project-url'           : project.projectWebsiteUrl,
             'project-vcs'           : project.projectVcsUrl,
             'project-issue-tracker' : project.projectIssueTrackerUrl,
             'griffon-version'       : rootProject.griffonVersion,
             'miglayout-version'     : rootProject.miglayoutVersion
         ]
     ]
-    sourceDocumentName = project.file('src/asciidoc/index.adoc')
+    sourceDocumentNames = files('src/asciidoc/index.adoc')
 
     doLast { task ->
         copy {

subprojects/griffon-miglayout-guide/src/asciidoc/configuration.adoc

@@ -1,7 +1,6 @@
 
 [[_configuration]]
 = Configuration
-:groupId: org.codehaus.griffon.plugins
 
 The plugin delivers artifacts for both Swing and JavaFX. It also contains Groovy enhancements
 that can be used in combination with the respective UI toolkit DSL (SwingBuilder and GroovyFX).
@@ -13,13 +12,13 @@ You have two options for configuring this plugin: automatic and manual.
 === Automatic
 
 As long as the project has the `org.codehaus.griffon.griffon` plugin applied to it you
-may include the following snippet in +build.gradle+
+may include the following snippet in `build.gradle`
 
 [source,groovy,options="nowrap"]
 [subs="attributes"]
 ----
 dependencies {
-    griffon '{groupId}:griffon-miglayout-plugin:{project-version}'
+    griffon '{project-group}:griffon-miglayout-plugin:{project-version}'
 }
 ----
 
@@ -43,7 +42,7 @@ dependencies {
 [subs="attributes"]
 ----
 dependencies {
-    compile '{groupId}:griffon-miglayout-javafx:{project-version}'
+    compile '{project-group}:griffon-miglayout-javafx:{project-version}'
 }
 ----
 
@@ -52,7 +51,7 @@ dependencies {
 [subs="attributes"]
 ----
 dependencies {
-    compile '{groupId}:griffon-miglayout-swing-groovy:{project-version}'
+    compile '{project-group}:griffon-miglayout-swing-groovy:{project-version}'
 }
 ----
 
@@ -61,7 +60,7 @@ dependencies {
 [subs="attributes"]
 ----
 dependencies {
-    compile '{groupId}:griffon-miglayout-javafx-groovy:{project-version}'
+    compile '{project-group}:griffon-miglayout-javafx-groovy:{project-version}'
 }
 ----
 
@@ -76,7 +75,7 @@ snippet before the `<build>` element
 <dependencyManagement>
     <dependencies>
         <dependency>
-            <groupId>{groupId}</groupId>
+            <groupId>{project-group}</groupId>
             <artifactId>griffon-miglayout-plugin</artifactId>
             <version>{project-version}</version>
             <type>pom</type>
@@ -103,7 +102,7 @@ Next configure dependencies as required by your particular setup
 [subs="attributes,verbatim"]
 ----
 <dependency>
-    <groupId>{groupId}</groupId>
+    <groupId>{project-group}</groupId>
     <artifactId>griffon-miglayout-javafx</artifactId>
 </dependency>
 ----
@@ -113,7 +112,7 @@ Next configure dependencies as required by your particular setup
 [subs="attributes,verbatim"]
 ----
 <dependency>
-    <groupId>{groupId}</groupId>
+    <groupId>{project-group}</groupId>
     <artifactId>griffon-miglayout-swing-groovy</artifactId>
 </dependency>
 ----
@@ -123,7 +122,7 @@ Next configure dependencies as required by your particular setup
 [subs="attributes,verbatim"]
 ----
 <dependency>
-    <groupId>{groupId}</groupId>
+    <groupId>{project-group}</groupId>
     <artifactId>griffon-miglayout-javafx-groovy</artifactId>
 </dependency>
 ----