Merge pull request #348 from NativeScript/plamen5kov/use_1.3.0_gradle_version

Plamen5kov · Plamen5kov · commit 677ce13389e5 · 2016-01-29T17:55:02.000+02:00
Plamen5kov/use 1.3.0 gradle version
diff --git a/src/build.gradle b/src/build.gradle
@@ -27,7 +27,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.5.0'
+        classpath 'com.android.tools.build:gradle:1.3.0'
     }
 }
 
@@ -90,11 +90,6 @@ android {
 	lintOptions {
 		abortOnError false
 	}
-	
-	packagingOptions {
-		exclude 'resources.arsc'
-		exclude "AndroidManifest.xml"
-	}
 }
 
 repositories {
diff --git a/test-app/build.gradle b/test-app/build.gradle
@@ -21,7 +21,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.5.0'
+        classpath 'com.android.tools.build:gradle:1.3.0'
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ buildscript {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`dependencies {`
`30`		`- classpath 'com.android.tools.build:gradle:1.5.0'`
	`30`	`+ classpath 'com.android.tools.build:gradle:1.3.0'`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`@@ -90,11 +90,6 @@ android {`
`90`	`90`	`lintOptions {`
`91`	`91`	`abortOnError false`
`92`	`92`	`}`
`93`		`-`
`94`		`- packagingOptions {`
`95`		`- exclude 'resources.arsc'`
`96`		`- exclude "AndroidManifest.xml"`
`97`		`- }`
`98`	`93`	`}`
`99`	`94`
`100`	`95`	`repositories {`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ buildscript {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`dependencies {`
`24`		`- classpath 'com.android.tools.build:gradle:1.5.0'`
	`24`	`+ classpath 'com.android.tools.build:gradle:1.3.0'`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`