diff --git a/AndroidBootstrap/build.gradle b/AndroidBootstrap/build.gradle index e95d653..85aac85 100644 --- a/AndroidBootstrap/build.gradle +++ b/AndroidBootstrap/build.gradle @@ -14,6 +14,6 @@ android { } dependencies { - compile 'com.android.support:support-annotations:23.1.1' - compile 'com.android.support:support-v4:23.1.1' + compile 'com.android.support:support-annotations:23.2.0' + compile 'com.android.support:support-v4:23.2.0' } diff --git a/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/BootstrapWell.java b/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/BootstrapWell.java index 986eab8..ea3c19d 100644 --- a/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/BootstrapWell.java +++ b/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/BootstrapWell.java @@ -38,7 +38,6 @@ private void initialise(AttributeSet attrs) { try { int sizeOrdinal = a.getInt(R.styleable.BootstrapButton_bootstrapSize, -1); - bootstrapSize = DefaultBootstrapSize.fromAttributeValue(sizeOrdinal).scaleFactor(); } finally { diff --git a/gradle.properties b/gradle.properties index 77a66ac..c1a973c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ -VERSION_NAME=2.0.1 -VERSION_CODE=201 +VERSION_NAME=2.1.0 +VERSION_CODE=210 GROUP=com.beardedhen POM_DESCRIPTION=Bootstrap style widgets for Android, with Glyph Icons diff --git a/sample/build.gradle b/sample/build.gradle index 19e5c9e..8dbd524 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.fractalwrench.androidbootstrap.sample" minSdkVersion 11 targetSdkVersion 23 - versionCode 1 - versionName "1.0.0" + versionCode 210 + versionName "2.1.0" } lintOptions { disable 'InvalidPackage' @@ -29,6 +29,6 @@ dependencies { compile project (':AndroidBootstrap') // replace with Maven dependency in your app compile 'com.jakewharton:butterknife:7.0.1' - compile 'com.android.support:appcompat-v7:23.1.1' - compile 'com.android.support:support-annotations:23.1.1' + compile 'com.android.support:appcompat-v7:23.2.0' + compile 'com.android.support:support-annotations:23.2.0' }