From b2ad0cedccd735452837d05104201e346df1aea6 Mon Sep 17 00:00:00 2001 From: aalmiray Date: Tue, 8 Mar 2016 10:20:06 +0100 Subject: [PATCH 01/15] Create java8 branch --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 8cc5955..d925661 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ group = org.codehaus.groovyfx archivesBaseName = groovyfx -version = 1.0.0-SNAPSHOT +version = 8.0.0-SNAPSHOT groovyfx_requiredJavaFxVersion = 8.0.* groovyfx_groovyVersion = 2.4.6 groovyfx_junitVersion = 4.12 From 608c7b7ff9e7046c7b32f0fb4e480f66b8e4c074 Mon Sep 17 00:00:00 2001 From: aalmiray Date: Tue, 8 Mar 2016 10:20:46 +0100 Subject: [PATCH 02/15] Update readme --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 92d90f9..45496f9 100644 --- a/README.adoc +++ b/README.adoc @@ -1,5 +1,5 @@ = GroovyFx -:version: 1.0.0-SNAPSHOT +:version: 8.0.0-SNAPSHOT :project-name: groovyfx :branch: master From c9c6bb734424da68f33ff40b771c7c8c8704cc6a Mon Sep 17 00:00:00 2001 From: Stephan Classen Date: Thu, 31 Mar 2016 20:10:21 +0200 Subject: [PATCH 03/15] add apache 2 license file --- LICENSE | 177 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 177 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f433b1a --- /dev/null +++ b/LICENSE @@ -0,0 +1,177 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS From 6d7173e63edf8b5ed7a93e0cbf679b1bdf38c67e Mon Sep 17 00:00:00 2001 From: Stephan Classen Date: Thu, 31 Mar 2016 21:05:16 +0200 Subject: [PATCH 04/15] add configuration for publishing to Bintray --- build.gradle | 6 ++- gradle.properties | 5 +++ gradle/publishing.gradle | 85 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 gradle/publishing.gradle diff --git a/build.gradle b/build.gradle index 2f78b82..2118cff 100755 --- a/build.gradle +++ b/build.gradle @@ -28,6 +28,7 @@ buildscript { classpath 'com.github.ben-manes:gradle-versions-plugin:0.12.0' classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.11.0' classpath 'net.nemerosa:versioning:1.6.0' + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6' } final javafxHome = System.env['JAVAFX_HOME'] @@ -76,6 +77,7 @@ ext { apply plugin: 'groovy' apply plugin: 'maven' +apply plugin: 'maven-publish' apply plugin: 'signing' apply plugin: 'idea' apply plugin: 'jacoco' @@ -84,6 +86,7 @@ apply plugin: 'org.asciidoctor.convert' apply plugin: 'com.github.kt3k.coveralls' apply plugin: 'com.github.ben-manes.versions' apply plugin: 'net.nemerosa.versioning' +apply plugin: 'com.jfrog.bintray' repositories { if (project.hasProperty('groovyfx_useMavenLocal') && Boolean.valueOf(project.groovyfx_useMavenLocal)) { mavenLocal() } @@ -108,6 +111,7 @@ dependencies { apply { from 'gradle/demo.gradle' from 'gradle/deploy.gradle' + from 'gradle/publishing.gradle' from 'gradle/code-quality.gradle' } @@ -204,4 +208,4 @@ processResources { 'groovyfx.version' : project.version ]) } -} \ No newline at end of file +} diff --git a/gradle.properties b/gradle.properties index d925661..64ea7c7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,3 +7,8 @@ groovyfx_junitVersion = 4.12 groovyfx_spockVersion = 1.0-groovy-2.4 sourceCompatibility = 1.8 targetCompatibility = 1.8 + +project_description = A library for writing JavaFX 2.0 applications in the Groovy language +project_url = http://groovyfx.org +project_scm = https://github.com/groovyfx-project/groovyfx.git +project_issues = https://github.com/groovyfx-project/groovyfx/issues diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle new file mode 100644 index 0000000..0070486 --- /dev/null +++ b/gradle/publishing.gradle @@ -0,0 +1,85 @@ +/* + * Copyright 2011-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 + * + * 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. + */ + +// ------------- Bintray deployment --------------- + +def pomConfig = { + name project.name + description project.project_description + url project.project_url + inceptionYear '2011' + licenses { + license([:]) { + name 'The Apache Software License, Version 2.0' + url 'http://www.apache.org/licenses/LICENSE-2.0.txt' + distribution 'repo' + } + } + scm { + url project.project_scm + } + developers { + [ + JimClarke5 : 'Jim Clarke', + deanriverson : 'Dean Iverson', + russel : 'Russel Winder', + aalmiray : 'Andres Almiray', + Dierk : 'Dierk König' + ].each { devId, devName -> + developer { + id devId + name devName + roles { + role 'Developer' + } + } + } + } +} + +publishing { + publications { + mavenJava(MavenPublication) { + from components.java + artifact sourcesJar + + pom.withXml { + asNode().children().last() + pomConfig + } + } + } +} + +if (!project.hasProperty('bintrayApiKey')) ext.bintrayApiKey = '' +if (!project.hasProperty('bintrayUserName')) ext.bintrayUserName = '' + +bintray { + user = project.bintrayUserName + key = project.bintrayApiKey + publications = ['mavenJava'] + pkg { + repo = 'maven' + userOrg = 'groovyfx' + name = project.name + desc = project.project_description + licenses = ['Apache-2.0'] + labels = ['Groovy', 'JavaFX'] + websiteUrl = project.project_url + issueTrackerUrl = project.project_issues + vcsUrl = project.project_scm + publicDownloadNumbers = true + } +} From b76c228dc41d0994158597f4643e317470637a03 Mon Sep 17 00:00:00 2001 From: aalmiray Date: Fri, 1 Apr 2016 22:50:15 +0200 Subject: [PATCH 05/15] Minor build updates --- build.gradle | 7 ++++++- config/checkstyle/checkstyle-api.xml | 2 +- config/checkstyle/checkstyle-groovy.xml | 2 +- config/checkstyle/checkstyle.xml | 2 +- config/codenarc/codenarc.groovy | 2 +- gradle/code-quality.gradle | 2 +- gradle/demo.gradle | 2 +- gradle/deploy.gradle | 2 +- gradle/publishing.gradle | 2 +- .../javafx/extension/NumberExtensionSpec.groovy | 15 +++++++++++++++ 10 files changed, 29 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 2118cff..cd3ff37 100755 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ buildscript { classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.6.3' classpath 'com.github.ben-manes:gradle-versions-plugin:0.12.0' classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.11.0' - classpath 'net.nemerosa:versioning:1.6.0' + classpath 'net.nemerosa:versioning:1.6.2' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6' } @@ -131,6 +131,11 @@ jar { 'Implementation-Vendor': 'grovvyfx.org' ) } + + metaInf { + from '.' + include 'LICENSE' + } } signArchives.onlyIf { diff --git a/config/checkstyle/checkstyle-api.xml b/config/checkstyle/checkstyle-api.xml index 7d4e537..fa9fb78 100644 --- a/config/checkstyle/checkstyle-api.xml +++ b/config/checkstyle/checkstyle-api.xml @@ -1,5 +1,5 @@