support compile under build:gradle:1.0.0

daimajia · daimajia · commit a9cc7d28eb49 · 2015-01-24T09:09:23.000+08:00
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.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/demo/build.gradle b/demo/build.gradle
@@ -5,15 +5,14 @@ android {
     buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION
 
     defaultConfig {
-        applicationId "com.daimajia.swipedemo"
         minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION)
         targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
         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.properties b/gradle.properties
@@ -18,8 +18,8 @@
 # org.gradle.parallel=true
 
 
-VERSION_NAME=1.1.7
-VERSION_CODE=18
+VERSION_NAME=1.1.8
+VERSION_CODE=19
 GROUP=com.daimajia.swipelayout
 
 ANDROID_BUILD_MIN_SDK_VERSION=8
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=http\://services.gradle.org/distributions/gradle-2.2.1-all.zip
diff --git a/library/build.gradle b/library/build.gradle
@@ -5,7 +5,6 @@ android {
     buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION
 
     defaultConfig {
-        applicationId "com.daimajia.swipe"
         minSdkVersion 8
         targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
     }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ buildscript {`
`5`	`5`	`jcenter()`
`6`	`6`	`}`
`7`	`7`	`dependencies {`
`8`		`- classpath 'com.android.tools.build:gradle:0.12.+'`
	`8`	`+ classpath 'com.android.tools.build:gradle:1.0.0'`
`9`	`9`
`10`	`10`	`// NOTE: Do not place your application dependencies here; they belong`
`11`	`11`	`// in the individual module build.gradle files`
Original file line number	Diff line number	Diff line change
`@@ -5,15 +5,14 @@ android {`
`5`	`5`	`buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION`
`6`	`6`
`7`	`7`	`defaultConfig {`
`8`		`- applicationId "com.daimajia.swipedemo"`
`9`	`8`	`minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION)`
`10`	`9`	`targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)`
`11`	`10`	`versionName project.VERSION_NAME`
`12`	`11`	`versionCode Integer.parseInt(project.VERSION_CODE)`
`13`	`12`	`}`
`14`	`13`	`buildTypes {`
`15`	`14`	`release {`
`16`		`- runProguard false`
	`15`	`+ minifyEnabled false`
`17`	`16`	`proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'`
`18`	`17`	`}`
`19`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@ android {`
`5`	`5`	`buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION`
`6`	`6`
`7`	`7`	`defaultConfig {`
`8`		`- applicationId "com.daimajia.swipe"`
`9`	`8`	`minSdkVersion 8`
`10`	`9`	`targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)`
`11`	`10`	`}`