diff --git a/.travis.yml b/.travis.yml deleted file mode 100755 index e60d26ac2..000000000 --- a/.travis.yml +++ /dev/null @@ -1,41 +0,0 @@ -language: android -android: - components: - - platform-tools - - tools - - # The BuildTools version used by your project - - build-tools-25.0.1 - - android-25 - - extra-android-m2repository - - extra-google-m2repository - - extra-android-support - - extra-google-google_play_services - - licenses: - - android-sdk-license-.+ - - '.+' - -jdk: - - oraclejdk8 - -before_script: - - chmod +x gradlew - -before_install: - - mkdir "$ANDROID_HOME/licenses" || true - - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license" - - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license" - -#Build, and run tests -script: "./gradlew clean buildStandardDebug" -sudo: false - -before_cache: - - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock -cache: - directories: - - $HOME/.gradle/caches/ - - $HOME/.gradle/wrapper/ -env: - - GRADLE_OPTS="-XX:MaxPermSize=1024m -XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m" diff --git a/app/build.gradle b/app/build.gradle index 1e9cf80f5..1581d1351 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -210,15 +210,18 @@ dependencies { compile "com.jakewharton.rxbinding:rxbinding-recyclerview-v7-kotlin:$rxbindings_version" //Pin lock view (EXH) - compile 'com.andrognito.pinlockview:pinlockview:1.0.1' + compile 'com.andrognito.pinlockview:pinlockview:2.1.0' //Reprint (EXH) - compile 'com.github.ajalt.reprint:core:3.1.0@aar' // required: supports marshmallow devices - compile 'com.github.ajalt.reprint:rxjava:3.1.0@aar' // optional: the RxJava 1 interface + compile 'com.github.ajalt.reprint:core:3.2.0@aar' // required: supports marshmallow devices + compile 'com.github.ajalt.reprint:rxjava:3.2.0@aar' // optional: the RxJava 1 interface //Swirl (EXH) compile 'com.mattprecious.swirl:swirl:1.0.0' + //RxJava 2 interop for Realm (EXH) + compile 'com.lvla.android:rxjava2-interop-kt:0.2.1' + // Tests //Paper DB screws up tests /*testCompile 'junit:junit:4.12' diff --git a/build.gradle b/build.gradle index 8857b122e..33fe2a189 100755 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ buildscript { //Firebase (EH) classpath 'com.google.gms:google-services:3.0.0' //Realm (EH) - classpath "io.realm:realm-gradle-plugin:3.5.0" + classpath "io.realm:realm-gradle-plugin:4.2.0" } }