Skip to content
This repository was archived by the owner on Jan 6, 2020. It is now read-only.

Commit

Permalink
Merge branch 'release/1.2.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Bartosz Lipinski committed Feb 4, 2016
2 parents 95f7dc4 + 37e0dc7 commit 88e6238
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 21 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
Version 1.2.1 *(2016-02-04)*
----------------------------

* Using `addOnScrollListener` instead of `setOnScrollListener`
* `RecyclerView` support library package no longer included in the library

Version 1.2.0 *(2015-04-13)*
----------------------------

Expand Down
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,16 +104,14 @@ Current implementation of the library can be used with `RecyclerViews` that use

Currently only `vertical` implementations of `LayoutManagers` are supported.

If you are planning to use `setOnScrollListener(...)` method for your `RecyclerView`, be sure to do it before calling `attachTo(...)` method of the `RecyclerViewHeader`.


Including In Your Project
-------------------------
You can grab the library via Maven Central. Just add a proper dependency inside your `build.gradle`. Like this:

```xml
dependencies {
compile 'com.bartoszlipinski.recyclerviewheader:library:1.2.0'
compile 'com.bartoszlipinski.recyclerviewheader:library:1.2.1'
}
```

Expand Down
17 changes: 16 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,26 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
ext {
configuration = [
package : "com.bartoszlipinski.recyclerviewheader.sample",
compileVersion : 23,
buildToolsVersion: "23.0.2",
minSdk : 11,
targetSdk : 23,
versionCode : 5,
versionName : "1.2.1"
]

libraries = [
support: "23.1.1",
]
}

buildscript {
repositories {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.0.0'
classpath 'com.android.tools.build:gradle:1.5.0'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
VERSION_NAME=1.2.0
VERSION_CODE=4
VERSION_NAME=1.2.1
VERSION_CODE=5
GROUP=com.bartoszlipinski.recyclerviewheader

POM_DESCRIPTION=Super fast and easy way to create header for Android RecyclerView
Expand Down
17 changes: 10 additions & 7 deletions library/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
apply plugin: 'com.android.library'

def cfg = rootProject.ext.configuration
def libs = rootProject.ext.libraries

android {
compileSdkVersion 23
buildToolsVersion "23.0.1"
compileSdkVersion cfg.compileVersion
buildToolsVersion cfg.buildToolsVersion

defaultConfig {
minSdkVersion 11
targetSdkVersion 23
versionCode 4
versionName "1.2.0"
minSdkVersion cfg.minSdk
targetSdkVersion cfg.targetSdk
versionCode cfg.versionCode
versionName cfg.versionName
}
buildTypes {
release {
Expand All @@ -20,7 +23,7 @@ android {

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:recyclerview-v7:23.0.1'
provided "com.android.support:recyclerview-v7:${libs.support}"
}

apply from: '../gradle-mvn-push.gradle'
20 changes: 12 additions & 8 deletions sample/build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
apply plugin: 'com.android.application'

def cfg = rootProject.ext.configuration
def libs = rootProject.ext.libraries

android {
compileSdkVersion 23
buildToolsVersion "23.0.1"
compileSdkVersion cfg.compileVersion
buildToolsVersion cfg.buildToolsVersion

defaultConfig {
applicationId "com.bartoszlipinski.recyclerviewheader.sample"
minSdkVersion 11
targetSdkVersion 23
versionCode 4
versionName "1.2.0"
applicationId cfg.package
minSdkVersion cfg.minSdk
targetSdkVersion cfg.targetSdk
versionCode cfg.versionCode
versionName cfg.versionName
}
buildTypes {
release {
Expand All @@ -22,5 +25,6 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile project(':library')
compile 'com.android.support:appcompat-v7:23.0.1'
compile "com.android.support:appcompat-v7:${libs.support}"
compile "com.android.support:recyclerview-v7:${libs.support}"
}

0 comments on commit 88e6238

Please sign in to comment.