Merge pull request #172 from mutahirqureshi/gradle-plugin-0.12

update gradle plugin to 0.12
yixia · Jul 1, 2014 · 31191af · 31191af
2 parents aaa6ab1 + dabe119
commit 31191af
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,5 +23,6 @@ local.properties
 
 # IntelliJ IDEA files
 *.iml
+.idea/
 
 *.gradle
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.11.+'
+        classpath 'com.android.tools.build:gradle:0.12.+'
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -3,5 +3,5 @@ GROUP=io.vov.vitamio
 
 ANDROID_BUILD_MIN_SDK_VERSION=11
 ANDROID_BUILD_TARGET_SDK_VERSION=19
-ANDROID_BUILD_TOOLS_VERSION=19.1.0
+ANDROID_BUILD_TOOLS_VERSION=20.0.0
 ANDROID_BUILD_SDK_VERSION=19
diff --git a/vitamio-sample/AndroidManifest.xml b/vitamio-sample/AndroidManifest.xml
@@ -4,10 +4,6 @@
     android:versionCode="002"
     android:versionName="0.0.2" >
 
-    <uses-sdk
-        android:minSdkVersion="7"
-        android:targetSdkVersion="19" />
-
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

diff --git a/vitamio-sample/build.gradle b/vitamio-sample/build.gradle
@@ -1,4 +1,4 @@
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 
 dependencies {
     compile project(':vitamio')
@@ -7,9 +7,10 @@ dependencies {
 android {
     compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
     buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION
+    useOldManifestMerger true
 
     defaultConfig {
-        minSdkVersion 7
+        minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION)
         targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
     }
 

diff --git a/vitamio/AndroidManifest.xml b/vitamio/AndroidManifest.xml
@@ -3,10 +3,6 @@
           android:versionCode="400"
           android:versionName="4.0">
 
-    <uses-sdk
-            android:minSdkVersion="7"
-            android:targetSdkVersion="19"/>
-
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

diff --git a/vitamio/build.gradle b/vitamio/build.gradle
@@ -1,4 +1,4 @@
-apply plugin: 'android-library'
+apply plugin: 'com.android.library'
 
 dependencies {
 }