Merge branch 'release/v0.2.2'

mikepenz · Feb 25, 2016 · 3dbb3ad · 3dbb3ad
2 parents 619464b + 4c6b578
commit 3dbb3ad
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ These `Animators` correctly work with all view states and `RecyclerView` states
 #Include in your project
 ##Using Maven
 ```javascript
-compile('com.mikepenz:itemanimators:0.2.1@aar') {
+compile('com.mikepenz:itemanimators:0.2.2@aar') {
 	transitive = true
 }
 ```

diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
     defaultConfig {
         minSdkVersion 11
         targetSdkVersion 23
-        versionCode 21
-        versionName '0.2.1'
+        versionCode 22
+        versionName '0.2.2'
 
         applicationVariants.all { variant ->
             variant.outputs.each { output ->
@@ -49,10 +49,11 @@ android {
 
 dependencies {
     compile project(':library')
+    compile "com.android.support:cardview-v7:${rootProject.ext.supportLibVersion}"
 
     //used to generate the drawer on the left
     //https://github.com/mikepenz/MaterialDrawer
-    compile('com.mikepenz:materialdrawer:5.0.0.fastAdapter.b14-SNAPSHOT@aar') {
+    compile('com.mikepenz:materialdrawer:5.0.6-SNAPSHOT@aar') {
         transitive = true
         exclude module: "itemanimators"
         exclude module: "fastadapter"
@@ -61,11 +62,11 @@ dependencies {
     // used to fill the RecyclerView with the DrawerItems
     // and provides single and multi selection, collapsable items
     // https://github.com/mikepenz/FastAdapter
-    compile 'com.mikepenz:fastadapter:0.9.3@aar'
+    compile 'com.mikepenz:fastadapter:1.2.0@aar'
 
     //used to generate the Open Source section
     //https://github.com/mikepenz/AboutLibraries
-    compile('com.mikepenz:aboutlibraries:5.3.6@aar') {
+    compile('com.mikepenz:aboutlibraries:5.5.7@aar') {
         transitive = true
     }
     //used to display the icons in the drawer
@@ -77,5 +78,5 @@ dependencies {
 
     //used to load the images in the ImageListSample
     //https://github.com/bumptech/glide
-    compile 'com.github.bumptech.glide:glide:3.6.1'
+    compile 'com.github.bumptech.glide:glide:3.7.0'
 }
diff --git a/app/src/main/res/layout/image_item.xml b/app/src/main/res/layout/image_item.xml
@@ -2,7 +2,7 @@
 <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:layout_margin="8dp"
     android:orientation="vertical"
     tools:ignore="MissingPrefix">

diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0-alpha5'
+        classpath 'com.android.tools.build:gradle:2.0.0-beta5'
         classpath 'com.novoda:bintray-release:0.3.4'
     }
 }
@@ -18,9 +18,9 @@ allprojects {
 ext {
     compileSdkVersion = 23
     buildToolsVersion = "23.0.2"
-    supportLibVersion = "23.1.1"
+    supportLibVersion = "23.2.0"
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.10'
+    gradleVersion = '2.11'
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 # Maven stuff
-VERSION_NAME=0.2.1
-VERSION_CODE=21
+VERSION_NAME=0.2.2
+VERSION_CODE=22
 GROUP=com.mikepenz
 
 POM_DESCRIPTION=ItemAnimators Library

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jan 08 21:47:56 CET 2016
+#Fri Feb 26 00:03:59 CET 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-all.zip
diff --git a/library/build.gradle b/library/build.gradle
@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion 10
         targetSdkVersion 23
-        versionCode 21
-        versionName '0.2.1'
+        versionCode 22
+        versionName '0.2.2'
     }
     buildTypes {
         release {

diff --git a/library/src/main/res/values/library_itemanimators_strings.xml b/library/src/main/res/values/library_itemanimators_strings.xml
@@ -10,7 +10,7 @@
            The <b>ItemAnimators</b> library comes with a huge collections of pre-created Animators for your RecyclerView.
         ]]>
     </string>
-    <string name="library_itemanimators_libraryVersion">0.2.1</string>
+    <string name="library_itemanimators_libraryVersion">0.2.2</string>
     <string name="library_itemanimators_libraryWebsite">https://github.com/mikepenz/itemanimators</string>
     <string name="library_itemanimators_licenseId">apache_2_0</string>
     <string name="library_itemanimators_isOpenSource">true</string>