From f603f067ee5941a73a33960320f89450ea29b008 Mon Sep 17 00:00:00 2001 From: "roman.kisluhin" Date: Thu, 18 Feb 2016 18:39:13 +0400 Subject: [PATCH] GGradle project settings updated --- build.gradle | 35 ++++++----------------------------- 1 file changed, 6 insertions(+), 29 deletions(-) diff --git a/build.gradle b/build.gradle index dbbd4e6..8dbbd25 100644 --- a/build.gradle +++ b/build.gradle @@ -10,13 +10,14 @@ buildscript { group = 'biz.redsoft.sample' +apply plugin: 'idea' apply plugin: 'application' apply plugin: 'war' apply plugin: 'ncore' -apply plugin: 'maven-publish' +apply plugin: 'biz.redsoft.release' +apply plugin: 'biz.redsoft.maven-publish' - -targetCompatibility = 1.6 +targetCompatibility = 1.8 ncore { coreVersion = project.properties.'biz.redsoft.ncore.version' @@ -37,32 +38,6 @@ run.args = ['client', '-config', 'ncore-properties.xml', '-config', 'ncore-properties-local.xml'] -publishing { - repositories { - project.hasProperty('biz.redsoft.repo.user') && project.hasProperty('biz.redsoft.repo.password') && maven { - credentials { - username project.'biz.redsoft.repo.user' - password project.'biz.redsoft.repo.password' - } - def suffix = project.version.toString().endsWith('SNAPSHOT') ? 'snapshots' : 'releases' - url "http://nexus.red-soft.biz/nexus/content/repositories/${suffix}" - } - } - publications { - mavenJava(MavenPublication) { - from components.java - - artifact sourceJar - artifact updatesJar - } - mavenJavaGen(MavenPublication) { - artifactId "${genJar.baseName}-${genJar.appendix}" - artifact genJar - artifact genSourceJar - } - } -} - task copyDist(type: Copy) { from distZip from war @@ -81,3 +56,5 @@ release { task buildRelease(type: GradleBuild) { tasks = ['clean', 'writeVersion', 'nbackup', 'build', 'copyDist', 'publish'] } + +idea { module.scopes.PROVIDED.plus += [configurations.provided] }