diff --git a/build.gradle b/build.gradle index 99ec6b7..350f7c8 100644 --- a/build.gradle +++ b/build.gradle @@ -7,14 +7,14 @@ buildscript { } dependencies { - classpath 'org.codehaus.griffon:gradle-griffon-plugin:2.2.0' - classpath 'org.codehaus.griffon:gradle-griffon-build-plugin:2.2.0' - classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.3.1' + classpath 'org.codehaus.griffon:gradle-griffon-plugin:2.3.0' + classpath 'org.codehaus.griffon:gradle-griffon-build-plugin:2.3.0' + classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.4.0' classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.11.0' - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.1' - classpath 'org.ajoberstar:gradle-git:1.0.0' - classpath 'org.kordamp.gradle:stats-gradle-plugin:0.1.3' - classpath 'com.github.ben-manes:gradle-versions-plugin:0.8' + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.3.1' + classpath 'org.ajoberstar:gradle-git:1.3.1' + classpath 'org.kordamp.gradle:stats-gradle-plugin:0.1.5' + classpath 'com.github.ben-manes:gradle-versions-plugin:0.11.3' } } @@ -97,8 +97,8 @@ subprojects { subproj -> dependencies { testCompile 'junit:junit:4.12' - testCompile 'org.spockframework:spock-core:0.7-groovy-2.0' - testCompile 'org.slf4j:slf4j-simple:1.7.10' + testCompile 'org.spockframework:spock-core:1.0-groovy-2.4' + testCompile 'org.slf4j:slf4j-simple:1.7.12' } task sourceJar(type: Jar) { diff --git a/gradle.properties b/gradle.properties index c7e1631..05553ea 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group=org.codehaus.griffon.plugins version=1.1.0 pluginBaseName=griffon-silkicons -griffonVersion=2.2.0 +griffonVersion=2.3.0 griffonPlugin=true publishJars=false sourceCompatibility=1.7 @@ -13,4 +13,4 @@ projectIssueTrackerUrl=https://github.com/griffon-plugins/griffon-silkicons-plug projectVcsUrl=https://github.com/griffon-plugins/griffon-silkicons-plugin javadocFooter=Copyright © 2014 Andres Almiray. All rights reserved. projectLabels=griffon,plugin,icons,silk -jacocoVersion=0.7.3.201502191951 +jacocoVersion=0.7.4.201502262128 diff --git a/gradle/docs.gradle b/gradle/docs.gradle index 7205761..2824a6d 100644 --- a/gradle/docs.gradle +++ b/gradle/docs.gradle @@ -11,10 +11,10 @@ javadoc { options.footer = javadocFooter options.links = ['http://www.slf4j.org/apidocs/', 'http://junit.org/javadoc/latest/', - 'http://docs.oracle.com/javase/7/docs/api/', 'http://jsr-305.googlecode.com/svn/trunk/javadoc/', 'http://atinject.googlecode.com/svn/trunk/javadoc/', - 'http://griffon.github.io/griffon/guide/api/'] + 'http://docs.oracle.com/javase/7/docs/api/', + "http://griffon-framework.org/guide/${griffonVersion}/api/".toString()] doLast { task -> copy { @@ -40,11 +40,11 @@ if (plugins.hasPlugin('groovy')) { footer = project.javadocFooter includePrivate = false link 'http://www.slf4j.org/apidocs/', 'org.slf4j.' - link 'http://docs.oracle.com/javase/7/docs/api/', 'java.', 'org.xml.', 'javax.', 'org.w3c.' link 'http://jsr-305.googlecode.com/svn/trunk/javadoc/', 'javax.annotation.' - link 'http://griffon.github.io/griffon/guide/api/', 'griffon.', 'org.codehaus.griffon.' + link "http://griffon-framework.org/guide/${griffonVersion}/api/".toString(), 'griffon.', 'org.codehaus.griffon.' link 'http://junit.org/javadoc/latest/', 'org.junit.', 'junit.' link 'http://atinject.googlecode.com/svn/trunk/javadoc/', 'javax.inject.' + link 'http://docs.oracle.com/javase/7/docs/api/', 'java.', 'org.xml.', 'javax.', 'org.w3c.' doLast { task -> copy { diff --git a/subprojects/griffon-silkicons-guide/griffon-silkicons-guide.gradle b/subprojects/griffon-silkicons-guide/griffon-silkicons-guide.gradle index 00ea32c..a4bf541 100644 --- a/subprojects/griffon-silkicons-guide/griffon-silkicons-guide.gradle +++ b/subprojects/griffon-silkicons-guide/griffon-silkicons-guide.gradle @@ -70,10 +70,10 @@ task apiDocs(type: Javadoc, dependsOn: copyDocs) { options.footer = project.javadocFooter options.links = ['http://www.slf4j.org/apidocs/', 'http://junit.org/javadoc/latest/', - 'http://docs.oracle.com/javase/7/docs/api/', 'http://jsr-305.googlecode.com/svn/trunk/javadoc/', 'http://atinject.googlecode.com/svn/trunk/javadoc/', - 'http://new.griffon-framework.org/guide/latest/api/'] + 'http://docs.oracle.com/javase/7/docs/api/', + "http://griffon-framework.org/guide/${griffonVersion}/api/".toString()] doLast { task -> copy { diff --git a/subprojects/griffon-silkicons-guide/src/asciidoc/introduction.adoc b/subprojects/griffon-silkicons-guide/src/asciidoc/introduction.adoc index b31c321..baf2ef0 100644 --- a/subprojects/griffon-silkicons-guide/src/asciidoc/introduction.adoc +++ b/subprojects/griffon-silkicons-guide/src/asciidoc/introduction.adoc @@ -4,3 +4,5 @@ Provides a shortcut for adding icons based on {link_silkicons}. +Griffon version: {griffon-version} + diff --git a/subprojects/griffon-silkicons-guide/src/asciidoc/usage.adoc b/subprojects/griffon-silkicons-guide/src/asciidoc/usage.adoc index ead6b34..775fd4b 100644 --- a/subprojects/griffon-silkicons-guide/src/asciidoc/usage.adoc +++ b/subprojects/griffon-silkicons-guide/src/asciidoc/usage.adoc @@ -9,9 +9,9 @@ You may use this class with any Swing component that supports an Icon property. == JavaFX -The `griffon-silk-javafx:{project-version}` JAR provides a new Node class: `{api_link_silkicon_javafx}`. -You may use this class with any JavaFX control that accepts a graphic property. You may also use the icon directly as -it is a subclass of `javafx.scene.control.Label`. +The `griffon-silk-javafx:{project-version}` JAR provides a subclass of `Image`: `{api_link_silkicon_javafx}`. +You may use this class with any JavaFX control that accepts a graphic property, as long as you wrap the icon with +an `ImageView` instance. == Action Resources diff --git a/subprojects/griffon-silkicons-javafx-groovy/griffon-silkicons-javafx-groovy.gradle b/subprojects/griffon-silkicons-javafx-groovy/griffon-silkicons-javafx-groovy.gradle index b5ca487..8b0f7f9 100644 --- a/subprojects/griffon-silkicons-javafx-groovy/griffon-silkicons-javafx-groovy.gradle +++ b/subprojects/griffon-silkicons-javafx-groovy/griffon-silkicons-javafx-groovy.gradle @@ -13,5 +13,5 @@ dependencies { testCompile project.files(project.jfxrtLocation) testRuntime "org.codehaus.griffon:griffon-guice:$griffonVersion" - testRuntime 'org.slf4j:slf4j-simple:1.7.10' + testRuntime 'org.slf4j:slf4j-simple:1.7.12' } \ No newline at end of file diff --git a/subprojects/griffon-silkicons-swing-groovy/griffon-silkicons-swing-groovy.gradle b/subprojects/griffon-silkicons-swing-groovy/griffon-silkicons-swing-groovy.gradle index 5263e65..2db3f21 100644 --- a/subprojects/griffon-silkicons-swing-groovy/griffon-silkicons-swing-groovy.gradle +++ b/subprojects/griffon-silkicons-swing-groovy/griffon-silkicons-swing-groovy.gradle @@ -9,7 +9,7 @@ dependencies { testCompile "org.codehaus.griffon:griffon-core-test:$griffonVersion" testRuntime "org.codehaus.griffon:griffon-guice:$griffonVersion" - testRuntime 'org.slf4j:slf4j-simple:1.7.10' + testRuntime 'org.slf4j:slf4j-simple:1.7.12' } compileGroovy.enabled = false \ No newline at end of file