Skip to content

Commit

Permalink
Merge branch 'release/1.4.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrer757 committed Jan 2, 2018
2 parents e105955 + 7f3c665 commit 6296681
Show file tree
Hide file tree
Showing 52 changed files with 2,516 additions and 301 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ The format is based on [Keep a Changelog](http:https://keepachangelog.com/en/1.0.0/)

## [Unreleased]

## [1.4.3] - 2017-01-02
### Added
- [#13](https://github.com/Simdea/gmlrva/issues/13) Added onViewRecycled option to cleanup elements for better performance of recycler view.
- [#8](https://github.com/Simdea/gmlrva/issues/8) Added a base architecture for adding [RecyclerView Item Decorations](https://developer.android.com/reference/android/support/v7/widget/RecyclerView.ItemDecoration.html).

## [1.4.2] - 2017-10-06
### Added
- New carousel item with a single text sample.
Expand Down
32 changes: 32 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
Contributing to GMLRVA
======================

## Contributing Guide

Contributions are welcome and are greatly appreciated! Every little bit helps, and credit will always be given.

## Pull Request Guidelines

Before you submit a pull request from your forked repo, please check that it meets the following guidelines:
1. Create a feature branch
2. When the feature is done, please run (`./gradlew check`) to ensure the code respects our style guidelines.
3. If the pull request adds functionality, edit the sample app to demonstrate the new functionality.
4. If the pull request fixes a bug, create a new [issue](https://github.com/simdea/gmlrva/issues/new) with an explanation including what the bug was and how to reproduce it, then reference the issue in PR description.
5. Create PR when you're done.

## DO and DON'Ts

* **DO** include tests when adding new features. When fixing bugs, start with adding a test that highlights how the current behavior is broken.
* **DO** keep the discussions focused. When a new or related topic comes up it's often better to create new issue than to side track the discussion.
* **DO** submit all code changes via pull requests (PRs) rather than through a direct commit. PRs will be reviewed and potentially merged by the repo maintainers after a peer review that includes at least one maintainer.
* **DO** give PRs short-but-descriptive names (e.g. "Improve code coverage for xpto by 10%", not "Fix #23")
* **DO** tag any users that should know about and/or review the change.
* **DO** ensure each commit successfully builds.
* **DO** run check validator (`./gradlew check`) when submitting PRs.
* **DO** fix merge conflicts using a merge commit in public branches. Prefer `git rebase` to get new commits from develop to local feature.
* **DO NOT** submit "work in progress" PRs. A PR should only be submitted when it is considered ready for review and subsequent merging by the contributor.
* **DO NOT** mix independent, unrelated changes in one PR. Separate unrelated fixes into separate PRs.
* **DO NOT** send PRs for style changes.
* **DO NOT** surprise us with big pull requests. Instead, file an issue and start a discussion so we can agree on a direction before you invest a large amount of time.
* **DO NOT** commit code that you didn't write. If you find code that you think is a good fit to add to GMLRVA, file an issue and start a discussion before proceeding.
* **DO NOT** submit PRs that alter licensing related files or headers. If you believe there's a problem with them, file an issue and we'll be happy to discuss it.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ GMLRVA - Generic Multiple Layout Recycler View Adapter
===============
[ ![Download](https://api.bintray.com/packages/simdea/GMLRVA/gmlrva.lib/images/download.svg) ](https://bintray.com/simdea/GMLRVA/gmlrva.lib/_latestVersion)
[ ![License](https://img.shields.io/badge/license-MIT-blue.svg) ](https://github.com/Simdea/gmlrva/blob/master/LICENSE.md)
[![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-GMLRVA-brightgreen.svg?style=flat)](https://android-arsenal.com/details/1/6296)

Generic RecyclerView Adapter that supports multiple layout implementations.

Expand Down Expand Up @@ -47,4 +48,4 @@ License
See [LICENSE][2].

[1]: http:https://simdea.pt/
[2]: LICENSE.md
[2]: LICENSE.md
4 changes: 3 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ buildscript {

repositories {
jcenter()
google()
}

dependencies {
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.android.tools.build:gradle:3.0.0'
classpath 'pt.simdea.verifier:verifier:3.5.8'
classpath 'com.novoda:bintray-release:0.5.0'

Expand All @@ -21,6 +22,7 @@ allprojects {

repositories {
jcenter()
google()
}

}
Expand Down
14 changes: 6 additions & 8 deletions gmlrva-lib/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ apply from: "$project.rootDir/tools/script-check.gradle"
android {

defaultPublishConfig 'release'
publishNonDefault true
resourcePrefix project.RESOURCE_PREFIX

compileSdkVersion project.COMPILE_SDK_VERSION.toInteger()
Expand All @@ -22,7 +21,6 @@ android {
debuggable true
zipAlignEnabled true
minifyEnabled true
shrinkResources false
proguardFiles getDefaultProguardFile('proguard-android.txt'),
"$project.rootDir/tools/rules-proguard-debug.pro"
}
Expand All @@ -31,7 +29,6 @@ android {
debuggable false
zipAlignEnabled true
minifyEnabled true
shrinkResources true
proguardFiles getDefaultProguardFile('proguard-android.txt'), "$project.rootDir/tools/rules-proguard.pro"
}
}
Expand All @@ -48,14 +45,15 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
implementation fileTree(dir: 'libs', include: ['*.jar'])

/* Google */
compile "com.android.support:appcompat-v7:$project.supportLibraryVersion"
compile "com.android.support:recyclerview-v7:$project.supportLibraryVersion"
api "com.android.support:appcompat-v7:$project.supportLibraryVersion"
api "com.android.support:recyclerview-v7:$project.supportLibraryVersion"

/* Lombok */
provided "org.projectlombok:lombok:$project.lombokVersion"
compileOnly "org.projectlombok:lombok:$project.lombokVersion"
annotationProcessor "org.projectlombok:lombok:$project.lombokVersion"
}

project.ext {
Expand All @@ -64,7 +62,7 @@ project.ext {
description = 'Generic RecyclerView Adapter that supports multiple layouts.'
groupId = 'pt.simdea'
artifactId = 'gmlrva.lib'
version = "1.4.2"
version = "1.4.3"
website = 'https://github.com/simdea/gmlrva'
scm = 'https://github.com/simdea/gmlrva'
tags = ['android', 'recyclerview', 'adapter', 'generic', 'multiple', 'layout']
Expand Down
Loading

0 comments on commit 6296681

Please sign in to comment.