Merge branch 'release/v2.5.9'

mikepenz · Mar 11, 2016 · 37be8fe · 37be8fe
2 parents f3ed3ce + 4fb0588
commit 37be8fe
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 12 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.8@aar'
+	compile 'com.mikepenz:iconics-core:2.5.9@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 2581
-        versionName "2.5.8.1"
+        versionCode 2591
+        versionName "2.5.9.1"
         enforceUniquePackageName false
     }
 
@@ -58,21 +58,34 @@ dependencies {
     compile "com.android.support:recyclerview-v7:${rootProject.ext.supportLibVersion}"
     compile "com.android.support:cardview-v7:${rootProject.ext.supportLibVersion}"
 
+    // used to base on some backwards compatible themes
+    // contains util classes to support various android versions, and clean up code
+    // comes with the awesome "Holder"-Pattern
+    // https://github.com/mikepenz/Materialize
+    compile 'com.mikepenz:materialize:0.8.6@aar'
+
+    // used to fill the RecyclerView with the DrawerItems
+    // and provides single and multi selection, expandable items
+    // https://github.com/mikepenz/FastAdapter
+    compile 'com.mikepenz:fastadapter:1.2.1@aar'
+
     //used to generate the drawer on the left
     //https://github.com/mikepenz/MaterialDrawer
-    compile('com.mikepenz:materialdrawer:5.0.6-SNAPSHOT@aar') {
+    compile('com.mikepenz:materialdrawer:5.1.2@aar') {
         transitive = true
+        exclude module: "fastadapter"
         exclude module: "iconics-core"
     }
 
     // used to generate the Open Source section
     // https://github.com/mikepenz/AboutLibraries
-    compile('com.mikepenz:aboutlibraries:5.5.7-SNAPSHOT@aar') {
+    compile('com.mikepenz:aboutlibraries:5.5.7@aar') {
         transitive = true
         exclude module: "fastadapter"
         exclude module: "iconics-core"
     }
 
+
     compile project(':fontawesome-typeface-library')
     compile project(':material-design-iconic-typeface-library')
     compile project(':google-material-typeface-library')

diff --git a/build.gradle b/build.gradle
@@ -5,15 +5,15 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0-beta5'
+        classpath 'com.android.tools.build:gradle:1.5.0'
         classpath 'com.novoda:bintray-release:0.3.4'
     }
 }
 
 ext {
     compileSdkVersion = 23
     buildToolsVersion = "23.0.2"
-    supportLibVersion = "23.2.0"
+    supportLibVersion = "23.2.1"
 
     minSdkVersion = 10
     targetSdkVersion = 23

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 258
-        versionName "2.5.8"
+        versionCode 259
+        versionName "2.5.9"
     }
     buildTypes {
         release {

diff --git a/library-core/gradle.properties b/library-core/gradle.properties
@@ -12,8 +12,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-VERSION_NAME=2.5.8
-VERSION_CODE=258
+VERSION_NAME=2.5.9
+VERSION_CODE=259
 
 POM_NAME=Android-Iconics Library
 POM_ARTIFACT_ID=iconics-core

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.8</string>
+    <string name="library_AndroidIconics_libraryVersion">2.5.9</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>