From a9cc7d28eb49915056e03c126de59c47a001c9fb Mon Sep 17 00:00:00 2001 From: daimajia Date: Sat, 24 Jan 2015 09:09:23 +0800 Subject: [PATCH] support compile under build:gradle:1.0.0 --- build.gradle | 2 +- demo/build.gradle | 3 +-- gradle.properties | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- library/build.gradle | 1 - 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index a75fc81..6356aab 100644 --- 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 index ae2fca1..b71424c 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -5,7 +5,6 @@ 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 @@ -13,7 +12,7 @@ android { } buildTypes { release { - runProguard false + minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } diff --git a/gradle.properties b/gradle.properties index f6b05d2..5535597 100644 --- 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 index 1e61d1f..0c44860 100644 --- 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 index 7a17821..a5ad7c5 100644 --- 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) }