aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-07-08 16:17:03 -0700
committerAllan Wang <me@allanwang.ca>2017-07-08 16:17:03 -0700
commit880d433e475e5be4e5d91afac145b490f9a959b7 (patch)
tree6a2bdc9f7fc67489d942e33245310019bca3eb13
parent7b2c104cb9f3ab5d47424b54fb7b74f8dd59b152 (diff)
downloadkau-880d433e475e5be4e5d91afac145b490f9a959b7.tar.gz
kau-880d433e475e5be4e5d91afac145b490f9a959b7.tar.bz2
kau-880d433e475e5be4e5d91afac145b490f9a959b7.zip
Update rxkotlin
-rw-r--r--.idea/misc.xml2
-rw-r--r--core/build.gradle2
-rw-r--r--gradle.properties1
3 files changed, 3 insertions, 2 deletions
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 085136f..7319f02 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -53,7 +53,7 @@
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
diff --git a/core/build.gradle b/core/build.gradle
index 9b1bd3a..fae442e 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -74,7 +74,7 @@ dependencies {
compile "org.jetbrains.anko:anko-commons:${ANKO}"
- compile "io.reactivex.rxjava2:rxkotlin:${RX_JAVA}"
+ compile "io.reactivex.rxjava2:rxkotlin:${RX_KOTLIN}"
compile "io.reactivex.rxjava2:rxandroid:${RX_ANDROID}"
compile "com.jakewharton.rxbinding2:rxbinding-kotlin:${RX_BINDING}"
compile "com.jakewharton.rxbinding2:rxbinding-appcompat-v7-kotlin:${RX_BINDING}"
diff --git a/gradle.properties b/gradle.properties
index f92ba21..4eb876a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -31,6 +31,7 @@ FAST_ADAPTER=2.6.2
FAST_ADAPTER_COMMONS=2.6.0
ANKO=0.10.1
RX_JAVA=2.1.1
+RX_KOTLIN=2.1.0
RX_ANDROID=2.0.1
RX_BINDING=2.0.0
ABOUT_LIBRARIES=5.9.6