Skip to content

Commit b6a2e11

Browse files
Merge pull request #204 from fractalwrench/master
Test latest fixes and update dependencies
2 parents 838845d + 625f889 commit b6a2e11

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

AndroidBootstrap/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apply from: 'push.gradle'
33

44
android {
55
compileSdkVersion Integer.parseInt(TARGET_SDK_INT)
6-
buildToolsVersion "25.0.1"
6+
buildToolsVersion "25.0.3"
77

88
defaultConfig {
99
minSdkVersion Integer.parseInt(MIN_SDK_INT)
@@ -14,6 +14,6 @@ android {
1414
}
1515

1616
dependencies {
17-
compile 'com.android.support:support-annotations:25.0.1'
18-
compile 'com.android.support:support-v4:25.0.1'
17+
compile 'com.android.support:support-annotations:25.3.1'
18+
compile 'com.android.support:support-v4:25.3.1'
1919
}

AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/BootstrapEditText.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ private void initialise(AttributeSet attrs) {
6161
try {
6262
this.rounded = a.getBoolean(R.styleable.BootstrapEditText_roundedCorners, false);
6363

64-
int typeOrdinal = a.getInt(R.styleable.AwesomeTextView_bootstrapBrand, -1);
64+
int typeOrdinal = a.getInt(R.styleable.BootstrapEditText_bootstrapBrand, -1);
6565
int sizeOrdinal = a.getInt(R.styleable.BootstrapEditText_bootstrapSize, -1);
6666

6767
this.bootstrapBrand = DefaultBootstrapBrand.fromAttributeValue(typeOrdinal);

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55

66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.2.3'
8+
classpath 'com.android.tools.build:gradle:2.3.2'
99
}
1010
}
1111

gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
VERSION_NAME=2.3.1
2-
VERSION_CODE=231
1+
VERSION_NAME=2.3.2
2+
VERSION_CODE=232
33
GROUP=com.beardedhen
44

55
MIN_SDK_INT=14
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Dec 28 10:00:20 PST 2015
1+
#Sat Jul 22 10:14:14 BST 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

sample/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion Integer.parseInt(TARGET_SDK_INT)
5-
buildToolsVersion "25.0.1"
5+
buildToolsVersion "25.0.3"
66

77
defaultConfig {
88
applicationId "com.fractalwrench.androidbootstrap.sample"
@@ -31,6 +31,6 @@ dependencies {
3131
compile 'com.jakewharton:butterknife:8.4.0'
3232
annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0'
3333

34-
compile 'com.android.support:appcompat-v7:25.0.1'
35-
compile 'com.android.support:support-annotations:25.0.1'
34+
compile 'com.android.support:appcompat-v7:25.3.1'
35+
compile 'com.android.support:support-annotations:25.3.1'
3636
}

0 commit comments

Comments
 (0)