Merge pull request #2 from JakeWharton/jw/update-build

Update to latest build stuffs.
gk5885 · Nov 26, 2014 · 78bd7fe · 78bd7fe
2 parents 84d9a38 + 3bfab65
commit 78bd7fe
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 38 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,29 +2,20 @@ apply plugin: 'com.android.application'
 apply plugin: 'com.neenbedankt.android-apt'
 
 android {
-    compileSdkVersion 20
-    buildToolsVersion "20.0.0"
+  compileSdkVersion 21
+  buildToolsVersion '21.1.0'
 
-    defaultConfig {
-        applicationId "dagger.demo"
-        minSdkVersion 15
-        targetSdkVersion 20
-        versionCode 1
-        versionName "1.0"
-    }
-    buildTypes {
-        release {
-            runProguard false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
+  defaultConfig {
+    applicationId 'dagger.demo'
+    minSdkVersion 15
+    targetSdkVersion 21
+    versionCode 1
+    versionName '1.0'
+  }
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.google.dagger:dagger:2.0-SNAPSHOT'
-    apt 'com.google.dagger:dagger-compiler:2.0-SNAPSHOT'
-    compile 'org.glassfish:javax.annotation:10.0-b28'
+  compile 'com.google.dagger:dagger:2.0-SNAPSHOT'
+  apt 'com.google.dagger:dagger-compiler:2.0-SNAPSHOT'
+  provided 'org.glassfish:javax.annotation:10.0-b28'
 }
-
-
diff --git a/build.gradle b/build.gradle
@@ -1,22 +1,18 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.2'
-        classpath 'com.neenbedankt.gradle.plugins:android-apt:1.4'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
+  repositories {
+    jcenter()
+  }
+  dependencies {
+    classpath 'com.android.tools.build:gradle:0.14.1'
+    classpath 'com.neenbedankt.gradle.plugins:android-apt:1.4'
+  }
 }
 
 allprojects {
-    repositories {
-        mavenCentral()
-        maven { url "${System.env.HOME}/.m2/repository" }
-        jcenter()
+  repositories {
+    mavenCentral()
+    maven {
+      url 'https://oss.sonatype.org/content/repositories/snapshots/'
     }
+  }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip