Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

208 update rxjava to rxjava2, also target sdk and build tools for latest stable Android Studio #223

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

208 update rxjava to rxjava2, also target sdk and build tools for latest stable Android Studio #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33167ad
Update gradle from 3.1 to 3.3
YuraLaguta Oct 21, 2017
46b0749
Closes #208 Update rxJava to rxJava2:2.1.5 and rxLint, also gradle pl…
YuraLaguta Oct 21, 2017
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
1 change: 0 additions & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@ dependencies {
annotationProcessor libraries.daggerCompiler

compile libraries.rxJava
releaseCompile libraries.rxJavaProguardRules
compile libraries.rxLint

compile libraries.okHttp
Expand Down
16 changes: 7 additions & 9 deletions dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ ext.versions = [
name : '1.0',

minSdk : 16,
targetSdk : 23,
compileSdk : 23,
buildTools : '23.0.3',
targetSdk : 25,
compileSdk : 25,
buildTools : '25.0.3',
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This requires update of .travis.yml


androidGradlePlugin : '2.2.1',
androidGradlePlugin : '2.3.3',
retrolambdaGradlePlugin : '3.2.5',
lombokGradlePlugin : '0.2.3.a2',
paperworkGradlePlugin : '1.2.7',
Expand All @@ -21,9 +21,8 @@ ext.versions = [

dagger : '2.6',

rxJava : '1.1.8',
rxJavaProguardRules : '1.1.8.0',
rxLint : '1.0',
rxJava : '2.1.5',
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can't just update RxJava 1 to 2, it requires code changes :)

rxLint : '1.6',
supportLibs : '23.1.1',
okHttp : '3.2.0',
retrofit : '2.0.0-beta4',
Expand Down Expand Up @@ -68,8 +67,7 @@ ext.libraries = [
dagger : "com.google.dagger:dagger:$versions.dagger",
daggerCompiler : "com.google.dagger:dagger-compiler:$versions.dagger",

rxJava : "io.reactivex:rxjava:$versions.rxJava",
rxJavaProguardRules : "com.artemzin.rxjava:proguard-rules:$versions.rxJavaProguardRules",
rxJava : "io.reactivex.rxjava2:rxjava:$versions.rxJava",
rxLint : "nl.littlerobots.rxlint:rxlint:$versions.rxLint",

okHttp : "com.squareup.okhttp3:okhttp:$versions.okHttp",
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Oct 13 19:11:10 CEST 2016
#Sat Oct 21 14:56:39 AEDT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This alone does not update gradle/wrapper/gradle-wrapper.jar and gradlew files

You'll need to run Gradle, ie ./gradlew --version