Skip to content
This repository has been archived by the owner on Apr 30, 2024. It is now read-only.

Summer cleaning #71

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ language: android

android:
components:
- build-tools-23.0.1
- android-22
- build-tools-23.0.3
- android-23
- extra-android-m2repository
- extra-google-m2repository

Expand All @@ -24,4 +24,5 @@ sudo: false

cache:
directories:
- $HOME/.gradle
- $HOME/.gradle

22 changes: 11 additions & 11 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ All contributors and participants agree to abide by its terms.
## Contributing

1. Fork the repo
1. Run the tests. You can do this from the command line with `./gradlew test`
1. Please make every effort to follow existing conventions and style in order to keep the code as readable and consistent as possible
1. [Install and use our java codestyles](https://github.com/lyft/java-code-styles)
1. Add tests if you are adding a feature or fixing a bug
1. Make your tests pass
1. Add an entry to the `CHANGELOG.md`
1. Before your code can be accepted into the project you must also [sign our Individual Contributor License Agreement (CLA)](https://oss.lyft.com/cla).
1. Carefully review your changes, by using `git diff` and `git diff --cached` if you have staged changes
1. Commit with a meaningful message
1. [Rebase and squash](http://rebaseandsqua.sh/)
1. Push to your fork and submit a pull request!
2. Run the tests. You can do this from the command line with `./gradlew test`
3. Please make every effort to follow existing conventions and style in order to keep the code as readable and consistent as possible
4. [Install and use our java codestyles](https://github.com/lyft/java-code-styles)
5. Add tests if you are adding a feature or fixing a bug
6. Make your tests pass
7. Add an entry to the `CHANGELOG.md`
8. Before your code can be accepted into the project you must also [sign our Individual Contributor License Agreement (CLA)](https://oss.lyft.com/cla).
9. Carefully review your changes, by using `git diff` and `git diff --cached` if you have staged changes
10. Commit with a meaningful message
11. [Rebase and squash](http://rebaseandsqua.sh/)
12. Push to your fork and submit a pull request!
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -260,9 +260,12 @@ Download
--------

```groovy
compile 'com.lyft:scoop:0.3.9'
compile 'com.lyft:scoop:0.3.17'
```
and for ease of use with Dagger:
```groovy
compile 'com.lyft:scoop-dagger:0.3.17'
```

Snapshots of development version are available in [Sonatype's `snapshots` repository](https://oss.sonatype.org/content/repositories/snapshots/com/lyft/scoop/).

License
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.3.0'
classpath 'com.android.tools.build:gradle:2.1.0'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.4'
}
}

ext {
minSdkVersion = 15
compileSdkVersion = 22
buildToolsVersion = '23.0.1'
compileSdkVersion = 23
buildToolsVersion = '23.0.3'
sourceCompatibility = JavaVersion.VERSION_1_7
ci = 'true'.equals(System.getenv('CI'))
}

task wrapper(type: Wrapper) {
gradleVersion = '2.3'
gradleVersion = '2.10'
}

subprojects {
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 @@
#Wed Apr 10 15:27:10 PDT 2013
#Mon May 16 21:04:00 CDT 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip