Merge branch 'release/2.0.1'

johnkil · Apr 28, 2014 · 90dab12 · 90dab12
2 parents 8d1c046 + 9c3438e
commit 90dab12
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@ Change Log
 ==========
 
 
+Version 2.0.1 *(2014-04-28)*
+--------------------------
+
+* Make typeface constants public.
+* Default to Roboto Regular instead of Thin when no typeface is specified.
+
+
 Version 2.0.0 *(2013-12-05)*
 --------------------------
 

diff --git a/README.md b/README.md
@@ -94,7 +94,7 @@ Android-RobotoTextView library is now pushed to Maven Central as a AAR, so you j
 
 ``` xml
 dependencies {
-    compile 'com.github.johnkil.android-robototextview:robototextview:2.0.0'
+    compile 'com.github.johnkil.android-robototextview:robototextview:2.0.+'
 }
 ```
 

diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.6.+'
+        classpath 'com.android.tools.build:gradle:0.9.+'
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
-VERSION_NAME=2.0.0-SNAPSHOT
-VERSION_CODE=7
+VERSION_NAME=2.0.1-SNAPSHOT
+VERSION_CODE=8
 GROUP=com.github.johnkil.android-robototextview
 
 POM_DESCRIPTION=Implementation of the fragment with the ability to display indeterminate progress indicator when you are waiting for the initial dataImplementation of a TextView and all its direct/indirect subclasses with native support for the Roboto fonts, includes the brand new Roboto Slab fonts.

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Dec 05 21:27:20 MSK 2013
+#Mon Apr 28 14:05:22 MSK 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-all.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip
diff --git a/robototextview-sample/build.gradle b/robototextview-sample/build.gradle
@@ -6,7 +6,7 @@ dependencies {
 
 android {
     compileSdkVersion 19
-    buildToolsVersion "19.0.0"
+    buildToolsVersion "19.0.3"
 
     defaultConfig {
         minSdkVersion 3

diff --git a/robototextview-sample/src/main/AndroidManifest.xml b/robototextview-sample/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.devspark.robototextview.sample"
-          android:versionCode="7"
-          android:versionName="2.0.0">
+          android:versionCode="8"
+          android:versionName="2.0.1">
 
     <uses-sdk
             android:minSdkVersion="3"

diff --git a/robototextview/build.gradle b/robototextview/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'android-library'
 
 android {
     compileSdkVersion 19
-    buildToolsVersion "19.0.0"
+    buildToolsVersion "19.0.3"
 
     defaultConfig {
         minSdkVersion 3

diff --git a/robototextview/src/main/AndroidManifest.xml b/robototextview/src/main/AndroidManifest.xml
@@ -1,11 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.devspark.robototextview"
-          android:versionCode="7"
-          android:versionName="2.0.0">
+          android:versionCode="8"
+          android:versionName="2.0.1">
 
-    <uses-sdk
-            android:minSdkVersion="3"
-            android:targetSdkVersion="19"/>
     <application/>
 
 </manifest>
diff --git a/robototextview/src/main/java/com/devspark/robototextview/RobotoTypefaceManager.java b/robototextview/src/main/java/com/devspark/robototextview/RobotoTypefaceManager.java
@@ -65,7 +65,7 @@ public class RobotoTypefaceManager {
      * @return specify {@link Typeface}
      * @throws IllegalArgumentException if unknown `typeface` attribute value.
      */
-    public static Typeface obtainTypeface (Context context, int typefaceValue) throws IllegalArgumentException {
+    public static Typeface obtainTypeface(Context context, int typefaceValue) throws IllegalArgumentException {
         Typeface typeface = mTypefaces.get(typefaceValue);
         if (typeface == null) {
             typeface = createTypeface(context, typefaceValue);

diff --git a/robototextview/src/main/java/com/devspark/robototextview/widget/RobotoTextClock.java b/robototextview/src/main/java/com/devspark/robototextview/widget/RobotoTextClock.java
@@ -16,9 +16,11 @@
 
 package com.devspark.robototextview.widget;
 
+import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Typeface;
+import android.os.Build;
 import android.util.AttributeSet;
 import android.widget.TextClock;
 
@@ -30,6 +32,7 @@
  *
  * @author Evgeny Shishkin
  */
+@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
 public class RobotoTextClock extends TextClock {
 
     /**
-Original file line number
+Diff line change
@@ Expand Up @@
     ``` xml
     dependencies {
-        compile 'com.github.johnkil.android-robototextview:robototextview:2.0.0'
+        compile 'com.github.johnkil.android-robototextview:robototextview:2.0.+'
     }
     ```
@@ Expand Down @@