Merge branch 'release/v2.5.5'

mikepenz · Jan 15, 2016 · 5a0e54a · 5a0e54a
2 parents 3a0ef17 + 456f677
commit 5a0e54a
Show file tree

Hide file tree

Showing 22 changed files with 62 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -46,7 +46,7 @@ Provide additional fonts for you project, or even create your custom font with j
 ##1. Provide the gradle dependency
 ```gradle
 dependencies {
-	compile 'com.mikepenz:iconics-core:2.5.4@aar'
+	compile 'com.mikepenz:iconics-core:2.5.5@aar'
 }
 ```
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 254
-        versionName "2.5.4"
+        versionCode 255
+        versionName "2.5.5"
         enforceUniquePackageName false
     }
 
@@ -54,9 +54,9 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:23.1.1'
-    compile 'com.android.support:recyclerview-v7:23.1.1'
-    compile 'com.android.support:cardview-v7:23.1.1'
+    compile "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
+    compile "com.android.support:recyclerview-v7:${rootProject.ext.supportLibVersion}"
+    compile "com.android.support:cardview-v7:${rootProject.ext.supportLibVersion}"
 
     compile('com.mikepenz:aboutlibraries:5.3.4@aar')
     compile('com.mikepenz:materialdrawer:4.5.9@aar') {

diff --git a/build.gradle b/build.gradle
@@ -5,17 +5,15 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0-alpha3'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
+        classpath 'com.android.tools.build:gradle:2.0.0-alpha5'
+        classpath 'com.novoda:bintray-release:0.3.4'
     }
 }
