From a0d43535cb680b90908e6ddb3ea599b9357a5eb2 Mon Sep 17 00:00:00 2001 From: Andres Almiray Date: Sat, 30 Nov 2019 14:52:26 +0100 Subject: [PATCH] Update build settings --- build.gradle | 54 ++----------------- settings.gradle | 2 +- .../json-lib-core/json-lib-core.gradle | 2 +- 3 files changed, 6 insertions(+), 52 deletions(-) diff --git a/build.gradle b/build.gradle index 12d78e1b..fb1abb9c 100644 --- a/build.gradle +++ b/build.gradle @@ -16,8 +16,9 @@ * limitations under the License. */ plugins { - id 'org.kordamp.gradle.kordamp-parentpom' version '1.8.0' - id 'org.kordamp.gradle.source-xref' version '0.29.0' + id 'org.kordamp.gradle.kordamp-parentpom' version '1.9.1' + id 'org.kordamp.gradle.java-project' version '0.30.3' + id 'org.kordamp.gradle.source-xref' version '0.30.3' } config { @@ -95,30 +96,6 @@ config { roles = ['contributor'] } } - - credentials { - sonatype { - username = project.sonatypeUsername - password = project.sonatypePassword - } - } - - scm { - url = 'https://github.com/aalmiray/json-lib' - connection = 'scm:git:https://github.com/aalmiray/json-lib.git' - developerConnection = 'scm:git:git@github.com:aalmiray/json-lib.git' - } - - repositories { - repository { - name = 'stagingRelease' - url = "${project.rootProject.buildDir}/repos/staging/release" - } - repository { - name = 'stagingSnapshot' - url = "${project.rootProject.buildDir}/repos/staging/snapshot" - } - } } sourceXref { @@ -130,36 +107,13 @@ config { // } javadoc { - enabled =true - } - - publishing { - signing = false - releasesRepository = 'stagingRelease' - snapshotsRepository = 'stagingSnapshot' + enabled = true } } allprojects { apply plugin: 'base' apply plugin: 'idea' - - repositories { - jcenter() - } - - dependencyUpdates.resolutionStrategy = { - componentSelection { rules -> - rules.all { selection -> - boolean rejected = ['alpha', 'beta', 'rc', 'cr'].any { qualifier -> - selection.candidate.version ==~ /(?i).*[.-]${qualifier}[.\d-]*/ - } - if (rejected) { - selection.reject('Release candidate') - } - } - } - } } idea { diff --git a/settings.gradle b/settings.gradle index 7cb10721..ced639bc 100644 --- a/settings.gradle +++ b/settings.gradle @@ -27,7 +27,7 @@ buildscript { gradlePluginPortal() } dependencies { - classpath 'org.kordamp.gradle:settings-gradle-plugin:0.29.0' + classpath 'org.kordamp.gradle:settings-gradle-plugin:0.30.3' } } apply plugin: 'org.kordamp.gradle.settings' diff --git a/subprojects/json-lib-core/json-lib-core.gradle b/subprojects/json-lib-core/json-lib-core.gradle index a5a56767..4b146f4f 100644 --- a/subprojects/json-lib-core/json-lib-core.gradle +++ b/subprojects/json-lib-core/json-lib-core.gradle @@ -16,7 +16,7 @@ * limitations under the License. */ plugins { - id 'java' + id 'java-library' } dependencies {