diff --git a/.travis.yml b/.travis.yml index 914ebff..2ec8dc0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,19 +1,21 @@ language: java +jdk: openjdk8 +services: + - xvfb before_install: + - sudo apt update + - sudo apt install openjfx + - chmod +x ./gradlew - export DISPLAY=:99.0 - - sh -e /etc/init.d/xvfb start - - sudo apt-get update -qq - - sudo apt-get install oracle-java8-installer +install: true before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock cache: directories: + - $HOME/.m2/ - $HOME/.gradle/caches/ - $HOME/.gradle/wrapper/ - - $HOME/.sonar/cache/ before_script: - ./gradlew --version -script: ./gradlew --scan clean build -jdk: - - oraclejdk8 +script: ./gradlew build -S env: TERM=dumb diff --git a/README.adoc b/README.adoc index 1a663eb..c6b933d 100644 --- a/README.adoc +++ b/README.adoc @@ -1,12 +1,12 @@ = JSilhouette :linkattrs: -:project-owner: aalmiray -:project-repo: kordamp +:project-owner: kordamp +:project-repo: maven :project-name: jsilhouette :project-group: org.kordamp.jsilhouette :project-version: 0.3.0 -image:http://img.shields.io/travis/aalmiray/{project-name}/master.svg["Build Status (travis)", link="https://travis-ci.org/aalmiray/{project-name}"] +image:http://img.shields.io/travis/{project-owner}/{project-name}/master.svg["Build Status (travis)", link="https://travis-ci.org/{project-owner}/{project-name}"] image:http://img.shields.io/badge/license-ASL2-blue.svg["ASL2 Licensed", link="http://opensource.org/licenses/ASL2"] image:https://api.bintray.com/packages/{project-owner}/{project-repo}/{project-name}/images/download.svg[link="https://bintray.com/{project-owner}/{project-repo}/{project-name}/_latestVersion"] image:https://img.shields.io/maven-central/v/{project-group}/{project-name}-javafx.svg?label=maven[link="https://search.maven.org/#search|ga|1|{project-group}"] @@ -54,19 +54,19 @@ dependencies { ---- -Refer to the link:http://aalmiray.github.io/jsilhouette/[guide, window="_blank"] for further information on configuration +Refer to the link:http://{project-owner}.github.io/jsilhouette/[guide, window="_blank"] for further information on configuration and usage. === Java 9+ -JSilhouette can be used in a modular fashion when running in Java9+. It's module name is `org.kordamp.jsilhouette.javafx`. +JSilhouette can be used in a modular fashion when running in Java9+. Its module name is `org.kordamp.jsilhouette.javafx`. == Building You must meet the following requirements: * JDK8u60 as a minimum - * Gradle 4.10 + * Gradle 5.1 You may used the included gradle wrapper script if you don't have `gradle` installed. diff --git a/build.gradle b/build.gradle index 9b57303..b0f8767 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ /* * SPDX-License-Identifier: Apache-2.0 * - * Copyright 2015-2019 Andres Almiray. + * Copyright 2015-2020 Andres Almiray * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,16 +15,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - plugins { - id 'com.gradle.build-scan' version '2.1' - id 'org.kordamp.gradle.kordamp-parentpom' version '1.2.1' - id 'org.kordamp.gradle.source-xref' version '0.12.0' -} - -buildScan { - termsOfServiceUrl = 'https://gradle.com/terms-of-service' - termsOfServiceAgree = 'yes' + id 'org.kordamp.gradle.kordamp-parentpom' } config { @@ -35,49 +27,30 @@ config { tags = ['javafx', 'shapes'] specification { enabled = false } + } - credentials { - sonatype { - username = project.sonatypeUsername - password = project.sonatypePassword + docs { + sourceHtml { + overview { + stylesheet = project(':guide').file('src/javadoc/resources/css/stylesheet.css') } } - } - sourceHtml { - overview { - stylesheet = project(':guide').file('src/javadoc/resources/css/stylesheet.css') + sourceXref { + inputEncoding = 'UTF-8' } - } - - sourceXref { - inputEncoding = 'UTF-8' - } - javadoc { - excludes = ['**/*.html', 'META-INF/**'] - options { - links('http://docs.oracle.com/javase/8/docs/api/', - 'http://docs.oracle.com/javase/8/javafx/api/') + javadoc { + options { + addBooleanOption('javafx', true) + links('http://docs.oracle.com/javase/8/javafx/api/') + } } } } allprojects { apply plugin: 'idea' - - dependencyUpdates.resolutionStrategy = { - componentSelection { rules -> - rules.all { selection -> - boolean rejected = ['alpha', 'beta', 'rc', 'cr', 'm'].any { qualifier -> - selection.candidate.version ==~ /(?i).*[.-]${qualifier}[.\d-]*/ - } - if (rejected) { - selection.reject('Release candidate') - } - } - } - } } idea { @@ -95,11 +68,6 @@ idea { } subprojects { subproj -> - subproj.tasks.withType(JavaCompile) { - sourceCompatibility = subproj.sourceCompatibility - targetCompatibility = subproj.targetCompatibility - } - license { mapping { fxml = 'XML_STYLE' @@ -112,7 +80,7 @@ configurations { } dependencies { - asciidoclet 'org.asciidoctor:asciidoclet:1.5.6' + asciidoclet "org.asciidoctor:asciidoclet:$asciidocletVersion" } evaluationDependsOn ':image-generator' @@ -120,11 +88,11 @@ evaluationDependsOn ':image-generator' task generateImages { dependsOn project(':image-generator').run doFirst { - file(aggregateJavadocs.destinationDir).mkdirs() + file(aggregateJavadoc.destinationDir).mkdirs() } doLast { copy { - into file("${aggregateJavadocs.destinationDir}/images") + into file("${aggregateJavadoc.destinationDir}/images") from project(':image-generator').file('build/images') } } @@ -133,16 +101,14 @@ task generateImages { gradle.addBuildListener(new BuildAdapter(){ @Override void projectsEvaluated(Gradle gradle) { - def createGuideTask = project.tasks.findByName('aggregateJavadocs') - - def aggregateJavadocsTask = rootProject.tasks.findByName('aggregateJavadocs') + def aggregateJavadocTask = rootProject.tasks.findByName('aggregateJavadoc') - aggregateJavadocsTask.configure { + aggregateJavadocTask.configure { dependsOn generateImages options.docletpath = configurations.asciidoclet.files.asType(List) options.doclet = 'org.asciidoctor.Asciidoclet' options.addStringOption "-base-dir", "${projectDir}" - options.addStringOption "-attribute", "imagesdir=${aggregateJavadocsTask.destinationDir}/images" + options.addStringOption "-attribute", "imagesdir=images" } } }) diff --git a/gradle.properties b/gradle.properties index e0e6bb7..89a4db5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,31 @@ -version = 0.4.0-SNAPSHOT -group = org.kordamp.jsilhouette -sourceCompatibility = 1.8 -targetCompatibility = 1.8 \ No newline at end of file +# +# SPDX-License-Identifier: Apache-2.0 +# +# Copyright 2015-2020 Andres Almiray +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +version = 0.4.0-SNAPSHOT +group = org.kordamp.jsilhouette +sourceCompatibility = 1.8 +targetCompatibility = 1.8 + +asciidocletVersion = 1.5.6 +kordampPluginVersion = 0.31.2 +kordampPomVersion = 1.10.2 +gitPluginVersion = 0.3.2 + +org.gradle.daemon = true +org.gradle.caching = true +org.gradle.parallel = false diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 87b738c..cc4fdc2 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5a7a6a1..9492014 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index af6708f..2fe81a7 100755 --- a/gradlew +++ b/gradlew @@ -1,5 +1,21 @@ #!/usr/bin/env sh +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + ############################################################################## ## ## Gradle start up script for UN*X @@ -28,7 +44,7 @@ APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m"' +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" @@ -109,8 +125,8 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` JAVACMD=`cygpath --unix "$JAVACMD"` @@ -138,19 +154,19 @@ if $cygwin ; then else eval `echo args$i`="\"$arg\"" fi - i=$((i+1)) + i=`expr $i + 1` done case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; esac fi @@ -159,14 +175,9 @@ save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } -APP_ARGS=$(save "$@") +APP_ARGS=`save "$@"` # Collect all arguments for the java command, following the shell quoting and substitution rules eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 6d57edc..9618d8d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome diff --git a/settings.gradle b/settings.gradle index 243877f..622395c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,7 +1,7 @@ /* * SPDX-License-Identifier: Apache-2.0 * - * Copyright 2015-2019 Andres Almiray. + * Copyright 2015-2020 Andres Almiray * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,32 +15,32 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - pluginManagement { repositories { jcenter() - maven { url 'https://plugins.gradle.org/m2/' } + gradlePluginPortal() + mavenLocal() + } + plugins { + id 'org.kordamp.gradle.kordamp-parentpom' version kordampPomVersion + id 'org.kordamp.gradle.guide' version kordampPluginVersion + id 'org.ajoberstar.git-publish' version gitPluginVersion } } -enableFeaturePreview('STABLE_PUBLISHING') +buildscript { + repositories { + gradlePluginPortal() + mavenLocal() + } + dependencies { + classpath "org.kordamp.gradle:settings-gradle-plugin:$kordampPluginVersion" + } +} +apply plugin: 'org.kordamp.gradle.settings' rootProject.name = 'jsilhouette' -def includeProject = { String projectDirName, String projectName -> - File baseDir = new File(settingsDir, projectDirName) - File projectDir = new File(baseDir, projectName) - String buildFileName = "${projectName}.gradle" - - assert projectDir.isDirectory() - assert new File(projectDir, buildFileName).isFile() - - include projectName - project(":${projectName}").projectDir = projectDir - project(":${projectName}").buildFileName = buildFileName +projects { + directories = ['subprojects'] } - -includeProject 'subprojects', 'jsilhouette-javafx' -includeProject 'subprojects', 'sampler-javafx' -includeProject 'subprojects', 'guide' -includeProject 'subprojects', 'image-generator' diff --git a/subprojects/guide/guide.gradle b/subprojects/guide/guide.gradle index ece4e99..a81fd10 100644 --- a/subprojects/guide/guide.gradle +++ b/subprojects/guide/guide.gradle @@ -1,7 +1,7 @@ /* * SPDX-License-Identifier: Apache-2.0 * - * Copyright 2015-2019 Andres Almiray. + * Copyright 2015-2020 Andres Almiray * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,10 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - plugins { - id 'org.kordamp.gradle.guide' version '0.12.0' - id 'org.ajoberstar.git-publish' version '0.3.2' + id 'org.kordamp.gradle.guide' + id 'org.ajoberstar.git-publish' } ext.childProjects = [ @@ -28,32 +27,3 @@ ext.childProjects = [ childProjects.each { evaluationDependsOn it } evaluationDependsOn ':image-generator' -afterEvaluate { - def createGuideTask = project.tasks.findByName('createGuide') - - gitPublish { - repoUri = rootProject.extensions.findByName('config').info.links.scm - branch = 'gh-pages' - contents { - from createGuideTask.outputs.files - } - commitMessage = "Publish guide for $version" - } - - gitPublishCommit.dependsOn(createGuideTask) -} - -gradle.addBuildListener(new BuildAdapter(){ - @Override - void projectsEvaluated(Gradle gradle) { - def createGuideTask = project.tasks.findByName('createGuide') - - def aggregateSourceXrefTask = rootProject.tasks.findByName('aggregateSourceXref') - - createGuideTask.finalizedBy project.tasks.create('copyAggregateXref', Copy) { - dependsOn aggregateSourceXrefTask - destinationDir = project.file("${createGuideTask.destinationDir}/api-xref") - from aggregateSourceXrefTask.outputDirectory - } - } -}) diff --git a/subprojects/guide/src/docs/asciidoc/index.adoc b/subprojects/guide/src/docs/asciidoc/index.adoc index 82b10ed..c704017 100644 --- a/subprojects/guide/src/docs/asciidoc/index.adoc +++ b/subprojects/guide/src/docs/asciidoc/index.adoc @@ -4,11 +4,11 @@ :toclevels: 2 :docinfo1: -include::_links.adoc[] +include::{includedir}/_links.adoc[] :leveloffset: 1 -include::introduction.adoc[] -include::usage.adoc[] +include::{includedir}/introduction.adoc[] +include::{includedir}/usage.adoc[] = Links diff --git a/subprojects/image-generator/image-generator.gradle b/subprojects/image-generator/image-generator.gradle index 6ce7ac6..7aba3a5 100644 --- a/subprojects/image-generator/image-generator.gradle +++ b/subprojects/image-generator/image-generator.gradle @@ -1,7 +1,7 @@ /* * SPDX-License-Identifier: Apache-2.0 * - * Copyright 2015-2019 Andres Almiray. + * Copyright 2015-2020 Andres Almiray * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,8 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -apply plugin: 'application' +plugins { + id 'application' +} mainClassName = 'org.kordamp.jsilhouette.Generator' diff --git a/subprojects/jsilhouette-javafx/jsilhouette-javafx.gradle b/subprojects/jsilhouette-javafx/jsilhouette-javafx.gradle index 0f017d0..d3c6266 100644 --- a/subprojects/jsilhouette-javafx/jsilhouette-javafx.gradle +++ b/subprojects/jsilhouette-javafx/jsilhouette-javafx.gradle @@ -1,7 +1,7 @@ /* * SPDX-License-Identifier: Apache-2.0 * - * Copyright 2015-2019 Andres Almiray. + * Copyright 2015-2020 Andres Almiray * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,15 +15,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -apply plugin: 'java' +plugins { + id 'java-library' +} configurations { asciidoclet } dependencies { - asciidoclet 'org.asciidoctor:asciidoclet:1.5.6' + asciidoclet "org.asciidoctor:asciidoclet:$asciidocletVersion" } evaluationDependsOn ':image-generator' diff --git a/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/AbstractCenteredSilhouette.java b/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/AbstractCenteredSilhouette.java index ff8e37d..0d33786 100644 --- a/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/AbstractCenteredSilhouette.java +++ b/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/AbstractCenteredSilhouette.java @@ -1,7 +1,7 @@ /* * SPDX-License-Identifier: Apache-2.0 * - * Copyright 2015-2019 Andres Almiray + * Copyright 2015-2020 Andres Almiray * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/AbstractSilhouette.java b/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/AbstractSilhouette.java index 851f226..7389b6d 100644 --- a/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/AbstractSilhouette.java +++ b/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/AbstractSilhouette.java @@ -1,7 +1,7 @@ /* * SPDX-License-Identifier: Apache-2.0 * - * Copyright 2015-2019 Andres Almiray + * Copyright 2015-2020 Andres Almiray * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Almond.java b/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Almond.java index 115d735..ab7d994 100644 --- a/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Almond.java +++ b/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Almond.java @@ -1,7 +1,7 @@ /* * SPDX-License-Identifier: Apache-2.0 * - * Copyright 2015-2019 Andres Almiray + * Copyright 2015-2020 Andres Almiray * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Arrow.java b/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Arrow.java index a249685..e6b2d07 100644 --- a/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Arrow.java +++ b/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Arrow.java @@ -1,7 +1,7 @@ /* * SPDX-License-Identifier: Apache-2.0 * - * Copyright 2015-2019 Andres Almiray + * Copyright 2015-2020 Andres Almiray * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Asterisk.java b/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Asterisk.java index 68ae5a4..b50b47a 100644 --- a/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Asterisk.java +++ b/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Asterisk.java @@ -1,7 +1,7 @@ /* * SPDX-License-Identifier: Apache-2.0 * - * Copyright 2015-2019 Andres Almiray + * Copyright 2015-2020 Andres Almiray * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Astroid.java b/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Astroid.java index acdd25b..a37a6f7 100644 --- a/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Astroid.java +++ b/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Astroid.java @@ -1,7 +1,7 @@ /* * SPDX-License-Identifier: Apache-2.0 * - * Copyright 2015-2019 Andres Almiray + * Copyright 2015-2020 Andres Almiray * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/CenteredSilhouette.java b/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/CenteredSilhouette.java index ed985ac..0c1c514 100644 --- a/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/CenteredSilhouette.java +++ b/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/CenteredSilhouette.java @@ -1,7 +1,7 @@ /* * SPDX-License-Identifier: Apache-2.0 * - * Copyright 2015-2019 Andres Almiray + * Copyright 2015-2020 Andres Almiray * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Cross.java b/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Cross.java index 7eac739..f665e2d 100644 --- a/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Cross.java +++ b/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Cross.java @@ -1,7 +1,7 @@ /* * SPDX-License-Identifier: Apache-2.0 * - * Copyright 2015-2019 Andres Almiray + * Copyright 2015-2020 Andres Almiray * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Donut.java b/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Donut.java index be1a059..c687751 100644 --- a/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Donut.java +++ b/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Donut.java @@ -1,7 +1,7 @@ /* * SPDX-License-Identifier: Apache-2.0 * - * Copyright 2015-2019 Andres Almiray + * Copyright 2015-2020 Andres Almiray * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Lauburu.java b/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Lauburu.java index 39901fe..2d78b94 100644 --- a/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Lauburu.java +++ b/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Lauburu.java @@ -1,7 +1,7 @@ /* * SPDX-License-Identifier: Apache-2.0 * - * Copyright 2015-2019 Andres Almiray + * Copyright 2015-2020 Andres Almiray * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/MultiRoundRectangle.java b/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/MultiRoundRectangle.java index 00191c7..307c205 100644 --- a/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/MultiRoundRectangle.java +++ b/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/MultiRoundRectangle.java @@ -1,7 +1,7 @@ /* * SPDX-License-Identifier: Apache-2.0 * - * Copyright 2015-2019 Andres Almiray + * Copyright 2015-2020 Andres Almiray * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/PathBuilder.java b/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/PathBuilder.java index f8b2abf..b826c49 100644 --- a/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/PathBuilder.java +++ b/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/PathBuilder.java @@ -1,7 +1,7 @@ /* * SPDX-License-Identifier: Apache-2.0 * - * Copyright 2015-2019 Andres Almiray + * Copyright 2015-2020 Andres Almiray * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Rays.java b/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Rays.java index 9058383..c4ae762 100644 --- a/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Rays.java +++ b/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Rays.java @@ -1,7 +1,7 @@ /* * SPDX-License-Identifier: Apache-2.0 * - * Copyright 2015-2019 Andres Almiray + * Copyright 2015-2020 Andres Almiray * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/RegularPolygon.java b/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/RegularPolygon.java index f99871c..c46765e 100644 --- a/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/RegularPolygon.java +++ b/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/RegularPolygon.java @@ -1,7 +1,7 @@ /* * SPDX-License-Identifier: Apache-2.0 * - * Copyright 2015-2019 Andres Almiray + * Copyright 2015-2020 Andres Almiray * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/RoundPin.java b/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/RoundPin.java index 723c027..61c21e3 100644 --- a/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/RoundPin.java +++ b/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/RoundPin.java @@ -1,7 +1,7 @@ /* * SPDX-License-Identifier: Apache-2.0 * - * Copyright 2015-2019 Andres Almiray + * Copyright 2015-2020 Andres Almiray * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Silhouette.java b/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Silhouette.java index 984b06a..86f2dce 100644 --- a/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Silhouette.java +++ b/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Silhouette.java @@ -1,7 +1,7 @@ /* * SPDX-License-Identifier: Apache-2.0 * - * Copyright 2015-2019 Andres Almiray + * Copyright 2015-2020 Andres Almiray * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Star.java b/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Star.java index ee85b8f..b5e021a 100644 --- a/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Star.java +++ b/subprojects/jsilhouette-javafx/src/main/java/org/kordamp/jsilhouette/javafx/Star.java @@ -1,7 +1,7 @@ /* * SPDX-License-Identifier: Apache-2.0 * - * Copyright 2015-2019 Andres Almiray + * Copyright 2015-2020 Andres Almiray * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/subprojects/sampler-javafx/sampler-javafx.gradle b/subprojects/sampler-javafx/sampler-javafx.gradle index 102a191..b4186e9 100644 --- a/subprojects/sampler-javafx/sampler-javafx.gradle +++ b/subprojects/sampler-javafx/sampler-javafx.gradle @@ -1,7 +1,7 @@ /* * SPDX-License-Identifier: Apache-2.0 * - * Copyright 2015-2019 Andres Almiray. + * Copyright 2015-2020 Andres Almiray * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,8 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -apply plugin: 'application' +plugins { + id 'application' +} mainClassName = 'org.kordamp.jsilhouette.Sampler' diff --git a/subprojects/sampler-javafx/src/main/java/org/kordamp/jsilhouette/Sampler.java b/subprojects/sampler-javafx/src/main/java/org/kordamp/jsilhouette/Sampler.java index 596ff51..38364d2 100644 --- a/subprojects/sampler-javafx/src/main/java/org/kordamp/jsilhouette/Sampler.java +++ b/subprojects/sampler-javafx/src/main/java/org/kordamp/jsilhouette/Sampler.java @@ -1,7 +1,7 @@ /* * SPDX-License-Identifier: Apache-2.0 * - * Copyright 2015-2019 Andres Almiray + * Copyright 2015-2020 Andres Almiray * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/subprojects/sampler-javafx/src/main/resources/org/kordamp/jsilhouette/sampler.css b/subprojects/sampler-javafx/src/main/resources/org/kordamp/jsilhouette/sampler.css index 1986884..d0bda95 100644 --- a/subprojects/sampler-javafx/src/main/resources/org/kordamp/jsilhouette/sampler.css +++ b/subprojects/sampler-javafx/src/main/resources/org/kordamp/jsilhouette/sampler.css @@ -1,7 +1,7 @@ /** * SPDX-License-Identifier: Apache-2.0 * - * Copyright 2015-2019 Andres Almiray + * Copyright 2015-2020 Andres Almiray * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/subprojects/sampler-javafx/src/main/resources/org/kordamp/jsilhouette/sampler.fxml b/subprojects/sampler-javafx/src/main/resources/org/kordamp/jsilhouette/sampler.fxml index 2c86dd0..d955b66 100644 --- a/subprojects/sampler-javafx/src/main/resources/org/kordamp/jsilhouette/sampler.fxml +++ b/subprojects/sampler-javafx/src/main/resources/org/kordamp/jsilhouette/sampler.fxml @@ -2,7 +2,7 @@ SPDX-License-Identifier: Apache-2.0 - Copyright 2015-2019 Andres Almiray + Copyright 2015-2020 Andres Almiray Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.