Merge pull request #28 from changyuheng/pr-upgrade

Upgrade gradle build file
Pkmmte · Jan 15, 2015 · 25c2479 · 25c2479
2 parents 31b53ac + cbecfce
commit 25c2479
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
  jcenter()
  }
  dependencies {
- classpath 'com.android.tools.build:gradle:0.12.+'
+ classpath 'com.android.tools.build:gradle:1.0.+'
 
  // NOTE: Do not place your application dependencies here; they belong
  // in the individual module build.gradle files

diff --git a/circularimageview-sample/build.gradle b/circularimageview-sample/build.gradle
@@ -13,7 +13,7 @@ android {
 
  buildTypes {
  release {
- runProguard false
+ minifyEnabled false
  proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
  }
  }

diff --git a/circularimageview/build.gradle b/circularimageview/build.gradle
@@ -8,13 +8,12 @@ android {
  buildToolsVersion project.BUILD_TOOLS_VERSION
 
  defaultConfig {
- applicationId project.GROUP
  versionName project.VERSION_NAME
  versionCode Integer.parseInt(project.VERSION_CODE)
  }
  buildTypes {
  release {
- runProguard false
+ minifyEnabled false
  proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
  }
  }

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\:https://services.gradle.org/distributions/gradle-1.12-all.zip
+distributionUrl=http\:https://services.gradle.org/distributions/gradle-2.2.1-all.zip