comparison init20.gradle @ 199:5bc8264bb979

revert change to snapshot version based on branch
author smith@nwoca.org
date Wed, 05 Aug 2015 13:31:24 +0100
parents 9e4e8ae8f54a
children 8aab0c2c1259
comparison
equal deleted inserted replaced
198:9e4e8ae8f54a 199:5bc8264bb979
331 thisProject.status = 'integration' 331 thisProject.status = 'integration'
332 def fixupVersion = thisProject.version - ".SNAPSHOT" 332 def fixupVersion = thisProject.version - ".SNAPSHOT"
333 if (gradle.branchStream == 'feature') { 333 if (gradle.branchStream == 'feature') {
334 fixupVersion = fixupVersion + ".SNAPSHOT" 334 fixupVersion = fixupVersion + ".SNAPSHOT"
335 } 335 }
336 if (gradle.branchStream == 'master') { 336 if (gradle.branchStream == 'develop') {
337 fixupVersion = fixupVersion + ".SNAPSHOT" 337 fixupVersion = fixupVersion + ".SNAPSHOT"
338 } 338 }
339 if (gradle.branchStream in ['production', 'release','hotfix']) { 339 if (gradle.branchStream in ['production', 'release','hotfix']) {
340 thisProject.status = 'release' 340 thisProject.status = 'release'
341 } 341 }
413 413
414 root.subprojects { p -> 414 root.subprojects { p ->
415 if (root.useIndy()) { 415 if (root.useIndy()) {
416 def groovyIndy = p.configurations.compile.files.find { f -> f.name.startsWith('groovy-all') && f.name.contains('-indy') } 416 def groovyIndy = p.configurations.compile.files.find { f -> f.name.startsWith('groovy-all') && f.name.contains('-indy') }
417 if (groovyIndy) { 417 if (groovyIndy) {
418 logger.info "enabling indy on $p" 418 // println "enabling indy compilation on $p"
419 [compileGroovy.groovyOptions, compileTestGroovy.groovyOptions]*.with { 419 [compileGroovy.groovyOptions, compileTestGroovy.groovyOptions]*.with {
420 optimizationOptions = [indy: true] 420 optimizationOptions = [indy: true]
421 } 421 }
422 } 422 }
423 } 423 }