Mercurial > public > develkit

diff init.gradle @ 104:13a1e737ca31

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
USASR-800: Fix command line env setting
author smith@nwoca.org
date Sat, 31 Mar 2012 19:03:26 +0100
parents 3267840f534f
children f7b0f9d286b8
line wrap: on
line diff
--- a/init.gradle	Sat Mar 31 18:43:07 2012 +0100
+++ b/init.gradle	Sat Mar 31 19:03:26 2012 +0100
@@ -48,7 +48,7 @@
     def void projectsEvaluated(Gradle gradle) {
         def ssdtArtifactory = 'http://repos.ssdt.nwoca.org/artifactory'
         Project root = gradle.getRootProject()       
-        root.allprojects {
+       root.allprojects {
             def thisProject = delegate        
             configurations.all {
                 resolutionStrategy.cacheChangingModulesFor 120, 'minutes'
@@ -120,7 +120,7 @@
     if (file('private.properties').exists()) {
         developerPrivate.load(file('private.properties').newReader())
     }
-    gradle.ext.env = (gradle.ext.has('env') ? gradle.env : (developerPrivate.env ?: 'dev'))
+    gradle.ext.env = (hasProperty('env') ? getProperty('env') : (developerPrivate.env ?: 'dev'))
     println "Environment is: $gradle.env"
     def slurper = new ConfigSlurper(gradle.env)
     def environment = new ConfigObject()