gradle: update to 2.1 and android targetSdk 21

- add android-appcompat subproject

vtm-android-gdx/build.gradle

@@ -1,24 +1,11 @@
-buildscript {
-  repositories {
-    mavenCentral()
-  }
-  dependencies {
-    classpath 'com.android.tools.build:gradle:0.12.+'
-  }
-}
-
-repositories {
-  maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
-}
-
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 
 configurations { providedCompile }
 
 dependencies {
   compile project(':vtm-gdx')
   compile project(':vtm-themes')
-  compile 'com.noveogroup.android:android-logger:1.3.1'
+  compile 'com.noveogroup.android:android-logger:1.3.4'
   compile "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion"
   //compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi"
   //compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi-v7a"
@@ -36,8 +23,8 @@ dependencies {
 //   compileTask.dependsOn copyLibs }
 
 android {
-  compileSdkVersion 19
-  buildToolsVersion '20.0'
+  compileSdkVersion androidTargetSdk()
+  buildToolsVersion "$androidBuildVersionTools"
 
   sourceSets {
     main {
@@ -50,6 +37,11 @@ android {
       assets.srcDirs = ['assets']
     }
 
+    compileOptions {
+      sourceCompatibility JavaVersion.VERSION_1_7
+      targetCompatibility JavaVersion.VERSION_1_7
+    }
+
     debug.setRoot('build-types/debug')
     release.setRoot('build-types/release')
   }
@@ -57,28 +49,37 @@ android {
 
 // Including configurations into Eclipse
 eclipse {
-  jdt {
-    sourceCompatibility = 1.6
-    targetCompatibility = 1.6
-  }
 
   // Configuring Eclipse classpath
   classpath {
-    plusConfigurations += configurations.compile
+    plusConfigurations += [ configurations.compile ]
 
     defaultOutputDir = file('bin/classes')
 
+    containers = ['com.android.ide.eclipse.adt.ANDROID_FRAMEWORK',
+		  'com.android.ide.eclipse.adt.LIBRARIES',
+		  'com.android.ide.eclipse.adt.DEPENDENCIES']
+
     file {
+      beforeMerged { classpath ->
+	// Remove all source entries to avoid overlap
+	classpath.entries.removeAll() { c ->
+	  c.kind == 'src'
+	}
+      }
+
       // only used to explode jni .so into aar
       whenMerged { classpath ->
 	classpath.entries.findAll { entry ->
-	  entry.path.contains('native-libs') }*.exported = false
+	  entry.path.contains('ANDROID_FRAMEWORK') ||
+	  entry.path.contains('support') ||
+	  entry.path.contains('native-libs')
+	}*.exported = false
 
 	classpath.entries.removeAll { entry ->
-       	  entry.path.contains('gdx-2') }
+	  entry.path.contains('gdx-2') }
       }
 
-
       // Direct manipulation of the generated classpath XML
       withXml {
 	def node = it.asNode()

vtm-android-gdx/project.properties

@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-19
+target=android-21