Use target=10.2 instead of variant=Old

I think this will be more clear to future devs
This commit is contained in:
Chris Willis-Ford 2015-07-31 12:39:17 -07:00
parent 8df2fa8be0
commit 67907db0f9
3 changed files with 9 additions and 8 deletions

View file

@ -2,9 +2,10 @@ language: groovy
cache: cache:
directories: directories:
- $HOME/.gradle/caches/ - $HOME/.gradle/caches/
- $HOME/.gradle/wrapper/dists/
script: script:
- ./gradlew check -Pvariant=New - ./gradlew check -Ptarget=11.6
- ./gradlew check -Pvariant=Old - ./gradlew check -Ptarget=10.2
notifications: notifications:
slack: slack:
secure: TFnMix3WLFecQLMgmSIsUrnZUV7s5U7mJlzkfLrGU02u0uztjLcJr9qekg65I0wFtqGuMGAOfPAZo4hf0l5djzJTSUobLdlTpEunIEWd53IUZlljKCJQsVT8hfJtbjpIXMraLRLyTzDkXcRO3v2xthU30vsSI75sxQYufBx5/sU= secure: TFnMix3WLFecQLMgmSIsUrnZUV7s5U7mJlzkfLrGU02u0uztjLcJr9qekg65I0wFtqGuMGAOfPAZo4hf0l5djzJTSUobLdlTpEunIEWd53IUZlljKCJQsVT8hfJtbjpIXMraLRLyTzDkXcRO3v2xthU30vsSI75sxQYufBx5/sU=

View file

@ -1,5 +1,5 @@
environments { environments {
New { '11.6' {
output = 'Scratch' output = 'Scratch'
playerVersion = '11.6' playerVersion = '11.6'
additionalCompilerOptions = [ additionalCompilerOptions = [
@ -7,7 +7,7 @@ environments {
"-define+=SCRATCH::allow3d,true", "-define+=SCRATCH::allow3d,true",
] ]
} }
Old { '10.2' {
output = 'ScratchFor10.2' output = 'ScratchFor10.2'
playerVersion = '10.2' playerVersion = '10.2'
additionalCompilerOptions = [ additionalCompilerOptions = [

View file

@ -21,14 +21,14 @@ repositories {
apply plugin: org.gradlefx.plugins.GradleFxPlugin apply plugin: org.gradlefx.plugins.GradleFxPlugin
def commonDir = ext.commonDir def commonDir = ext.commonDir
def variant = hasProperty('variant') ? variant : 'New' def target = hasProperty('target') ? target : '11.6'
println "Variant is: $variant" println "Target is: $target"
def config = new ConfigSlurper(variant).parse(file("${commonDir}/config.groovy").toURL()) def config = new ConfigSlurper(target).parse(file("${commonDir}/config.groovy").toURL())
type = 'mobile' type = 'mobile'
version = '1.0-SNAPSHOT' version = '1.0-SNAPSHOT'
frameworkLinkage = 'none' frameworkLinkage = 'none'
buildDir = "${buildDir}/${variant}" // GradleFX does an out-of-date check on the whole build dir buildDir = "${buildDir}/${target}" // GradleFX does an out-of-date check on the whole build dir
output = config.get('output') output = config.get('output')
playerVersion = config.get('playerVersion') playerVersion = config.get('playerVersion')