build.gradle.kts:

- added version info to manifest
- added META-INF/LICENSE
- Java source/target compatibility now defined in single location
- defined source file encoding for java compiler
This commit is contained in:
Karl Tauber
2020-02-16 16:58:01 +01:00
parent 7489526eb7
commit 5f40ab130e
7 changed files with 30 additions and 31 deletions

View File

@@ -49,3 +49,28 @@ extra["bintray.dryRun"] = false
// if true, uploaded artifacts are visible to all
// if false, only visible to owner when logged into bintray
extra["bintray.publish"] = true
allprojects {
tasks {
withType<JavaCompile>().configureEach {
sourceCompatibility = "1.8"
targetCompatibility = "1.8"
options.encoding = "ISO-8859-1"
}
withType<Jar>().configureEach {
// manifest for all created JARs
manifest.attributes(mapOf(
"Implementation-Vendor" to "FormDev Software GmbH",
"Implementation-Copyright" to "Copyright (C) ${java.time.LocalDate.now().year} FormDev Software GmbH. All rights reserved.",
"Implementation-Version" to project.version))
// add META-INF/LICENSE to all created JARs
from("${rootDir}/LICENSE") {
into("META-INF")
}
}
}
}

View File

@@ -33,11 +33,6 @@ if( JavaVersion.current() >= JavaVersion.VERSION_1_9 ) {
}
}
java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
tasks {
assemble {
dependsOn(

View File

@@ -34,11 +34,6 @@ dependencies {
implementation( "com.jgoodies:jgoodies-forms:1.9.0" )
}
java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
tasks {
jar {
dependsOn( ":flatlaf-core:jar" )
@@ -52,7 +47,11 @@ tasks {
// include all dependencies in jar
from( {
configurations.runtimeClasspath.get().filter { it.name.endsWith( "jar" ) }.map { zipTree( it ) }
configurations.runtimeClasspath.get()
.filter { it.name.endsWith( "jar" ) }
.map { zipTree( it ).matching {
exclude( "META-INF/LICENSE" )
} }
} )
}
}

View File

@@ -22,8 +22,3 @@ dependencies {
implementation( project( ":flatlaf-core" ) )
implementation( "com.formdev:svgSalamander:1.1.2.1" )
}
java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

View File

@@ -26,11 +26,6 @@ dependencies {
implementation( "com.jidesoft:jide-oss:3.6.18" )
}
java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
tasks {
assemble {
dependsOn(

View File

@@ -26,11 +26,6 @@ dependencies {
implementation( "org.swinglabs.swingx:swingx-all:1.6.5-1" )
}
java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
tasks {
assemble {
dependsOn(

View File

@@ -36,8 +36,3 @@ dependencies {
// implementation( "com.weblookandfeel:weblaf-ui:1.2.12" )
// implementation( "com.jgoodies:jgoodies-looks:2.7.0" )
}
java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}