Skip to content

Commit

Permalink
chore: update rx version
Browse files Browse the repository at this point in the history
chore: update gitignore

hopefully addresses this

ReactiveX/RxJava#5220
https://rollbar.com/Instacart/instashopper-android/items/5076/

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch is up-to-date with 'origin/master'.
#
# Changes to be committed:
#modified:   .gitignore
#modified:   build.gradle
#modified:   library-extension-rx/build.gradle
#
  • Loading branch information
Kaushik Gopal committed May 15, 2017
1 parent 42cbec4 commit 67b006a
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 9 deletions.
19 changes: 13 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
*.iml
.gradle
/local.properties
/.idea/workspace.xml
/.idea/libraries
local.properties
.idea
.DS_Store
/build
/captures
bin/
gen/
*.iml
build/
crashlytics-build.properties
com_crashlytics_export_strings.xml
captures/
config.xml
secure.properties
tmp/
build.properties
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.0'
classpath 'com.android.tools.build:gradle:2.3.1'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -19,7 +19,7 @@ ext {
buildToolsVersion = '25.0.2'

versionCode = 8
versionName = '3.0'
versionName = '3.1'
}

allprojects {
Expand Down
2 changes: 1 addition & 1 deletion library-extension-rx/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ android {

dependencies {
compile project(path: ':library')
compile 'io.reactivex.rxjava2:rxjava:2.0.8'
compile 'io.reactivex.rxjava2:rxjava:2.1.0'

androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
Expand Down

0 comments on commit 67b006a

Please sign in to comment.