Merge pull request #20 from novoda/minor_project_clean_ups

blundell · blundell · commit 9e8f032bab1f · 2015-02-22T15:49:45.000Z
Minor project clean ups
diff --git a/build.gradle b/build.gradle
@@ -1,13 +1,14 @@
 buildscript {
     repositories {
+        jcenter()
         mavenCentral()
         maven {
             url "https://oss.sonatype.org/content/repositories/snapshots"
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
-        classpath 'com.novoda:gradle-android-command-plugin:1.2.1'
+        classpath 'com.android.tools.build:gradle:1.1.0'
+        classpath 'com.novoda:gradle-android-command-plugin:1.3.0'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.2'
     }
 }
@@ -22,6 +23,6 @@ allprojects {
 }
 
 ext {
-    buildToolsVersion = '21.1.2'
-    compileSdkVersion = 21
+    BUILD_TOOLS_VERSION = '21.1.2'
+    COMPILE_SDK_VERSION = 21
 }
diff --git a/buildSrc/local.properties b/buildSrc/local.properties
diff --git a/demo-assethelper/build.gradle b/demo-assethelper/build.gradle
@@ -3,12 +3,11 @@ apply plugin: 'android-command'
 apply plugin: 'sqlite-analyzer'
 
 android {
-    buildToolsVersion rootProject.ext.buildToolsVersion
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion BUILD_TOOLS_VERSION
+    compileSdkVersion COMPILE_SDK_VERSION
 
     defaultConfig {
         minSdkVersion 8
-        targetSdkVersion 19
     }
 }
 
diff --git a/demo-auto/build.gradle b/demo-auto/build.gradle
@@ -4,12 +4,11 @@ apply plugin: 'android-command'
 apply plugin: 'sqlite-analyzer'
 
 android {
-    buildToolsVersion rootProject.ext.buildToolsVersion
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion BUILD_TOOLS_VERSION
+    compileSdkVersion COMPILE_SDK_VERSION
 
     defaultConfig {
         minSdkVersion 8
-        targetSdkVersion 19
     }
 
     packagingOptions {
diff --git a/demo-sqliteprovider/build.gradle b/demo-sqliteprovider/build.gradle
@@ -3,12 +3,11 @@ apply plugin: 'android-command'
 apply plugin: 'sqlite-analyzer'
 
 android {
-    buildToolsVersion rootProject.ext.buildToolsVersion
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion BUILD_TOOLS_VERSION
+    compileSdkVersion COMPILE_SDK_VERSION
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 19
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,14 @@`
`1`	`1`	`buildscript {`
`2`	`2`	`repositories {`
	`3`	`+ jcenter()`
`3`	`4`	`mavenCentral()`
`4`	`5`	`maven {`
`5`	`6`	`url "https://oss.sonatype.org/content/repositories/snapshots"`
`6`	`7`	`}`
`7`	`8`	`}`
`8`	`9`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:1.0.0'`
`10`		`- classpath 'com.novoda:gradle-android-command-plugin:1.2.1'`
	`10`	`+ classpath 'com.android.tools.build:gradle:1.1.0'`
	`11`	`+ classpath 'com.novoda:gradle-android-command-plugin:1.3.0'`
`11`	`12`	`classpath 'com.neenbedankt.gradle.plugins:android-apt:1.2'`
`12`	`13`	`}`
`13`	`14`	`}`
`@@ -22,6 +23,6 @@ allprojects {`
`22`	`23`	`}`
`23`	`24`
`24`	`25`	`ext {`
`25`		`- buildToolsVersion = '21.1.2'`
`26`		`- compileSdkVersion = 21`
	`26`	`+ BUILD_TOOLS_VERSION = '21.1.2'`
	`27`	`+ COMPILE_SDK_VERSION = 21`
`27`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,11 @@ apply plugin: 'android-command'`
`3`	`3`	`apply plugin: 'sqlite-analyzer'`
`4`	`4`
`5`	`5`	`android {`
`6`		`- buildToolsVersion rootProject.ext.buildToolsVersion`
`7`		`- compileSdkVersion rootProject.ext.compileSdkVersion`
	`6`	`+ buildToolsVersion BUILD_TOOLS_VERSION`
	`7`	`+ compileSdkVersion COMPILE_SDK_VERSION`
`8`	`8`
`9`	`9`	`defaultConfig {`
`10`	`10`	`minSdkVersion 8`
`11`		`- targetSdkVersion 19`
`12`	`11`	`}`
`13`	`12`	`}`
`14`	`13`