Upgrade to gradle 7.1.1

master
kaklakariada 2021-07-11 18:24:30 +02:00
parent c089124cca
commit 31b28ae965
4 changed files with 172 additions and 172 deletions

View File

@ -1,170 +1,170 @@
plugins {
id 'java'
id 'signing'
id 'maven-publish'
id 'jacoco'
id "com.github.hierynomus.license" version "0.16.1"
id "org.sonarqube" version "3.3"
id 'com.github.johnrengelman.shadow' version '7.0.0'
id 'io.codearte.nexus-staging' version '0.30.0'
}
repositories {
mavenCentral()
maven {
url 'http://4thline.org/m2'
allowInsecureProtocol true
}
flatDir { dirs 'lib' }
}
version = '2.2.2'
group 'com.github.kaklakariada'
java {
toolchain {
languageVersion = JavaLanguageVersion.of(11)
}
withJavadocJar()
withSourcesJar()
}
javadoc {
options.addBooleanOption('html5', true)
}
tasks.withType(JavaCompile) {
options.compilerArgs << '-Xlint:all'
options.encoding = 'UTF-8'
}
test {
if (logger.infoEnabled) {
testLogging.showStandardStreams = true
}
jvmArgs '-XX:+HeapDumpOnOutOfMemoryError', '-enableassertions'
}
processResources {
rename(/(\w+)_en.properties/, '$1.properties')
rename(/(\w+)_zh_CN.properties/, '$1_zh.properties')
filter { line -> line.replaceAll(/@VERSION_NUMBER@/, project.version) }
}
shadowJar {
archiveBaseName = 'portmapper'
archiveVersion = null
}
def mainClass = 'org.chris.portmapper.PortMapperStarter'
jar {
manifest {
attributes 'Main-Class': mainClass
}
}
tasks["build"].dependsOn(shadowJar)
task run(type: JavaExec, dependsOn: shadowJar) {
classpath = shadowJar.outputs.files
main = mainClass
workingDir = rootProject.projectDir
}
artifacts {
archives shadowJar
}
dependencies {
implementation 'args4j:args4j:2.33'
implementation 'org.slf4j:slf4j-api:1.7.31'
implementation 'org.slf4j:jul-to-slf4j:1.7.31'
implementation 'ch.qos.logback:logback-classic:1.2.3'
implementation 'com.miglayout:miglayout-swing:5.2'
implementation 'org.jdesktop.bsaf:bsaf:1.9.2'
implementation ':sbbi-upnplib:1.0.4'
implementation 'org.fourthline.cling:cling-support:2.1.2'
implementation 'org.bitlet:weupnp:0.1.4'
runtimeOnly 'commons-jxpath:commons-jxpath:1.1' // sbbi
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.mockito:mockito-core:3.11.2'
}
license {
header = file('gradle/license-header.txt')
}
jacocoTestReport {
dependsOn test
reports {
xml.enabled true
}
}
tasks["sonarqube"].dependsOn(tasks["jacocoTestReport"])
def getOptionalProperty(String name) {
if(project.hasProperty(name)) {
return project.property(name)
}
logger.info("Project property '${name}' not available. Please it to ~/.gradle/gradle.properties")
return null
}
publishing {
publications {
mavenJava(MavenPublication) {
from components.java
pom {
name = 'UPnP Portmapper'
description = 'A tool for managing port forwardings via UPnP'
url = 'https://github.com/kaklakariada/portmapper'
licenses {
license {
name = 'GNU General Public License, Version 3.0'
url = 'https://www.gnu.org/licenses/gpl-3.0.txt'
}
}
developers {
developer {
id = 'kaklakariada'
name = 'Christoph'
email = 'kaklakariada@chp1.net'
}
}
scm {
connection = 'scm:git:https://github.com/kaklakariada/portmapper.git'
developerConnection = 'scm:git:https://github.com/kaklakariada/portmapper.git'
url = 'https://github.com/kaklakariada/portmapper'
}
}
}
}
repositories {
maven {
def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
allowInsecureProtocol = false
credentials(PasswordCredentials) {
username = getOptionalProperty("ossrhUsername")
password = getOptionalProperty("ossrhPassword")
}
}
}
}
signing {
sign publishing.publications.mavenJava
}
nexusStaging {
packageGroup = project.group
username = getOptionalProperty("ossrhUsername")
password = getOptionalProperty("ossrhPassword")
}
plugins {
id 'java'
id 'signing'
id 'maven-publish'
id 'jacoco'
id "com.github.hierynomus.license" version "0.16.1"
id "org.sonarqube" version "3.3"
id 'com.github.johnrengelman.shadow' version '7.0.0'
id 'io.codearte.nexus-staging' version '0.30.0'
}
repositories {
mavenCentral()
maven {
url 'http://4thline.org/m2'
allowInsecureProtocol true
}
flatDir { dirs 'lib' }
}
version = '2.2.2'
group 'com.github.kaklakariada'
java {
toolchain {
languageVersion = JavaLanguageVersion.of(11)
}
withJavadocJar()
withSourcesJar()
}
javadoc {
options.addBooleanOption('html5', true)
}
tasks.withType(JavaCompile) {
options.compilerArgs << '-Xlint:all'
options.encoding = 'UTF-8'
}
test {
if (logger.infoEnabled) {
testLogging.showStandardStreams = true
}
jvmArgs '-XX:+HeapDumpOnOutOfMemoryError', '-enableassertions'
}
processResources {
rename(/(\w+)_en.properties/, '$1.properties')
rename(/(\w+)_zh_CN.properties/, '$1_zh.properties')
filter { line -> line.replaceAll(/@VERSION_NUMBER@/, project.version) }
}
shadowJar {
archiveBaseName = 'portmapper'
archiveVersion = null
}
def mainClass = 'org.chris.portmapper.PortMapperStarter'
jar {
manifest {
attributes 'Main-Class': mainClass
}
}
tasks["build"].dependsOn(shadowJar)
task run(type: JavaExec, dependsOn: shadowJar) {
classpath = shadowJar.outputs.files
mainClass = mainClass
workingDir = rootProject.projectDir
}
artifacts {
archives shadowJar
}
dependencies {
implementation 'args4j:args4j:2.33'
implementation 'org.slf4j:slf4j-api:1.7.31'
implementation 'org.slf4j:jul-to-slf4j:1.7.31'
implementation 'ch.qos.logback:logback-classic:1.2.3'
implementation 'com.miglayout:miglayout-swing:5.2'
implementation 'org.jdesktop.bsaf:bsaf:1.9.2'
implementation ':sbbi-upnplib:1.0.4'
implementation 'org.fourthline.cling:cling-support:2.1.2'
implementation 'org.bitlet:weupnp:0.1.4'
runtimeOnly 'commons-jxpath:commons-jxpath:1.1' // sbbi
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.mockito:mockito-core:3.11.2'
}
license {
header = file('gradle/license-header.txt')
}
jacocoTestReport {
dependsOn test
reports {
xml.required = true
}
}
tasks["sonarqube"].dependsOn(tasks["jacocoTestReport"])
def getOptionalProperty(String name) {
if(project.hasProperty(name)) {
return project.property(name)
}
logger.info("Project property '${name}' not available. Please it to ~/.gradle/gradle.properties")
return null
}
publishing {
publications {
mavenJava(MavenPublication) {
from components.java
pom {
name = 'UPnP Portmapper'
description = 'A tool for managing port forwardings via UPnP'
url = 'https://github.com/kaklakariada/portmapper'
licenses {
license {
name = 'GNU General Public License, Version 3.0'
url = 'https://www.gnu.org/licenses/gpl-3.0.txt'
}
}
developers {
developer {
id = 'kaklakariada'
name = 'Christoph'
email = 'kaklakariada@chp1.net'
}
}
scm {
connection = 'scm:git:https://github.com/kaklakariada/portmapper.git'
developerConnection = 'scm:git:https://github.com/kaklakariada/portmapper.git'
url = 'https://github.com/kaklakariada/portmapper'
}
}
}
}
repositories {
maven {
def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
allowInsecureProtocol = false
credentials(PasswordCredentials) {
username = getOptionalProperty("ossrhUsername")
password = getOptionalProperty("ossrhPassword")
}
}
}
}
signing {
sign publishing.publications.mavenJava
}
nexusStaging {
packageGroup = project.group
username = getOptionalProperty("ossrhUsername")
password = getOptionalProperty("ossrhPassword")
}

Binary file not shown.

View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

2
gradlew vendored
View File

@ -72,7 +72,7 @@ case "`uname`" in
Darwin* )
darwin=true
;;
MINGW* )
MSYS* | MINGW* )
msys=true
;;
NONSTOP* )