Merge pull request Bearded-Hen#204 from fractalwrench/master

Test latest fixes and update dependencies
xMagerx · Jul 22, 2017 · b6a2e11 · b6a2e11
2 parents 838845d + 625f889
commit b6a2e11
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/AndroidBootstrap/build.gradle b/AndroidBootstrap/build.gradle
@@ -3,7 +3,7 @@ apply from: 'push.gradle'
 
 android {
     compileSdkVersion Integer.parseInt(TARGET_SDK_INT)
-    buildToolsVersion "25.0.1"
+    buildToolsVersion "25.0.3"
 
     defaultConfig {
         minSdkVersion Integer.parseInt(MIN_SDK_INT)
@@ -14,6 +14,6 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:support-annotations:25.0.1'
-    compile 'com.android.support:support-v4:25.0.1'
+    compile 'com.android.support:support-annotations:25.3.1'
+    compile 'com.android.support:support-v4:25.3.1'
 }
diff --git a/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/BootstrapEditText.java b/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/BootstrapEditText.java
@@ -61,7 +61,7 @@ private void initialise(AttributeSet attrs) {
         try {
             this.rounded = a.getBoolean(R.styleable.BootstrapEditText_roundedCorners, false);
 
-            int typeOrdinal = a.getInt(R.styleable.AwesomeTextView_bootstrapBrand, -1);
+            int typeOrdinal = a.getInt(R.styleable.BootstrapEditText_bootstrapBrand, -1);
             int sizeOrdinal = a.getInt(R.styleable.BootstrapEditText_bootstrapSize, -1);
 
             this.bootstrapBrand = DefaultBootstrapBrand.fromAttributeValue(typeOrdinal);

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.2'
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
-VERSION_NAME=2.3.1
-VERSION_CODE=231
+VERSION_NAME=2.3.2
+VERSION_CODE=232
 GROUP=com.beardedhen
 
 MIN_SDK_INT=14

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Sat Jul 22 10:14:14 BST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion Integer.parseInt(TARGET_SDK_INT)
-    buildToolsVersion "25.0.1"
+    buildToolsVersion "25.0.3"
 
     defaultConfig {
         applicationId "com.fractalwrench.androidbootstrap.sample"
@@ -31,6 +31,6 @@ dependencies {
     compile 'com.jakewharton:butterknife:8.4.0'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0'
 
-    compile 'com.android.support:appcompat-v7:25.0.1'
-    compile 'com.android.support:support-annotations:25.0.1'
+    compile 'com.android.support:appcompat-v7:25.3.1'
+    compile 'com.android.support:support-annotations:25.3.1'
 }