Skip to content

Commit 150bc4c

Browse files
fix for Bearded-Hen#74 and updated to gradle 1.0
1 parent d0b9707 commit 150bc4c

File tree

4 files changed

+5
-8
lines changed

4 files changed

+5
-8
lines changed

AndroidBootstrap/src/com/beardedhen/androidbootstrap/BootstrapButton.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,6 @@ private void initialise(AttributeSet attrs)
179179

180180
BootstrapSize bootstrapSize = BootstrapSize.getBootstrapSizeFromString(size);
181181

182-
if (a.getString(R.styleable.BootstrapButton_android_textSize) == null) {
183-
fontSize = bootstrapSize.getFontSize();
184-
}
185182
paddingA = (int) (bootstrapSize.paddingA * scale + 0.5f);
186183
paddingB = (int) (bootstrapSize.paddingB * scale + 0.5f);
187184

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
mavenCentral()
55
}
66
dependencies {
7-
classpath 'com.android.tools.build:gradle:0.13.2'
7+
classpath 'com.android.tools.build:gradle:1.0.0'
88
}
99
}
1010

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
VERSION_NAME=1.0.3
2-
VERSION_CODE=103
1+
VERSION_NAME=1.0.4
2+
VERSION_CODE=104
33
GROUP=com.beardedhen
44

55
POM_DESCRIPTION=Bootstrap style buttons with Font Awesome
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Nov 21 13:37:10 GMT 2014
1+
#Tue Dec 09 15:08:23 GMT 2014
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.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip

0 commit comments

Comments
 (0)