Skip to content

Commit

Permalink
Update from Java11 to Java8
Browse files Browse the repository at this point in the history
  • Loading branch information
Andres Almiray committed Apr 10, 2020
1 parent 9ef3d05 commit 05659a6
Show file tree
Hide file tree
Showing 276 changed files with 22,301 additions and 16,927 deletions.
189 changes: 79 additions & 110 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,54 +1,63 @@
import java.text.SimpleDateFormat
/*
* 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.
*/
plugins {
id 'org.kordamp.gradle.kordamp-parentpom'
}

buildscript {
repositories {
jcenter()
maven { url 'https://plugins.gradle.org/m2/' }
}
config {
info {
name = 'Ikonli'
description = 'Icon packs for Java applications'
inceptionYear = '2015'
tags = ['icons', 'javafx', 'swing']

dependencies {
classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.2'
classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.11.0'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
classpath 'org.ajoberstar:gradle-git-publish:0.3.2'
classpath 'org.kordamp.gradle:stats-gradle-plugin:0.2.2'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.20.0'
classpath 'net.nemerosa:versioning:2.7.1'
specification { enabled = false }
}
}

apply plugin: 'org.ajoberstar.git-publish'
apply plugin: 'net.nemerosa.versioning'
docs {
sourceHtml {
overview {
stylesheet = project(':guide').file('src/javadoc/resources/css/stylesheet.css')
}
}

Date buildTimeAndDate = new Date()
ext {
buildBy = System.properties['user.name']
buildDate = new SimpleDateFormat('yyyy-MM-dd').format(buildTimeAndDate)
buildTime = new SimpleDateFormat('HH:mm:ss.SSSZ').format(buildTimeAndDate)
buildRevision = versioning.info.commit
buildCreatedBy = "${System.properties['java.version']} (${System.properties['java.vendor']} ${System.properties['java.vm.version']})".toString()
javadoc {
autoLinks {
enabled = false
}
options {
addBooleanOption('javafx', true)
}
aggregate {
enabled = false
}
}
}
}

allprojects {
apply plugin: 'base'
apply plugin: 'idea'
apply plugin: 'com.github.ben-manes.versions'

repositories {
jcenter()
}

if (JavaVersion.current().isJava8Compatible()) {
tasks.withType(Javadoc) {
options.addStringOption('Xdoclint:none', '-quiet')
}
}
}

idea {
project {
jdkName '1.8'
languageLevel '1.8'
jdkName '8'
languageLevel '8'

ipr {
withXml { provider ->
Expand All @@ -69,85 +78,45 @@ idea {
}

subprojects { subproj ->
apply plugin: 'java'
apply plugin: 'com.github.kt3k.coveralls'
apply plugin: 'org.kordamp.gradle.stats'
apply from: rootProject.file('gradle/code-coverage.gradle')
apply from: rootProject.file('gradle/code-quality.gradle')

subproj.tasks.withType(JavaCompile) {
sourceCompatibility = subproj.sourceCompatibility
targetCompatibility = subproj.targetCompatibility
}

repositories {
jcenter()
}
if (!subproj.name.contains('guide')) {
apply plugin: 'java-library'

if (subproj.name.contains('ikonli')) {
apply from: rootProject.file('gradle/publishing.gradle')

javadoc {
excludes = ['**/*.html', 'META-INF/**']

options.use = true
options.splitIndex = true
options.encoding = 'UTF-8'
options.author = true
options.version = true
options.windowTitle = "$project.name $project.version API"
options.docTitle = "$project.name $project.version API"
options.links = ['http://docs.oracle.com/javase/8/docs/api/',
'http://docs.oracle.com/javase/8/javafx/api/']
}

task sourcesJar(type: Jar) {
group 'Build'
description 'An archive of the source code'
classifier 'sources'
from sourceSets.main.allSource
}

task javadocJar(type: Jar) {
group 'Build'
description 'An archive of the javadoc'
classifier 'javadoc'
from javadoc.destinationDir
}

jar.finalizedBy sourcesJar
jar.finalizedBy javadocJar

artifacts {
sourcesJar
javadocJar
config {
bintray { enabled = true }
}

dependencies {
testCompile 'junit:junit:4.12'
}
}
}

evaluationDependsOnChildren()

if (!project.hasProperty('githubUsername')) ext.githubUsername = ''
if (!project.hasProperty('githubPassword')) ext.githubPassword = ''

gitPublish {
repoUri = project.project_scm
branch = 'gh-pages'
contents {
from project(':guide').guide.outputs.files
}
commitMessage = "Publish guide for $version"
license {
mapping {
fxml = 'XML_STYLE'
}
exclude '**/*.ttf'
exclude '**/*.eot'
exclude '**/*.svg'
exclude '**/*.otf'
exclude '**/*.woff'
exclude '**/*.woff2'
exclude '**/*.css'
exclude '**/*.md'
exclude '**/*.txt'
}

/*
credentials {
username = githubUsername
password = githubPassword
subproj.gradle.addBuildListener(new BuildAdapter() {
@Override
void projectsEvaluated(Gradle gradle) {
subproj.tasks.withType(Jar).each { Jar jar ->
jar.configure {
exclude '**/*.otf'
exclude '**/*.eot'
exclude '**/*.svg'
exclude '**/*.woff'
exclude '**/*.woff2'
}
}
}
})
}
*/
}

gitPublishCommit.dependsOn(project(':guide').guide)
48 changes: 34 additions & 14 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,39 +1,55 @@
version=2.4.0
group=org.kordamp.ikonli
sourceCompatibility=1.7
targetCompatibility=1.7
#
# 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.
#

project_description=Icon packs for Java applications
project_url=https://github.com/aalmiray/ikonli
project_scm=https://github.com/aalmiray/ikonli.git
project_issues=https://github.com/aalmiray/ikonli/issues
project_bintray_repo=kordamp
project_bintray_org=aalmiray
version = 2.5.0
group = org.kordamp.ikonli
sourceCompatibility = 1.8
targetCompatibility = 1.8

javadocFooter=Copyright © 2015-2018 Andres Almiray. All rights reserved.
jipsyVersion = 0.6.0
jacocoVersion = 0.8.5

kordampPluginVersion = 0.33.0
kordampPomVersion = 1.12.0
gitPluginVersion = 0.3.2

jipsyVersion = 0.4.1
jacocoVersion = 0.7.9
deviconsVersion = 1.8.0
dashiconsVersion = 20171213
elusiveVersion = 2.0
entypoVersion = 1.0
featherVersion = 1.1
fontawesomeVersion = 4.7.0
fontawesome5Version = 5.0.1
fontawesome5Version = 5.8.1
fontelicoVersion = 0.0
foundationVersion = 3.0
hawconsVersion = 1.0
ioniconsVersion = 2.0.1
ionicons4Version = 4.1.2
icomoonVersion = 0.0
lineconsVersion = 0.0
ligaturesymbolsVersion = 2.11
makiVersion = 0.5.0
maki2Version = 2.0.5
mapiconsVersion = 3.0.0
materialVersion = 2.2.3
materialdesignVersion = 1.7.22
metrizeiconsVersion = 0.0
ociiconsVersion = 1.0
octiconsVersion = 4.3.0
openiconicVersion = 1.1.0
paymentfontVersion = 1.2.5
Expand All @@ -43,3 +59,7 @@ themifyVersion = 1.0.1
weathericonsVersion = 2.0.10
websymbolsVersion = 0.0
zondiconsVersion = 20170712

org.gradle.daemon = true
org.gradle.caching = true
org.gradle.parallel = false
15 changes: 15 additions & 0 deletions gradle/LICENSE_HEADER
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
SPDX-License-Identifier: Apache-2.0

Copyright ${copyrightYear} ${author}

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.
18 changes: 0 additions & 18 deletions gradle/code-coverage.gradle

This file was deleted.

Loading

0 comments on commit 05659a6

Please sign in to comment.