#352 Build for Android changed - iTest classes are now separated

build.gradle

@@ -25,7 +25,7 @@ buildscript {
         jcenter { url "http://jcenter.bintray.com/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0'
+        classpath 'com.android.tools.build:gradle:2.1.3'
         classpath 'org.robovm:robovm-gradle-plugin:1.12.0'
         classpath 'de.felixschulze.gradle:gradle-spoon-plugin:2.1'
         classpath 'com.github.JakeWharton:sdk-manager-plugin:220bf7a88a7072df3ed16dc8466fb144f2817070'
@@ -376,10 +376,14 @@ project(":android") {
     apply plugin: "spoon"
     apply plugin: 'android-command'
 
-    configurations { natives }
+    configurations {
+        natives
+        iTestCompile
+    }
 
     dependencies {
         compile project(":core")
+
         compile "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion"
 	    compile "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
 	    compile "net.engio:mbassador:$mbassadorVersion"
@@ -397,6 +401,7 @@ project(":android") {
         testCompile 'org.robolectric:robolectric:2.3'
         androidTestCompile "com.squareup.spoon:spoon-client:1.1.7"
         androidTestCompile 'com.jayway.android.robotium:robotium-solo:5.3.1'
+        iTestCompile project(":itest")
     }
 }
 
@@ -444,6 +449,14 @@ project(":core") {
     }
 }
 
+project(":itest") {
+    apply plugin: "java"
+
+    dependencies {
+        compile project(':core')
+    }
+}
+
 tasks.eclipse.doLast {
     delete ".project"
 }

core/build.gradle

@@ -25,7 +25,7 @@ final String BUILD_CONFIG_FILE_ENCODING = "UTF-8"
 sourceCompatibility = 1.7
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 
-sourceSets.main.java.srcDirs = ["src/main", "gen/", "external/tablexia-shared", "src/iTest"]
+sourceSets.main.java.srcDirs = ["src/", "gen/", "external/tablexia-shared"]
 sourceSets.test.java.srcDirs = ["test/", "external/copyright-test"]