diff --git a/app/build.gradle b/app/build.gradle index cd631c0..ece941f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,7 +20,7 @@ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } - sourceSets{ + sourceSets { main.java.srcDirs += 'src/main/kotlin' } compileOptions { @@ -31,10 +31,14 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation"org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" implementation 'com.android.support:appcompat-v7:26.1.0' implementation 'com.android.support.constraint:constraint-layout:1.0.2' testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.1' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' + + // Rx + implementation "io.reactivex.rxjava2:rxjava:$rx_java_version" + implementation "io.reactivex.rxjava2:rxandroid:$rx_android_version" } diff --git a/build.gradle b/build.gradle index 97c0cf8..35a10ef 100644 --- a/build.gradle +++ b/build.gradle @@ -2,6 +2,8 @@ buildscript { ext.kotlin_version = '1.1.51' + ext.rx_java_version = '2.1.6' + ext.rx_android_version = '2.0.1' repositories { google() jcenter()