NativeScript · atanasovg · Mar 12, 2015 · Mar 11, 2015 · Mar 12, 2015
diff --git a/binding-generator/Generator/.settings/org.eclipse.jdt.core.prefs b/binding-generator/Generator/.settings/org.eclipse.jdt.core.prefs
@@ -1,14 +1,4 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

diff --git a/binding-generator/Generator/AndroidManifest.xml b/binding-generator/Generator/AndroidManifest.xml
@@ -6,7 +6,7 @@
 
     <uses-sdk
         android:minSdkVersion="14"
-        android:targetSdkVersion="14" />
+        android:targetSdkVersion="21" />
 
     <application
         android:allowBackup="true"

diff --git a/binding-generator/Generator/libs/android-support-v4.jar b/binding-generator/Generator/libs/android-support-v4.jar
diff --git a/binding-generator/Generator/project.properties b/binding-generator/Generator/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-17
+target=android-21
 android.library=true
diff --git a/binding-generator/Tester/AndroidManifest.xml b/binding-generator/Tester/AndroidManifest.xml
@@ -6,7 +6,7 @@
 
     <uses-sdk
         android:minSdkVersion="14"
-        android:targetSdkVersion="14" />
+        android:targetSdkVersion="21" />
 
     <application
         android:allowBackup="true"

diff --git a/binding-generator/Tester/project.properties b/binding-generator/Tester/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-17
+target=android-21
 android.library.reference.1=../Generator
diff --git a/gruntfile.js b/gruntfile.js
@@ -50,10 +50,8 @@ module.exports = function(grunt) {
         packageJsonFilePath: rootDir + "/package.json",
         commitVersion: process.env.GIT_COMMIT || "",
         metadataGenPath: args.metadataGen,
-        android17SrcJar: pathModule.join(process.env.ANDROID_HOME, "platforms/android-17/android.jar"),
-        localAndroid17Jar: pathModule.join(rootDir, "src", "libs", "android17.jar"),
-        androidSupportLibSource: pathModule.join(rootDir, "binding-generator", "Generator", "libs", "android-support-v4.jar"),
-        androidSupportLibDestination: pathModule.join(rootDir, "src", "libs", "android-support-v4.jar"),
+        androidSrcJar: pathModule.join(process.env.ANDROID_HOME, "platforms/android-21/android.jar"),
+        localAndroidJar: pathModule.join(rootDir, "src", "libs", "android.jar"),
         runtimeDir: pathModule.join(rootDir, "src"),
         libsDir: pathModule.join(rootDir, "src", "libs"),
         runtimeBinariesDir: pathModule.join(rootDir, "src", "dist"),
@@ -69,8 +67,8 @@ module.exports = function(grunt) {
             build: {
                 src: [outDir]
             },
-            android17Lib: {
-                src: localCfg.localAndroid17Jar
+            androidLib: {
+                src: localCfg.localAndroidJar
             },
             metadataGenRuntimeJar: {
                 src: localCfg.metadataRuntimeJar
@@ -158,13 +156,9 @@ module.exports = function(grunt) {
                     }
                 }
             },
-            android17Lib: {
-                src: localCfg.android17SrcJar,
-                dest: localCfg.localAndroid17Jar
-            },
-            androidSupportLib: {
-                src: localCfg.androidSupportLibSource,
-                dest: localCfg.androidSupportLibDestination
+            androidLib: {
+                src: localCfg.androidSrcJar,
+                dest: localCfg.localAndroidJar
             }
         },
         replace: {
@@ -219,11 +213,10 @@ module.exports = function(grunt) {
 
     grunt.registerTask("generateMetadata", [
                 "exec:installMetadataGenerator",
-                "copy:android17Lib",
-                "copy:androidSupportLib",
+                "copy:androidLib",
                 "copy:runtimeJarToLibs",
                 "exec:runMetadataGenerator",
-                "clean:android17Lib",
+                "clean:androidLib",
                 "clean:metadataGenRuntimeJar"
             ]);
 

diff --git a/src/AndroidManifest.xml b/src/AndroidManifest.xml
@@ -6,7 +6,7 @@
 
     <uses-sdk
         android:minSdkVersion="17"
-        android:targetSdkVersion="17" />
+        android:targetSdkVersion="21" />
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

diff --git a/src/libs/android-support-v4.jar b/src/libs/android-support-v4.jar
diff --git a/src/project.properties b/src/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-17
+target=android-21
 android.library.reference.1=../binding-generator/Generator