Skip to content

Commit

Permalink
Merge branch 'release/v0.5.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
mikepenz committed Aug 20, 2016
2 parents a8c8f2f + f2aca8c commit ae29c96
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 28 deletions.
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ These `Animators` correctly work with all view states and `RecyclerView` states
#Include in your project
##Using Maven
```javascript
compile('com.mikepenz:itemanimators:0.2.4@aar') {
transitive = true
}
compile "com.mikepenz:itemanimators:0.5.0@aar"
compile "com.android.support:recyclerview-v7:${supportLibVersion}"
```

##How to use
Expand Down
14 changes: 7 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ android {
buildToolsVersion rootProject.ext.buildToolsVersion

defaultConfig {
minSdkVersion 11
targetSdkVersion 23
versionCode 24
versionName '0.2.4'
minSdkVersion 14
targetSdkVersion 24
versionCode 50
versionName '0.5.0'

applicationVariants.all { variant ->
variant.outputs.each { output ->
Expand Down Expand Up @@ -53,7 +53,7 @@ dependencies {

//used to generate the drawer on the left
//https://github.com/mikepenz/MaterialDrawer
compile('com.mikepenz:materialdrawer:5.1.8@aar') {
compile('com.mikepenz:materialdrawer:5.5.0@aar') {
transitive = true
exclude module: "itemanimators"
exclude module: "fastadapter"
Expand All @@ -62,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:1.4.0@aar'
compile 'com.mikepenz:fastadapter:1.7.0@aar'

//used to generate the Open Source section
//https://github.com/mikepenz/AboutLibraries
compile('com.mikepenz:aboutlibraries:5.6.3@aar') {
compile('com.mikepenz:aboutlibraries:5.8.0@aar') {
transitive = true
}
//used to display the icons in the drawer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ public boolean onItemClick(View view, int position, IDrawerItem drawerItem) {

//create our FastAdapter which will manage everything
mFastAdapter = new FastAdapter();
mFastAdapter.withSelectable(true);
mFastAdapter.withMultiSelect(true);
mFastAdapter.withSelectOnLongClick(false);
//create our ItemAdapter which will host our items
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package com.mikepenz.itemanimators.app.items;

import android.annotation.TargetApi;
import android.content.Context;
import android.os.Build;
import android.support.v7.widget.RecyclerView;
import android.view.View;
import android.widget.FrameLayout;
Expand Down Expand Up @@ -53,7 +51,6 @@ public int getLayoutRes() {
return R.layout.image_item;
}

@TargetApi(Build.VERSION_CODES.LOLLIPOP)
@Override
public void bindView(ViewHolder viewHolder) {
super.bindView(viewHolder);
Expand Down
10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.0.0'
classpath 'com.android.tools.build:gradle:2.1.0'
classpath 'com.novoda:bintray-release:0.3.4'
}
}
Expand All @@ -16,11 +16,11 @@ allprojects {
}

ext {
compileSdkVersion = 23
buildToolsVersion = "23.0.3"
supportLibVersion = "23.3.0"
compileSdkVersion = 24
buildToolsVersion = "24.0.1"
supportLibVersion = "24.2.0"
}

task wrapper(type: Wrapper) {
gradleVersion = '2.12'
gradleVersion = '2.14'
}
5 changes: 2 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Maven stuff
VERSION_NAME=0.2.4
VERSION_CODE=24
VERSION_NAME=0.5.0
VERSION_CODE=50
GROUP=com.mikepenz

POM_DESCRIPTION=ItemAnimators Library
POM_URL=https://github.com/mikepenz/itemanimators
POM_SCM_URL=https://github.com/mikepenz/itemanimators
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Apr 07 20:03:26 CEST 2016
#Sat Jun 18 18:36:19 CEST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip
8 changes: 4 additions & 4 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ android {
buildToolsVersion rootProject.ext.buildToolsVersion

defaultConfig {
minSdkVersion 10
targetSdkVersion 23
versionCode 24
versionName '0.2.4'
minSdkVersion 14
targetSdkVersion 24
versionCode 50
versionName '0.5.0'
}
buildTypes {
release {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.4</string>
<string name="library_itemanimators_libraryVersion">0.5.0</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>
Expand Down

0 comments on commit ae29c96

Please sign in to comment.