Merge branch 'master' of https://github.com/medyo/fancybuttons

medyo · Jun 13, 2015 · aafdf10 · aafdf10
2 parents 71b5b63 + e2d55c7
commit aafdf10
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 25 deletions.
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
+        classpath 'com.android.tools.build:gradle:1.2.3'
     }
 }
 def isReleaseBuild() {

diff --git a/fancybuttons_library/build.gradle b/fancybuttons_library/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "19.1.0"
+    compileSdkVersion 22
+    buildToolsVersion "22.0.1"
 
     defaultConfig {
         minSdkVersion 8
-        targetSdkVersion 21
+        targetSdkVersion 22
         versionCode Integer.parseInt(VERSION_CODE)
         versionName VERSION_NAME
     }

diff --git a/fancybuttons_library/src/main/res/values-w820dp/dimens.xml b/fancybuttons_library/src/main/res/values-w820dp/dimens.xml
diff --git a/fancybuttons_library/src/main/res/values/dimens.xml b/fancybuttons_library/src/main/res/values/dimens.xml
diff --git a/fancybuttons_library/src/main/res/values/strings.xml b/fancybuttons_library/src/main/res/values/strings.xml
diff --git a/gradle.properties b/gradle.properties
@@ -13,6 +13,6 @@ POM_DEVELOPER_ID=medyo
 POM_DEVELOPER_NAME=Mehdi Sakout
 
 ANDROID_BUILD_MIN_SDK_VERSION=8
-ANDROID_BUILD_TARGET_SDK_VERSION=21
-ANDROID_BUILD_TOOLS_VERSION=19.1.0
-ANDROID_BUILD_SDK_VERSION=21
+ANDROID_BUILD_TARGET_SDK_VERSION=22
+ANDROID_BUILD_TOOLS_VERSION=22.0.1
+ANDROID_BUILD_SDK_VERSION=22
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
diff --git a/gradlew b/gradlew