diff --git a/.travis.yml b/.travis.yml index 029d953..8151b5f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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= diff --git a/config.groovy b/config.groovy index e0a4a43..7b99d3a 100644 --- a/config.groovy +++ b/config.groovy @@ -1,5 +1,5 @@ environments { - New { + '11.6' { output = 'Scratch' playerVersion = '11.6' additionalCompilerOptions = [ @@ -7,7 +7,7 @@ environments { "-define+=SCRATCH::allow3d,true", ] } - Old { + '10.2' { output = 'ScratchFor10.2' playerVersion = '10.2' additionalCompilerOptions = [ diff --git a/scratch.gradle b/scratch.gradle index 90a5316..6a7823f 100644 --- a/scratch.gradle +++ b/scratch.gradle @@ -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')