Upgrade Gradle wrapper to 2.13

Add travis settings
Change license to ASL2 only
Update license headers

.travis.yml

@@ -0,0 +1,11 @@
+language: java
+before_install:
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+  - sudo apt-get update -qq
+  - sudo apt-get install oracle-java8-installer
+before_script:
+  - ./gradlew --version
+script: ./gradlew clean build 
+jdk: oraclejdk8
+env: TERM=dumb

README.adoc

@@ -4,20 +4,14 @@
 :project-repo: kordamp
 :project-name: ikonli
 
-image:http://img.shields.io/badge/license-GPL3-blue.svg["GPL3 Licensed", link="http://opensource.org/licenses/GPL3"]
+image:http://img.shields.io/travis/aalmiray/ikonli/master.svg["Build Status (travis)", link="https://travis-ci.org/aalmiray/ikonli"]
 image:http://img.shields.io/badge/license-ASL2-blue.svg["ASL3 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"]
 
 ---
 
 Ikonli provides icon packs that can be used in Java applications. Currently Swing and JavaFX UI toolkits are supported.
 
-== Licensing
-
-Ikonli is open source software with dual licensing, under GPLv3 and ASLv2. GPLv3 is the base license that governs all
-source code. If you make use of Ikonli with either the link:https://github.com/griffon/griffon[Griffon Framework] or
-the link:https://github.com/basilisk-fw/basilisk[Basilisk Framework] then the GPLv3 is suspended and ASLv2 applies.
-
 == Installing
 
 You can get the latest version of **Ikonli** directly from link:https://bintray.com[Bintray's JCenter] repository.

build.gradle

@@ -62,11 +62,6 @@ subprojects { subproj ->
     apply from: rootProject.file('gradle/code-coverage.gradle')
     apply from: rootProject.file('gradle/code-quality.gradle')
 
-    configurations {
-        compileOnly
-        testCompileOnly
-    }
-
     subproj.tasks.withType(JavaCompile) {
         sourceCompatibility = subproj.sourceCompatibility
         targetCompatibility = subproj.targetCompatibility
@@ -76,26 +71,6 @@ subprojects { subproj ->
         jcenter()
     }
 
-    sourceSets {
-        main {
-            compileClasspath += [configurations.compileOnly]
-        }
-        test {
-            compileClasspath += [configurations.testCompileOnly]
-        }
-    }
-
-    javadoc {
-        classpath += [configurations.compileOnly]
-    }
-
-    idea {
-        module {
-            scopes.PROVIDED.plus += [configurations.compileOnly]
-            scopes.PROVIDED.plus += [configurations.testCompileOnly]
-        }
-    }
-
     if (subproj.name.contains('ikonli')) {
         apply from: rootProject.file('gradle/publishing.gradle')
 

config/HEADER

@@ -1,40 +1,5 @@
 Copyright ${year} Andres Almiray. <[email protected]>
 
-This file is part of Ikonli
-
-Ikonli is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-Ikonli is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Ikonli. If not, see <http://www.gnu.org/licenses/>.
-
-========================================================================
-
-This library is distributed under the terms of the GNU General Public
-License with the following clarification and special exception:
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library. Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As an special exception, the copyright holders of this library give
-you permission to use this library under the terms of the Apache
-Software License v2 and forego the licensing terms of the GNU General
-Public License if and only if the library is used as part of an
-executable and/or application that makes use of the APIs of either the
-Griffon Framework (https://github.com/griffon/griffon) or the
-Basilisk Framework (https://github.com/basilisk-fw/basilisk).
-
-========================================================================
-
 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

gradle.properties

@@ -13,6 +13,7 @@ project_bintray_org=aalmiray
 
 javadocFooter=Copyright © 2015-2016 Andres Almiray. All rights reserved.
 
+jacocoVersion         = 0.7.6.201602180812
 deviconsVersion       = 1.8.0
 elusiveVersion        = 2.0
 featherVersion        = 1.1

gradle/code-coverage.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'jacoco'
 
 jacoco {
-    toolVersion = '0.7.4.201502262128'
+    toolVersion = jacocoVersion  
 }
 
 jacocoTestReport {

gradle/javafx.gradle

@@ -1,19 +1,3 @@
-/*
- * Copyright 2008-2016 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.
- */
-
 ext.jfxrtLocation = new File("${System.properties['java.home']}/jre/lib/jfxrt.jar").absolutePath
 
 for (location in ['lib/jfxrt.jar', 'jre/lib/jfxrt.jar', 'jre/lib/ext/jfxrt.jar']) {

gradle/publishing.gradle

@@ -27,7 +27,6 @@ jar {
     metaInf {
         from(rootProject.files('.')) {
             include 'LICENSE*'
-            include 'NOTICE'
         }
     }
 }
@@ -38,11 +37,6 @@ def pomConfig = {
     url project.project_url
     inceptionYear '2015'
     licenses {
-        license([:]) {
-            name 'LGPL3'
-            url 'http://www.gnu.org/licenses/lgpl-3.0.en.html'
-            distribution 'repo'
-        }
         license([:]) {
             name 'The Apache Software License, Version 2.0'
             url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
@@ -93,7 +87,7 @@ bintray {
         userOrg = project.project_bintray_org
         name = rootProject.name
         desc = rootProject.project_description
-        licenses = ['LGPL-3.0', 'Apache-2.0']
+        licenses = ['Apache-2.0']
         labels = []
         websiteUrl = project.project_url
         issueTrackerUrl = project.project_issues

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Feb 18 16:20:57 CET 2016
+#Mon May 02 09:42:52 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip

gradlew

@@ -6,12 +6,30 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 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=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,26 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then

gradlew.bat

@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@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=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 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=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 

subprojects/guide/src/asciidoc/introduction.adoc

@@ -4,12 +4,6 @@
 
 Ikonli provides icon packs that can be used in Java applications. Currently Swing and JavaFX UI toolkits are supported.
 
-== Licensing
-
-Ikonli is open source software with dual licensing, under GPLv3 and ASLv2. GPLv3 is the base license that governs all
-source code. If you make use of Ikonli with either the link:https://github.com/griffon/griffon[Griffon Framework] or
-the link:https://github.com/basilisk-fw/basilisk[Basilisk Framework] then the GPLv3 is suspended and ASLv2 applies.
-
 == Download
 
 Ikonli and all of its icon packs can be downloaded from Bintray

subprojects/ikonli-core/src/main/java/org/kordamp/ikonli/AbstractIkonHandler.java

@@ -1,41 +1,6 @@
 /*
  * Copyright 2015-2016 Andres Almiray. <[email protected]>
  *
- * This file is part of Ikonli
- *
- * Ikonli is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Ikonli is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Ikonli. If not, see <http://www.gnu.org/licenses/>.
- *
- * ========================================================================
- *
- * This library is distributed under the terms of the GNU General Public
- * License with the following clarification and special exception:
- *
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * conditions of the GNU General Public License cover the whole
- * combination.
- *
- * As an special exception, the copyright holders of this library give
- * you permission to use this library under the terms of the Apache
- * Software License v2 and forego the licensing terms of the GNU General
- * Public License if and only if the library is used as part of an
- * executable and/or application that makes use of the APIs of either the
- * Griffon Framework (https://github.com/griffon/griffon) or the
- * Basilisk Framework (https://github.com/basilisk-fw/basilisk).
- *
- * ========================================================================
- *
  * 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