-// To avoid manually setting the same values in all Android modules, set the value on the root
-// project and then reference this from the modules
+
 ext {
     compileSdkVersion = 23
     buildToolsVersion = "23.0.2"
+    supportLibVersion = "23.1.1"
 
     minSdkVersion = 10
     targetSdkVersion = 23
@@ -30,5 +28,5 @@ allprojects {
 
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.9'
+    gradleVersion = '2.10'
 }
diff --git a/community-material-typeface-library/build.gradle b/community-material-typeface-library/build.gradle
@@ -37,6 +37,8 @@ android {
 }
 if (project.hasProperty('pushall') || project.hasProperty('communitymaterialonly')) {
     apply from: '../gradle-mvn-push.gradle'
+    apply plugin: 'com.novoda.bintray-release'
+    apply from: '../gradle-jcenter-push.gradle'
 }
 
 dependencies {

diff --git a/devicon-typeface-library/build.gradle b/devicon-typeface-library/build.gradle
@@ -36,6 +36,8 @@ android {
 }
 if (project.hasProperty('pushall') || project.hasProperty('DevIcononly')) {
     apply from: '../gradle-mvn-push.gradle'
+    apply plugin: 'com.novoda.bintray-release'
+    apply from: '../gradle-jcenter-push.gradle'
 }
 
 dependencies {

diff --git a/entypo-typeface-library/build.gradle b/entypo-typeface-library/build.gradle
@@ -36,6 +36,8 @@ android {
 }
 if (project.hasProperty('pushall') || project.hasProperty('Entypoonly')) {
     apply from: '../gradle-mvn-push.gradle'
+    apply plugin: 'com.novoda.bintray-release'
+    apply from: '../gradle-jcenter-push.gradle'
 }
 
 dependencies {

diff --git a/fontawesome-typeface-library/build.gradle b/fontawesome-typeface-library/build.gradle
@@ -23,6 +23,8 @@ android {
 }
 if (project.hasProperty('pushall') || project.hasProperty('fontawesomeonly')) {
     apply from: '../gradle-mvn-push.gradle'
+    apply plugin: 'com.novoda.bintray-release'
+    apply from: '../gradle-jcenter-push.gradle'
 }
 
 dependencies {

diff --git a/foundation-icons-typeface-library/build.gradle b/foundation-icons-typeface-library/build.gradle
@@ -36,6 +36,8 @@ android {
 }
 if (project.hasProperty('pushall') || project.hasProperty('FoundationIconsonly')) {
     apply from: '../gradle-mvn-push.gradle'
+    apply plugin: 'com.novoda.bintray-release'
+    apply from: '../gradle-jcenter-push.gradle'
 }
 
 dependencies {

diff --git a/google-material-typeface-library/build.gradle b/google-material-typeface-library/build.gradle
@@ -36,6 +36,8 @@ android {
 }
 if (project.hasProperty('pushall') || project.hasProperty('googlematerialonly')) {
     apply from: '../gradle-mvn-push.gradle'
+    apply plugin: 'com.novoda.bintray-release'
+    apply from: '../gradle-jcenter-push.gradle'
 }
 
 dependencies {

diff --git a/gradle-jcenter-push.gradle b/gradle-jcenter-push.gradle
@@ -0,0 +1,11 @@
+publish {
+    dryRun = false
+    bintrayUser = project.hasProperty('bintray.user') ? project.property('bintray.user') : System.getenv('BINTRAY_USER')
+    bintrayKey = project.hasProperty('bintray.apikey') ? project.property('bintray.apikey') : System.getenv('BINTRAY_API_KEY')
+    userOrg = project.property("POM_DEVELOPER_ID")
+    groupId = project.property("GROUP")
+    artifactId = project.property("POM_ARTIFACT_ID")
+    publishVersion = project.property("VERSION_NAME")
+    desc = project.property("POM_DESCRIPTION")
+    website = project.property("POM_URL")
+}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Nov 26 19:37:45 CET 2015
+#Mon Jan 11 22:35:30 CET 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
diff --git a/ionicons-typeface-library/build.gradle b/ionicons-typeface-library/build.gradle
@@ -36,6 +36,8 @@ android {
 }
 if (project.hasProperty('pushall') || project.hasProperty('Ioniconsonly')) {
     apply from: '../gradle-mvn-push.gradle'
+    apply plugin: 'com.novoda.bintray-release'
+    apply from: '../gradle-jcenter-push.gradle'
 }
 
 dependencies {

diff --git a/library-core/build.gradle b/library-core/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 254
-        versionName "2.5.4"
+        versionCode 255
+        versionName "2.5.5"
     }
     buildTypes {
         release {
@@ -22,8 +22,10 @@ android {
 }
 if (project.hasProperty('pushall') || project.hasProperty('librarycoreonly')) {
     apply from: '../gradle-mvn-push.gradle'
+    apply plugin: 'com.novoda.bintray-release'
+    apply from: '../gradle-jcenter-push.gradle'
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:23.1.1'
+    compile "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
 }
diff --git a/library-core/gradle.properties b/library-core/gradle.properties
@@ -32,8 +32,8 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-VERSION_NAME=2.5.4
-VERSION_CODE=254
+VERSION_NAME=2.5.5
+VERSION_CODE=255
 
 POM_NAME=Android-Iconics Library
 POM_ARTIFACT_ID=iconics-core

diff --git a/library-core/src/main/java/com/mikepenz/iconics/utils/IconicsUtils.java b/library-core/src/main/java/com/mikepenz/iconics/utils/IconicsUtils.java
@@ -2,11 +2,11 @@
 
 import android.content.Context;
 import android.text.Editable;
+import android.text.ParcelableSpan;
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.style.CharacterStyle;
-import android.text.style.StyleSpan;
 import android.util.Log;
 
 import com.mikepenz.iconics.Iconics;
@@ -34,7 +34,7 @@ public static LinkedList<StyleContainer> findIconsFromEditable(Editable editable
         LinkedList<StyleContainer> existingStyleContainers = new LinkedList<>();
 
         // remember the previous style spans
-        for (StyleSpan span : editable.getSpans(0, editable.length(), StyleSpan.class)) {
+        for (ParcelableSpan span : editable.getSpans(0, editable.length(), ParcelableSpan.class)) {
             existingStyleContainers.add(new StyleContainer(editable.getSpanStart(span), editable.getSpanEnd(span), span));
         }
         editable.clearSpans();
@@ -129,7 +129,7 @@ public static TextStyleContainer findIcons(Spanned spannable, HashMap<String, IT
         LinkedList<StyleContainer> styleContainers = new LinkedList<>();
         LinkedList<StyleContainer> existingStyleContainers = new LinkedList<>();
         // remember the previous style spans
-        for (StyleSpan span : spannable.getSpans(0, spannable.length(), StyleSpan.class)) {
+        for (ParcelableSpan span : spannable.getSpans(0, spannable.length(), ParcelableSpan.class)) {
             existingStyleContainers.add(new StyleContainer(spannable.getSpanStart(span), spannable.getSpanEnd(span), span));
         }
 

diff --git a/library-core/src/main/java/com/mikepenz/iconics/utils/StyleContainer.java b/library-core/src/main/java/com/mikepenz/iconics/utils/StyleContainer.java
@@ -1,6 +1,6 @@
 package com.mikepenz.iconics.utils;
 
-import android.text.style.StyleSpan;
+import android.text.ParcelableSpan;
 
 import com.mikepenz.iconics.typeface.ITypeface;
 
@@ -9,7 +9,7 @@ public class StyleContainer {
     public int endIndex;
     public String icon;
     public ITypeface font;
-    public StyleSpan styleSpan;
+    public ParcelableSpan styleSpan;
 
     public StyleContainer(int startIndex, int endIndex, String icon, ITypeface font) {
         this.startIndex = startIndex;
@@ -18,7 +18,7 @@ public StyleContainer(int startIndex, int endIndex, String icon, ITypeface font)
         this.font = font;
     }
 
-    public StyleContainer(int startIndex, int endIndex, StyleSpan styleSpan) {
+    public StyleContainer(int startIndex, int endIndex, ParcelableSpan styleSpan) {
         this.startIndex = startIndex;
         this.endIndex = endIndex;
         this.styleSpan = styleSpan;

diff --git a/library-core/src/main/res/values/library_androidiconics_strings.xml b/library-core/src/main/res/values/library_androidiconics_strings.xml
@@ -25,7 +25,7 @@
         This library allows you to include vector icons everywhere in your project. No limits are given. Scale with no limit, use any Color at any time, provide a contour, and many additional customizations
         ]]>
     </string>
-    <string name="library_AndroidIconics_libraryVersion">2.5.4</string>
+    <string name="library_AndroidIconics_libraryVersion">2.5.5</string>
     <string name="library_AndroidIconics_libraryWebsite">https://github.com/mikepenz/Android-Iconics</string>
     <string name="library_AndroidIconics_licenseId">apache_2_0</string>
     <string name="library_AndroidIconics_isOpenSource">true</string>

diff --git a/material-design-iconic-typeface-library/build.gradle b/material-design-iconic-typeface-library/build.gradle
@@ -36,6 +36,8 @@ android {
 }
 if (project.hasProperty('pushall') || project.hasProperty('materialdesigniconiconly')) {
     apply from: '../gradle-mvn-push.gradle'
+    apply plugin: 'com.novoda.bintray-release'
+    apply from: '../gradle-jcenter-push.gradle'
 }
 
 dependencies {

diff --git a/meteocons-typeface-library/build.gradle b/meteocons-typeface-library/build.gradle
@@ -36,6 +36,8 @@ android {
 }
 if (project.hasProperty('pushall') || project.hasProperty('meteoconsonly')) {
     apply from: '../gradle-mvn-push.gradle'
+    apply plugin: 'com.novoda.bintray-release'
+    apply from: '../gradle-jcenter-push.gradle'
 }
 
 dependencies {

diff --git a/octicons-typeface-library/build.gradle b/octicons-typeface-library/build.gradle
@@ -36,6 +36,8 @@ android {
 }
 if (project.hasProperty('pushall') || project.hasProperty('octicons')) {
     apply from: '../gradle-mvn-push.gradle'
+    apply plugin: 'com.novoda.bintray-release'
+    apply from: '../gradle-jcenter-push.gradle'
 }
 
 dependencies {

diff --git a/typeicons-typeface-library/build.gradle b/typeicons-typeface-library/build.gradle
@@ -36,6 +36,8 @@ android {
 }
 if (project.hasProperty('pushall') || project.hasProperty('Typeiconsonly')) {
     apply from: '../gradle-mvn-push.gradle'
+    apply plugin: 'com.novoda.bintray-release'
+    apply from: '../gradle-jcenter-push.gradle'
 }
 
 dependencies {

diff --git a/weather-icons-typeface-library/build.gradle b/weather-icons-typeface-library/build.gradle
@@ -36,6 +36,8 @@ android {
 }
 if (project.hasProperty('pushall') || project.hasProperty('weathericonsonly')) {
     apply from: '../gradle-mvn-push.gradle'
+    apply plugin: 'com.novoda.bintray-release'
+    apply from: '../gradle-jcenter-push.gradle'
 }
 
 dependencies {