From dceb1bbd79723df7e084b167505e203a2ffbb4b4 Mon Sep 17 00:00:00 2001 From: c14103 Date: Wed, 25 Oct 2017 10:34:39 -0400 Subject: [PATCH] update gradle version and apply latest addon gradle scripts to build --- .gitignore | 1 + build.gradle | 21 +++++++++------------ wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 9745d28..3005dfb 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ *.iml *.ipr *.iws +.idea/ build/ gradle-app.setting diff --git a/build.gradle b/build.gradle index a44c476..9d2752b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,28 +1,25 @@ // this bit of complexity is to pull down the main build script from the alclabs maven repository // and then apply it. configurations { gradleScript } -repositories { mavenRepo url: 'http://repo.alcshare.com' } -dependencies { gradleScript group: 'com.alcshare', name: 'addon-gradle', ext: 'gradle', version: '1.1' } +repositories { maven { url 'http://repo.alcshare.com'} } +dependencies { gradleScript group: 'com.alcshare', name: 'addon-gradle', ext: 'gradle', version: '1.7' } apply from: configurations.gradleScript.resolve().iterator().next() signAddon() // request for this add-on to be signed (so we can specify that no license requirements should be enforced) - info { - name = 'Modstat' - description = 'Gather, parse, and find errors in module status reports' - version = '1.1.0' - vendor = 'ALC Labs' - - // make this add-on function regardless of the license - licenseRequirements {} + name = 'Modstat' + description = 'Gather, parse, and find errors in module status reports' + version = '1.1.0' + vendor = 'ALC Labs' // make this add-on function regardless of the license + licenseRequirements {} } - +apply plugin: 'groovy' dependencies { compile 'commons-io:commons-io:1.4' compile 'org.json:json:20080701' compile 'com.intellij:annotations:7.0.3' - groovy 'org.codehaus.groovy:groovy-all:1.8.6' + compile 'org.codehaus.groovy:groovy-all:1.8.6' testCompile 'org.spockframework:spock-core:0.6-groovy-1.8' testCompile 'junit:junit:4.8.1' diff --git a/wrapper/gradle-wrapper.properties b/wrapper/gradle-wrapper.properties index 1710a76..acf8073 100644 --- a/wrapper/gradle-wrapper.properties +++ b/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.0-bin.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-3.1-bin.zip