Skip to content
This repository has been archived by the owner on Sep 3, 2019. It is now read-only.

Commit

Permalink
Use target=10.2 instead of variant=Old
Browse files Browse the repository at this point in the history
I think this will be more clear to future devs
  • Loading branch information
cwillisf committed Jul 31, 2015
1 parent 8df2fa8 commit 67907db
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ language: groovy
cache:
directories:
- $HOME/.gradle/caches/
- $HOME/.gradle/wrapper/dists/
script:
- ./gradlew check -Pvariant=New
- ./gradlew check -Pvariant=Old
- ./gradlew check -Ptarget=11.6
- ./gradlew check -Ptarget=10.2
notifications:
slack:
secure: TFnMix3WLFecQLMgmSIsUrnZUV7s5U7mJlzkfLrGU02u0uztjLcJr9qekg65I0wFtqGuMGAOfPAZo4hf0l5djzJTSUobLdlTpEunIEWd53IUZlljKCJQsVT8hfJtbjpIXMraLRLyTzDkXcRO3v2xthU30vsSI75sxQYufBx5/sU=
Expand Down
4 changes: 2 additions & 2 deletions config.groovy
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
environments {
New {
'11.6' {
output = 'Scratch'
playerVersion = '11.6'
additionalCompilerOptions = [
"-swf-version=19",
"-define+=SCRATCH::allow3d,true",
]
}
Old {
'10.2' {
output = 'ScratchFor10.2'
playerVersion = '10.2'
additionalCompilerOptions = [
Expand Down
8 changes: 4 additions & 4 deletions scratch.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ repositories {
apply plugin: org.gradlefx.plugins.GradleFxPlugin

def commonDir = ext.commonDir
def variant = hasProperty('variant') ? variant : 'New'
println "Variant is: $variant"
def config = new ConfigSlurper(variant).parse(file("${commonDir}/config.groovy").toURL())
def target = hasProperty('target') ? target : '11.6'
println "Target is: $target"
def config = new ConfigSlurper(target).parse(file("${commonDir}/config.groovy").toURL())

type = 'mobile'
version = '1.0-SNAPSHOT'
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')
playerVersion = config.get('playerVersion')

Expand Down

0 comments on commit 67907db

Please sign in to comment.