Skip to content

Commit

Permalink
Merge branch 'feature/build_improvements' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
saulmm committed Apr 23, 2016
2 parents 9321b3f + 5045d9a commit 8d6b11f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@

This is the source code of a series focused on giving some basic ideas about how to use [Retrofit](http://square.github.io/retrofit/), [Dagger2](http://google.github.io/dagger/) & [RxJava](https://github.com/ReactiveX/RxJava) together with a [Clean Architecture](http://blog.8thlight.com/uncle-bob/2012/08/13/the-clean-architecture.html).

##### [Part 1 - Dagger 2](http://saulmm.github.io/when-Thor-and-Hulk-meet-dagger2-rxjava-1/)
##### [Part 1 - Dagger 2](http://saulmm.github.io/when-Thor-and-Hulk-meet-dagger2-rxjava-1)

In this first part it explains how Dagger 2 can help the decoupling of the layers in a project, removing dependencies so that it is easily scalable and testable.

##### [Part 2 - RxJava, RxAndroid, Reactive Extensions & operators](http://saulmm.github.io/when-Iron-Man-becomes-Reactive-Avengers2/)
##### [Part 2 - RxJava, RxAndroid, Reactive Extensions & operators](http://saulmm.github.io/when-Iron-Man-becomes-Reactive-Avengers2)

This part focuses on the understanding of what are the Reactive Extensions, its Java implementation, and use RxJava operators, all it integrated with a clean architecture

*NOTE*: The source shown in articles refers to [this release].

#### Screenshots

![](https://raw.githubusercontent.com/saulmm/Avengers/master/art/screen_detail.gif)
![](./art/screen_detail.png)

### License

Expand Down
3 changes: 2 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
buildToolsVersion '23.0.2'

buildToolsVersion '23.0.3'
}

//noinspection GroovyAssignabilityCheck
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ext {
]

libraries = [
supportVersion : "23.1.1",
supportVersion : "23.3.0",
dagger : "2.0",
rxjava : "1.0.0",
rxandroid : "0.24.0",
Expand Down Expand Up @@ -39,7 +39,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:2.0.0-beta4'
classpath 'com.android.tools.build:gradle:2.1.0-rc1'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath 'me.tatarka:gradle-retrolambda:3.3.0-beta3'
classpath 'com.android.databinding:dataBinder:1.0-rc4'
Expand Down

0 comments on commit 8d6b11f

Please sign in to comment.